mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Geo taxonomy: save and load the geo taxonomy data with git

Browse source 
This also supports the cloud storage, of course.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-07-01 12:29:32 -07:00
parent 53b805131e
commit 6e81677d89
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
load-git.c
View file

@ -300,6 +300,22 @@ static void parse_site_gps(char *line, struct membuffer *str, void *_ds)
ds->longitude = parse_degrees(line, &line); ds->longitude = parse_degrees(line, &line);
} }
static void parse_site_geo(char *line, struct membuffer *str, void *_ds)
{
fprintf(stderr, "line |%s| str |%s|\n", line, mb_cstring(str));
struct dive_site *ds = _ds;
if (ds->taxonomy.category == NULL)
ds->taxonomy.category = alloc_taxonomy();
int nr = ds->taxonomy.nr;
if (nr < NR_CATEGORIES) {
struct taxonomy *t = &ds->taxonomy.category[nr];
t->value = strdup(mb_cstring(str));
sscanf(line, "cat %d origin %d \"", &t->category, &t->origin);
fprintf(stderr, "found category %d origin %d value |%s|\n", t->category, t->origin, t->value);
ds->taxonomy.nr++;
}
}
/* Parse key=val parts of samples and cylinders etc */ /* Parse key=val parts of samples and cylinders etc */
static char *parse_keyvalue_entry(void (*fn)(void *, const char *, const char *), void *fndata, char *line) static char *parse_keyvalue_entry(void (*fn)(void *, const char *, const char *), void *fndata, char *line)
{ {
@ -906,7 +922,7 @@ static void dive_parser(char *line, struct membuffer *str, void *_dive)
struct keyword_action site_action[] = { struct keyword_action site_action[] = {
#undef D #undef D
#define D(x) { #x, parse_site_ ## x } #define D(x) { #x, parse_site_ ## x }
D(description), D(gps), D(name), D(notes) D(description), D(geo), D(gps), D(name), D(notes)
}; };
static void site_parser(char *line, struct membuffer *str, void *_ds) static void site_parser(char *line, struct membuffer *str, void *_ds)

8
save-git.c
View file

@ -897,6 +897,14 @@ static void save_divesites(git_repository *repo, struct dir *tree)
show_utf8(&b, "description ", ds->description, "\n"); show_utf8(&b, "description ", ds->description, "\n");
show_utf8(&b, "notes ", ds->notes, "\n"); show_utf8(&b, "notes ", ds->notes, "\n");
show_gps(&b, ds->latitude, ds->longitude); show_gps(&b, ds->latitude, ds->longitude);
if (prefs.geocoding.enable_geocoding)
for (int j = 0; j < ds->taxonomy.nr; j++) {
struct taxonomy *t = &ds->taxonomy.category[j];
if (t->category != NONE) {
put_format(&b, "geo cat %d origin %d ", t->category, t->origin);
show_utf8(&b, "", t->value, "\n" );
}
}
blob_insert(repo, subdir, &b, mb_cstring(&site_file_name)); blob_insert(repo, subdir, &b, mb_cstring(&site_file_name));
} }
} }