v.to.db: add JSON support

OSGeo · Jul 11, 2024 · 378c2f3 · 378c2f3
1 parent ff2da11
commit 378c2f3
Show file tree

Hide file tree

Showing 5 changed files with 420 additions and 139 deletions.
diff --git a/vector/v.to.db/Makefile b/vector/v.to.db/Makefile
@@ -3,7 +3,7 @@ MODULE_TOPDIR = ../..
 
 PGM=v.to.db
 
-LIBES = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(MATHLIB)
+LIBES = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(MATHLIB) $(PARSONLIB)
 DEPENDENCIES = $(VECTORDEP) $(DBMIDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)

diff --git a/vector/v.to.db/global.h b/vector/v.to.db/global.h
@@ -1,5 +1,8 @@
 #include <grass/gis.h>
 #include <grass/vector.h>
+#include <grass/parson.h>
+
+enum OutputFormat { PLAIN, JSON };
 
 struct value {
     int cat;   /* category */
@@ -33,6 +36,7 @@ struct options {
     int units;
     int qfield; /* query field */
     char *fs;
+    enum OutputFormat format;
 };
 
 extern struct options options;
@@ -96,7 +100,7 @@ int parse_command_line(int, char *[]);
 int query(struct Map_info *);
 
 /* report.c */
-int report(void);
+int report(enum OutputFormat format);
 int print_stat(void);
 
 /* units.c */

diff --git a/vector/v.to.db/main.c b/vector/v.to.db/main.c
@@ -406,7 +406,7 @@ int main(int argc, char *argv[])
     conv_units();
 
     if (options.print || options.total) {
-        report();
+        report(options.format);
     }
     else {
         update(&Map);

diff --git a/vector/v.to.db/parse.c b/vector/v.to.db/parse.c
@@ -22,6 +22,7 @@ int parse_command_line(int argc, char *argv[])
         struct Option *units;
         struct Option *qcol;
         struct Option *fs;
+        struct Option *format;
     } parms;
     struct {
         struct Flag *h, *p, *s, *t;
@@ -116,6 +117,9 @@ int parse_command_line(int argc, char *argv[])
     parms.fs->label = _("Field separator for print mode");
     parms.fs->guisection = _("Print");
 
+    parms.format = G_define_standard_option(G_OPT_F_FORMAT);
+    parms.format->guisection = _("Print");
+
     flags.p = G_define_flag();
     flags.p->key = 'p';
     flags.p->description = _("Print only");
@@ -168,6 +172,13 @@ int parse_command_line(int argc, char *argv[])
 
     options.fs = G_option_to_separator(parms.fs);
 
+    if (strcmp(parms.format->answer, "json") == 0) {
+        options.format = JSON;
+    }
+    else {
+        options.format = PLAIN;
+    }
+
     /* Check number of columns */
     ncols = 0;
     options.col[0] = NULL;