[GRASS-SVN] r63101 - in grass/branches/releasebranch_7_0: . vector/v.db.select

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-26 08:17:05 -0800 (Wed, 26 Nov 2014)
New Revision: 63101

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/vector/v.db.select/main.c
Log:
v.db.select: use standardized options (#2409) - (merge r63100 from trunk)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,
 63098
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,
 63098,63100

Modified: grass/branches/releasebranch_7_0/vector/v.db.select/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.db.select/main.c	2014-11-26 16:16:03 UTC (rev 63100)
+++ grass/branches/releasebranch_7_0/vector/v.db.select/main.c	2014-11-26 16:17:05 UTC (rev 63101)
@@ -70,16 +70,12 @@
     fs_opt->guisection = _("Format");
 
     vs_opt = G_define_standard_option(G_OPT_F_SEP);
-    vs_opt->key = "vs";
+    vs_opt->key = "vertical_separator";
     vs_opt->label = _("Output vertical record separator");
     vs_opt->answer = NULL;
     vs_opt->guisection = _("Format");
 
-    nv_opt = G_define_option();
-    nv_opt->key = "nv";
-    nv_opt->type = TYPE_STRING;
-    nv_opt->required = NO;
-    nv_opt->description = _("Null value indicator");
+    nv_opt = G_define_standard_option(G_OPT_M_NULL_VALUE);
     nv_opt->guisection = _("Format");
 
     file_opt = G_define_standard_option(G_OPT_F_OUTPUT);