v.in.ascii: no default answer for text, needed to import geonames

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@74209 15284696-431f-4ddb-bdfa-cd5b030d7da7
zjdyzww · Mar 9, 2019 · e3d1cfe · e3d1cfe
1 parent 6afc007
commit e3d1cfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/vector/v.in.ascii/main.c b/vector/v.in.ascii/main.c
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
     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");
 

diff --git a/vector/v.in.ascii/points.c b/vector/v.in.ascii/points.c
@@ -131,6 +131,7 @@ int points_analyse(FILE * ascii_in, FILE * ascii, char *fs, char *td,
 		          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 @@ int points_analyse(FILE * ascii_in, FILE * ascii, char *fs, char *td,
 		continue;
 	    }
 	    else {
+		G_warning(_("ntokens: %d, xcol: %d, ycol: %d, zcol: %d"), xcol, ycol, zcol);
 		G_fatal_error(_("Broken row %d: '%s'"), row, buf);
 	    }
 	}