[GRASS-SVN] r63602 - in grass/trunk: lib/gis vector/v.in.ogr

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-19 00:21:01 -0800 (Fri, 19 Dec 2014)
New Revision: 63602

Modified:
   grass/trunk/lib/gis/renamed_options
   grass/trunk/vector/v.in.ogr/main.c
Log:
v.in.ogr: cnames renamed to columns (#2409)


Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2014-12-18 21:50:47 UTC (rev 63601)
+++ grass/trunk/lib/gis/renamed_options	2014-12-19 08:21:01 UTC (rev 63602)
@@ -452,6 +452,7 @@
 v.extrude|hcolumn:height_column
 # v.in.ogr
 v.in.ogr|dsn:input
+v.in.ogr|cnames:columns
 # v.kcv
 v.kcv|k:npartitions
 # v.kernel

Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c	2014-12-18 21:50:47 UTC (rev 63601)
+++ grass/trunk/vector/v.in.ogr/main.c	2014-12-19 08:21:01 UTC (rev 63602)
@@ -214,11 +214,7 @@
     param.outloc->description = _("Name for new location to create");
     param.outloc->key_desc = "name";
     
-    param.cnames = G_define_option();
-    param.cnames->key = "cnames";
-    param.cnames->type = TYPE_STRING;
-    param.cnames->required = NO;
-    param.cnames->multiple = YES;
+    param.cnames = G_define_standard_option(G_OPT_DB_COLUMNS);
     param.cnames->description =
 	_("List of column names to be used instead of original names, "
 	  "first is used for category column");