[GRASS-SVN] r69354 - grass/trunk/vector/v.in.ascii

[svn_grass at osgeo.org]

Author: mmetz
Date: 2016-09-03 07:11:15 -0700 (Sat, 03 Sep 2016)
New Revision: 69354

Modified:
   grass/trunk/vector/v.in.ascii/main.c
Log:
v.in.ascii: add text=none to restore geonames import

Modified: grass/trunk/vector/v.in.ascii/main.c
===================================================================
--- grass/trunk/vector/v.in.ascii/main.c	2016-09-03 13:58:57 UTC (rev 69353)
+++ grass/trunk/vector/v.in.ascii/main.c	2016-09-03 14:11:15 UTC (rev 69354)
@@ -38,6 +38,8 @@
         sep = G_store("\"");
     else if (strcmp(option->answer, "singlequote") == 0)
         sep = G_store("\'");
+    else if (strcmp(option->answer, "none") == 0)
+        sep = NULL;
     else
         sep = G_store(option->answer);
 
@@ -101,7 +103,7 @@
     tdelim_opt->key = "text";
     tdelim_opt->label = "Text delimiter";
     tdelim_opt->answer = "doublequote";
-    tdelim_opt->description = _("Special characters: doublequote, singlequote");
+    tdelim_opt->description = _("Special characters: doublequote, singlequote, none");
     tdelim_opt->guisection = _("Input format");
 
     skip_opt = G_define_option();
@@ -332,6 +334,8 @@
 	    make_table = FALSE;
 	}
 
+	coltype2 = NULL;
+
 	if (make_table) {
 	    Fi = Vect_default_field_info(&Map, 1, NULL, GV_1TABLE);
 	    driver =