[GRASS-SVN] r62979 - grass/trunk/vector/v.in.ascii
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Nov 26 01:45:49 PST 2014
Author: mmetz
Date: 2014-11-26 01:45:49 -0800 (Wed, 26 Nov 2014)
New Revision: 62979
Modified:
grass/trunk/vector/v.in.ascii/local_proto.h
grass/trunk/vector/v.in.ascii/main.c
grass/trunk/vector/v.in.ascii/points.c
Log:
v.in.ascii: add ignore flag, code clean-up
Modified: grass/trunk/vector/v.in.ascii/local_proto.h
===================================================================
--- grass/trunk/vector/v.in.ascii/local_proto.h 2014-11-26 09:44:58 UTC (rev 62978)
+++ grass/trunk/vector/v.in.ascii/local_proto.h 2014-11-26 09:45:49 UTC (rev 62979)
@@ -6,9 +6,9 @@
#include <grass/dbmi.h>
int points_analyse(FILE *, FILE *, char *, int *, int *, int *, int *, int **,
- int **, int, int, int, int);
+ int **, int, int, int, int, int, int, int);
int points_to_bin(FILE *, int, struct Map_info *, dbDriver *,
- char *, char *, int, int, int *, int, int, int, int, int);
+ char *, char *, int, int *, int, int, int, int, int);
#endif /* __LOCAL_PROTO_H__ */
Modified: grass/trunk/vector/v.in.ascii/main.c
===================================================================
--- grass/trunk/vector/v.in.ascii/main.c 2014-11-26 09:44:58 UTC (rev 62978)
+++ grass/trunk/vector/v.in.ascii/main.c 2014-11-26 09:45:49 UTC (rev 62979)
@@ -8,7 +8,7 @@
* PURPOSE: Converts a vector map in ASCII format to a vector map
* in binary format
*
- * COPYRIGHT: (C) 2000-2009 by the GRASS Development Team
+ * COPYRIGHT: (C) 2000-2014 by the GRASS Development Team
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
@@ -35,7 +35,7 @@
*ycol_opt, *zcol_opt, *catcol_opt, *format_opt, *skip_opt;
int xcol, ycol, zcol, catcol, format, skip_lines;
struct Flag *zcoorf, *t_flag, *e_flag, *noheader_flag, *notopol_flag,
- *region_flag;
+ *region_flag, *ignore_flag;
char *table;
char *fs;
char *desc;
@@ -171,6 +171,11 @@
_("Only import points falling within current region (points mode)");
region_flag->guisection = _("Points");
+ ignore_flag = G_define_flag();
+ ignore_flag->key = 'i';
+ ignore_flag->description = _("Ignore broken line(s) in points mode");
+ ignore_flag->guisection = _("Points");
+
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
@@ -200,7 +205,7 @@
catcol = atoi(catcol_opt->answer) - 1;
- if (xcol+1 < 1 || ycol+1 < 1 || zcol+1 < 0 || catcol+1 < 0)
+ if (xcol < 0 || ycol < 0 || zcol + 1 < 0 || catcol + 1 < 0)
G_fatal_error(_("Column numbers must not be negative"));
ascii = G_open_option_file(old);
@@ -242,7 +247,7 @@
points_analyse(ascii, tmpascii, fs, &rowlen, &ncols, &minncols,
&nrows, &coltype, &collen, skip_lines, xcol, ycol,
- region_flag->answer);
+ zcol, catcol, region_flag->answer, ignore_flag->answer);
G_verbose_message(_("Maximum input row length: %d"), rowlen);
if (ncols != minncols) {
@@ -250,8 +255,10 @@
G_message(_("Minimum number of columns: %d"), minncols);
}
else {
- G_message(_("Number of columns: %d"), ncols);
+ G_message(_("Number of columns: %d"), ncols);
}
+
+ G_message(_("Number of rows: %d"), nrows);
/* check column numbers */
if (xcol >= minncols) {
@@ -478,11 +485,7 @@
if (catcol < 0) {
key = GV_KEY_COLUMN;
}
- else if (!columns_opt->answer) {
-
- }
-
if (db_create_index2(driver, Fi->table, key) != DB_OK)
G_warning(_("Unable to create index for table <%s>, key <%s>"),
Fi->table, key);
@@ -498,13 +501,13 @@
table = NULL;
}
- points_to_bin(tmpascii, rowlen, &Map, driver, table, fs, nrows, ncols,
+ points_to_bin(tmpascii, rowlen, &Map, driver, table, fs, nrows,
coltype2, xcol, ycol, zcol, catcol, skip_lines);
if (driver) {
G_message(_("Populating table..."));
db_commit_transaction(driver);
- if(db_close_database_shutdown_driver(driver) == DB_FAILED)
+ if (db_close_database_shutdown_driver(driver) == DB_FAILED)
#ifdef __MINGW32__
G_warning("FIXME: db_close_database_shutdown_driver() fails on WinGrass. Ignoring...");
#else
Modified: grass/trunk/vector/v.in.ascii/points.c
===================================================================
--- grass/trunk/vector/v.in.ascii/points.c 2014-11-26 09:44:58 UTC (rev 62978)
+++ grass/trunk/vector/v.in.ascii/points.c 2014-11-26 09:45:49 UTC (rev 62979)
@@ -54,11 +54,12 @@
int points_analyse(FILE * ascii_in, FILE * ascii, char *fs,
int *rowlength, int *ncolumns, int *minncolumns,
int *nrows, int **column_type, int **column_length,
- int skip_lines, int xcol, int ycol, int region_flag)
+ int skip_lines, int xcol, int ycol, int zcol, int catcol,
+ int region_flag, int ignore_flag)
{
int i;
int buflen; /* buffer length */
- char *buf, *buf_raw; /* buffer */
+ char *buf; /* buffer */
int row = 1; /* line number, first is 1 */
int ncols = 0; /* number of columns */
int minncols = -1;
@@ -70,23 +71,27 @@
struct Cell_head window;
double northing = .0;
double easting = .0;
- char *coorbuf, *tmp_token, *sav_buf;
+ char *xtoken, *ytoken, *sav_buf;
int skip = FALSE, skipped = 0;
buflen = 4000;
buf = (char *)G_malloc(buflen);
- buf_raw = (char *)G_malloc(buflen);
- coorbuf = (char *)G_malloc(256);
- tmp_token = (char *)G_malloc(256);
- sav_buf = NULL;
+ xtoken = (char *)G_malloc(256);
+ ytoken = (char *)G_malloc(256);
G_message(_("Scanning input for column types..."));
/* fetch projection for LatLong test */
G_get_window(&window);
+ /* points_to_bin() would be faster if we would write out
+ * clean data to ascii
+ * points_to_bin() would then not need G_chop() and
+ * for latlon not G_scan_[easting|northing]() */
+
while (1) {
len = 0; /* not really needed, but what the heck */
skip = FALSE; /* reset out-of-region check */
+ sav_buf = NULL;
if (G_getl2(buf, buflen - 1, ascii_in) == 0)
break; /* EOF */
@@ -113,22 +118,43 @@
/* no G_chop() as first/last column may be empty fs=tab value */
G_debug(3, "row %d : %d chars", row, (int)strlen(buf));
- /* G_tokenize() will modify the buffer, so we make a copy */
- strcpy(buf_raw, buf);
+ tokens = G_tokenize(buf, fs);
+ ntokens = G_number_of_tokens(tokens);
+ if (ntokens == 0) {
+ continue;
+ }
+ if (ncols > 0 && ntokens != ncols) {
+ /* these rows can not be imported into the attribute table */
+ if (ignore_flag) {
+ G_warning(_("Row %d: '%s' can not be imported into the attribute table"),
+ row, buf);
+ }
+ else {
+ G_fatal_error(_("Broken row %d: '%s'"), row, buf);
+ }
+ }
+ if (xcol >= ntokens || ycol >= ntokens || zcol >= ntokens ||
+ catcol >= ntokens) {
+ if (ignore_flag) {
+ G_debug(3, "Skipping broken row %d: '%s'", row, buf);
+ continue;
+ }
+ else {
+ G_fatal_error(_("Broken row %d: '%s'"), row, buf);
+ }
+ }
+
len = strlen(buf) + 1;
if (len > rowlen)
rowlen = len;
- tokens = G_tokenize(buf, fs);
- ntokens = G_number_of_tokens(tokens);
if (ntokens > ncols) {
- int c;
coltype = (int *)G_realloc(coltype, ntokens * sizeof(int));
collen = (int *)G_realloc(collen, ntokens * sizeof(int));
- for (c = ncols; c < ntokens; c++) {
- coltype[c] = DB_C_TYPE_INT; /* default type */
- collen[c] = 0;
+ for (i = ncols; i < ntokens; i++) {
+ coltype[i] = DB_C_TYPE_INT; /* default type */
+ collen[i] = 0;
}
ncols = ntokens;
}
@@ -138,6 +164,7 @@
/* Determine column types */
for (i = 0; i < ntokens; i++) {
+ G_chop(tokens[i]);
if ((G_projection() == PROJECTION_LL)) {
if (i == xcol || i == ycol) {
if (i == 0) { /* Save position of original internal token buffer */
@@ -145,15 +172,12 @@
sav_buf = tokens[0];
}
/* check if coordinates are DMS or decimal or not latlong at all */
- sprintf(coorbuf, "%s", tokens[i]);
- G_debug(4, "token: %s", coorbuf);
-
if (i == xcol) {
- if (G_scan_easting(coorbuf, &easting, window.proj)) {
- G_debug(4, "is_latlong east: %f", easting);
- sprintf(tmp_token, "%.12f", easting);
+ if (G_scan_easting(tokens[i], &easting, window.proj)) {
+ G_debug(4, "is_latlong east: %g", easting);
+ sprintf(xtoken, "%.15g", easting);
/* replace current DMS token by decimal degree */
- tokens[i] = tmp_token;
+ tokens[i] = xtoken;
if (region_flag) {
if ((window.east < easting) ||
(window.west > easting))
@@ -161,18 +185,18 @@
}
}
else {
- fprintf(stderr, _("Current row %d:\n%s\n"), row, buf_raw);
- G_fatal_error(_("Unparsable longitude value in column num %d: %s"),
+ fprintf(stderr, _("Current row %d:\n%s\n"), row, buf);
+ G_fatal_error(_("Unparsable longitude value in column %d: %s"),
i + 1, tokens[i]);
}
}
if (i == ycol) {
- if (G_scan_northing(coorbuf, &northing, window.proj)) {
- G_debug(4, "is_latlong north: %f", northing);
- sprintf(tmp_token, "%.12f", northing);
+ if (G_scan_northing(tokens[i], &northing, window.proj)) {
+ G_debug(4, "is_latlong north: %g", northing);
+ sprintf(ytoken, "%.15g", northing);
/* replace current DMS token by decimal degree */
- tokens[i] = tmp_token;
+ tokens[i] = ytoken;
if (region_flag) {
if ((window.north < northing) ||
(window.south > northing))
@@ -180,21 +204,24 @@
}
}
else {
- fprintf(stderr, _("Current row %d:\n%s\n"), row, buf_raw);
- G_fatal_error(_("Unparsable latitude value in column num %d: %s"),
- i, tokens[i]);
+ fprintf(stderr, _("Current row %d:\n%s\n"), row, buf);
+ G_fatal_error(_("Unparsable latitude value in column %d: %s"),
+ i + 1, tokens[i]);
}
}
} /* if (x or y) */
-
- if (i == ntokens - 1 && sav_buf != NULL) {
- /* Restore original token buffer so free_tokens works */
- /* Only do this if tokens[0] was re-assigned */
- tokens[0] = sav_buf;
- sav_buf = NULL;
- }
} /* PROJECTION_LL */
else {
+ if (strlen(tokens[i]) == 0) {
+ if (i == xcol) {
+ G_fatal_error(_("Unparsable longitude value in column %d: %s"),
+ i + 1, tokens[i]);
+ }
+ if (i == ycol) {
+ G_fatal_error(_("Unparsable latitude value in column %d: %s"),
+ i + 1, tokens[i]);
+ }
+ }
if (region_flag) {
/* consider z range if -z flag is used? */
/* change to if(>= east,north){skip=1;} to allow correct tiling */
@@ -218,10 +245,10 @@
len = strlen(tokens[i]);
/* do not guess column type for missing values */
if (len == 0)
- continue;
+ continue;
G_debug(4, "row %d col %d: '%s' is_int = %d is_double = %d",
- row, i, tokens[i], is_int(tokens[i]),
+ row + 1, i + 1, tokens[i], is_int(tokens[i]),
is_double(tokens[i]));
if (is_int(tokens[i])) {
@@ -241,10 +268,17 @@
/* write dataline to tmp file */
if (!skip)
- fprintf(ascii, "%s\n", buf_raw);
+ fprintf(ascii, "%s\n", buf);
else
skipped++;
+ if (sav_buf != NULL) {
+ /* Restore original token buffer so free_tokens works */
+ /* Only do this if tokens[0] was re-assigned */
+ tokens[0] = sav_buf;
+ sav_buf = NULL;
+ }
+
G_free_tokens(tokens);
row++;
}
@@ -257,9 +291,8 @@
*nrows = row - 1; /* including skipped lines */
G_free(buf);
- G_free(buf_raw);
- G_free(coorbuf);
- G_free(tmp_token);
+ G_free(xtoken);
+ G_free(ytoken);
if (region_flag)
G_message(_n("Skipping %d of %d row falling outside of current region",
@@ -281,12 +314,12 @@
*/
int points_to_bin(FILE * ascii, int rowlen, struct Map_info *Map,
dbDriver * driver, char *table, char *fs, int nrows,
- int ncols, int *coltype, int xcol, int ycol, int zcol,
+ int *coltype, int xcol, int ycol, int zcol,
int catcol, int skip_lines)
{
char *buf, buf2[4000];
int cat = 0;
- int row = 1;
+ int row = 0;
struct line_pnts *Points;
struct line_cats *Cats;
dbString sql, val;
@@ -317,12 +350,14 @@
char **tokens;
int ntokens; /* number of tokens */
+ G_percent(row, nrows, 2);
+ row++;
+
if (row <= skip_lines) {
G_debug(4, "writing skip line %d to hist : %d chars", row,
(int)strlen(buf));
Vect_hist_write(Map, buf);
Vect_hist_write(Map, "\n");
- row++;
continue;
}
@@ -335,6 +370,9 @@
tokens = G_tokenize(buf, fs);
ntokens = G_number_of_tokens(tokens);
+ G_chop(tokens[xcol]);
+ G_chop(tokens[ycol]);
+
if ((G_projection() == PROJECTION_LL)) {
G_scan_easting(tokens[xcol], &x, window.proj);
G_scan_northing(tokens[ycol], &y, window.proj);
@@ -345,13 +383,17 @@
}
G_debug(4, "x: %f, y: %f", x, y);
- if (zcol >= 0)
+ if (zcol >= 0) {
+ G_chop(tokens[zcol]);
z = atof(tokens[zcol]);
+ }
else
z = 0.0;
- if (catcol >= 0)
+ if (catcol >= 0) {
+ G_chop(tokens[catcol]);
cat = atof(tokens[catcol]);
+ }
else
cat++;
@@ -374,6 +416,7 @@
}
for (i = 0; i < ntokens; i++) {
+ G_chop(tokens[i]);
if (i > 0)
db_append_string(&sql, ", ");
@@ -411,12 +454,9 @@
}
}
- G_percent(row, nrows, 2);
-
G_free_tokens(tokens);
-
- row++;
}
+ G_percent(nrows, nrows, 2);
return 0;
}
More information about the grass-commit
mailing list