[GRASS-SVN] r29694 - grass/trunk/vector/v.to.db

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Jan 13 08:35:14 EST 2008


Author: martinl
Date: 2008-01-13 08:35:14 -0500 (Sun, 13 Jan 2008)
New Revision: 29694

Modified:
   grass/trunk/vector/v.to.db/description.html
   grass/trunk/vector/v.to.db/main.c
   grass/trunk/vector/v.to.db/parse.c
Log:
v.to.db: cosmetics in module description (use standardized option, use guisection)

Modified: grass/trunk/vector/v.to.db/description.html
===================================================================
--- grass/trunk/vector/v.to.db/description.html	2008-01-13 12:41:21 UTC (rev 29693)
+++ grass/trunk/vector/v.to.db/description.html	2008-01-13 13:35:14 UTC (rev 29694)
@@ -1,10 +1,11 @@
 <H2>DESCRIPTION</H2>
 
-<em>v.to.db</em> loads vector map features or metrics into a database table,
-or prints them (or the SQL queries used to obtain them) in a form of a
-human-readable report.
+<em>v.to.db</em> loads vector map features or metrics into a database
+table, or prints them (or the SQL queries used to obtain them) in a
+form of a human-readable report. For uploaded/printed category values
+'-1' is used for 'no category' and 'null'/'-' if category cannot be
+found or multiple categories were found.
 
-
 <H2>NOTES</H2>
 The units <em>miles</em>, <em>feet</em>, <em>meters</em> and
 <em>kilometers</em> are square for <em>option=area</em>.
@@ -35,7 +36,6 @@
 <em><a href=v.db.addcol.html>v.db.addcol</a></em> to add new columns if
 needed.
 
-
 <H2>EXAMPLES</H2>
 
 <h3>Updating attribute tables</h3>
@@ -163,16 +163,16 @@
 
 <h2>REFERENCES</h2>
 
-Mandelbrot, B. B. (1982). The fractal geometry of nature. New York: W. H. Freeman.
+<ul>
+  <li>Mandelbrot, B. B. (1982). The fractal geometry of nature. New York: W. H. Freeman.</li>
+  <li>Xu, Y. F. &amp; Sun, D. A. (2005). Geotechnique 55, No. 9, 691-695</li>
+</ul>
 
-<p>
 
-Xu, Y. F. &amp; Sun, D. A. (2005). Geotechnique 55, No. 9, 691-695
+<H2>AUTHOR</H2>
 
+Radim Blazek, ITC-irst, Trento, Italy<br>
+Line sinuousity implemented by Wolf Bergenheim
 
-
-<H2>AUTHOR</H2>
-Radim Blazek
-
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/trunk/vector/v.to.db/main.c
===================================================================
--- grass/trunk/vector/v.to.db/main.c	2008-01-13 12:41:21 UTC (rev 29693)
+++ grass/trunk/vector/v.to.db/main.c	2008-01-13 13:35:14 UTC (rev 29694)
@@ -30,12 +30,7 @@
 
     module = G_define_module();
     module->keywords = _("vector, database, attribute table");
-    module->label    = _("Populate database values from vector features.");
-    module->description =
-	_("Load values from vector to database. For "
-	  "uploaded/printed category values '-1' is used for 'no category' "
-	  "and 'null'/'-' if category cannot be found or multiple categories "
-	  "were found.");
+    module->description = _("Populate database values from vector features.");
 
     parse_command_line (argc, argv);
 

Modified: grass/trunk/vector/v.to.db/parse.c
===================================================================
--- grass/trunk/vector/v.to.db/parse.c	2008-01-13 12:41:21 UTC (rev 29693)
+++ grass/trunk/vector/v.to.db/parse.c	2008-01-13 13:35:14 UTC (rev 29694)
@@ -27,20 +27,19 @@
 	    struct Flag *p, *s, *t;
     } flags;
 
-    parms.vect = G_define_standard_option(G_OPT_V_INPUT);
-    parms.vect->key    = "map";
+    parms.vect = G_define_standard_option(G_OPT_V_MAP);
 
     parms.type = G_define_standard_option(G_OPT_V_TYPE) ;
     parms.type->options      = "point,line,boundary,centroid";
     parms.type->answer       = "point,line,boundary,centroid";
-    parms.type->description  = _("Type of elements (for coor valid point/centroid, "
-			       "for length valid line/boundary)");	
+    parms.type->label        = _("Type of elements (for coor valid point/centroid, "
+				 "for length valid line/boundary)");	
     
     parms.field = G_define_standard_option(G_OPT_V_FIELD);
 
     parms.qfield = G_define_standard_option(G_OPT_V_FIELD);
     parms.qfield->key = "qlayer";
-    parms.qfield->description = _("Query layer. Used by 'query' option.");
+    parms.qfield->label = _("Query layer (used by 'query' option)");
 
     parms.option = G_define_option();
     parms.option->key          = "option";
@@ -67,7 +66,7 @@
 		 "query;result of a database query for all records of the geometry"
 		       "(or geometries) from table specified by 'qlayer' option;"
 		 "slope;slope steepness of vector line or boundary;"
-		 "sinuous;Line Sinuousity. Calculated as line length / distance between end points;";
+		 "sinuous;line sinuousity, calculated as line length / distance between end points;";
 
     parms.units = G_define_option();
     parms.units->key   = "units";
@@ -78,34 +77,27 @@
     parms.units->label = _("Units");
     parms.units->description = _("mi(les),f(eet),me(ters),k(ilometers),a(cres),h(ectares)");
 
-    parms.col = G_define_option();
-    parms.col->key    = "column";
-    parms.col->type   = TYPE_STRING ;
-    parms.col->required = NO ;
-    parms.col->multiple = YES ;
-    parms.col->gisprompt  = "column(s)" ;
-    parms.col->description = _("Column(s)");
+    parms.col = G_define_standard_option(G_OPT_COLUMNS);
 
-    parms.qcol = G_define_option();
+    parms.qcol = G_define_standard_option(G_OPT_COLUMN);
     parms.qcol->key    = "qcolumn";
-    parms.qcol->type   = TYPE_STRING ;
-    parms.qcol->required = NO ;
-    parms.qcol->multiple = NO ;
-    parms.qcol->gisprompt  = "query column";
-    parms.qcol->label = _("Query column used for 'query' option");
+    parms.qcol->label = _("Name of attribute column used for 'query' option");
     parms.qcol->description = _("E.g. 'cat', 'count(*)', 'sum(val)'");
 
     flags.p = G_define_flag();
     flags.p->key = 'p';
     flags.p->description = _("Print only");
-    
+    flags.p->guisection = _("Print");
+	
     flags.s = G_define_flag();
     flags.s->key = 's';
     flags.s->description = _("Only print sql statements");	
-    
+    flags.s->guisection = _("Print");
+
     flags.t = G_define_flag();
     flags.t->key = 'c';
     flags.t->description = _("In print mode prints totals for options: length,area,count");	
+    flags.t->guisection = _("Print");
 
     if (G_parser(argc,argv)) exit(EXIT_FAILURE);
 



More information about the grass-commit mailing list