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

[svn_grass at osgeo.org]

Author: mmetz
Date: 2019-03-09 10:59:56 -0800 (Sat, 09 Mar 2019)
New Revision: 74209

Modified:
   grass/trunk/vector/v.in.ascii/main.c
   grass/trunk/vector/v.in.ascii/points.c
Log:
v.in.ascii: no default answer for text, needed to import geonames

Modified: grass/trunk/vector/v.in.ascii/main.c
===================================================================
--- grass/trunk/vector/v.in.ascii/main.c	2019-03-09 18:57:08 UTC (rev 74208)
+++ grass/trunk/vector/v.in.ascii/main.c	2019-03-09 18:59:56 UTC (rev 74209)
@@ -104,7 +104,7 @@
     tdelim_opt = G_define_standard_option(G_OPT_F_SEP);
     tdelim_opt->key = "text";
     tdelim_opt->label = "Text delimiter";
-    tdelim_opt->answer = "doublequote";
+    tdelim_opt->answer = NULL;
     tdelim_opt->description = _("Special characters: doublequote, singlequote, none");
     tdelim_opt->guisection = _("Input format");
 

Modified: grass/trunk/vector/v.in.ascii/points.c
===================================================================
--- grass/trunk/vector/v.in.ascii/points.c	2019-03-09 18:57:08 UTC (rev 74208)
+++ grass/trunk/vector/v.in.ascii/points.c	2019-03-09 18:59:56 UTC (rev 74209)
@@ -131,6 +131,7 @@
 		          row, buf);
 	    }
 	    else {
+		G_warning(_("Expected %d columns, found %d columns"), ncols, ntokens);
 		G_fatal_error(_("Broken row %d: '%s'"), row, buf);
 	    }
 	}
@@ -141,6 +142,7 @@
 		continue;
 	    }
 	    else {
+		G_warning(_("ntokens: %d, xcol: %d, ycol: %d, zcol: %d"), xcol, ycol, zcol);
 		G_fatal_error(_("Broken row %d: '%s'"), row, buf);
 	    }
 	}