Changeset 30675

Timestamp:

Mar 21, 2008, 4:31:16 AM (16 years ago)

Author:

neteler

Message:

Ignore broken lines added

Location:

grass/trunk/raster/r.in.xyz

Files:

• local_proto.h (modified) (1 diff)
• main.c (modified) (6 diffs)

grass/trunk/raster/r.in.xyz/local_proto.h

@@ -39 +39 @@
 
 /* main.c */
-int scan_bounds(FILE*, int, int, int, char*, int);
+int scan_bounds(FILE*, int, int, int, char*, int, int);
 
 /* support.c */

grass/trunk/raster/r.in.xyz/main.c

@@ -143 +143 @@
     struct Option *method_opt, *xcol_opt, *ycol_opt, *zcol_opt, *zrange_opt;
     struct Option *trim_opt, *pth_opt;
-    struct Flag *scan_flag, *shell_style;
+    struct Flag *scan_flag, *shell_style, *skipline;
 
 
@@ -245 +245 @@
     shell_style->description = _("In scan mode, print using shell script style");
 
+    skipline = G_define_flag();
+    skipline->key = 'i';
+    skipline->description = _("Ignore broken lines");
 
     if (G_parser(argc,argv))
@@ -451 +454 @@
             G_warning(_("zrange will not be taken into account during scan"));
 
-        scan_bounds(in_fp, xcol, ycol, zcol, fs, shell_style->answer);
+        scan_bounds(in_fp, xcol, ycol, zcol, fs, shell_style->answer, skipline->answer);
 
         if(!from_stdin)
@@ -560 +563 @@
             ntokens = G_number_of_tokens ( tokens );
 
-            if((ntokens < 3) || (max_col > ntokens) )
-                G_fatal_error(_("Not enough data columns. "
-                   "Incorrect delimiter or column number? "
-                   "Found the following character(s) in row %d:\n[%s]"), line, buff);
+            if((ntokens < 3) || (max_col > ntokens) ) {
+                if (skipline->answer) {
+                   G_warning(_("Not enough data columns. "
+                     "Incorrect delimiter or column number? "
+                     "Found the following character(s) in row %d:\n[%s]"), line, buff);
+                   G_warning(_("Line ignored as requested"));
+                   continue; /* line is garbage */
+                } else {
+                   G_fatal_error(_("Not enough data columns. "
+                     "Incorrect delimiter or column number? "
+                     "Found the following character(s) in row %d:\n[%s]"), line, buff);
+                }
+            }
 
 /* too slow?
@@ -1000 +1012 @@
 
 
-int scan_bounds(FILE* fp, int xcol, int ycol, int zcol, char *fs, int shell_style)
+int scan_bounds(FILE* fp, int xcol, int ycol, int zcol, char *fs, int shell_style, int skipline)
 {
     int    line, first, max_col;
@@ -1028 +1040 @@
         ntokens = G_number_of_tokens ( tokens );
 
-        if((ntokens < 3) || (max_col > ntokens) )
-            G_fatal_error(_("Not enough data columns. "
-               "Incorrect delimiter or column number?\n[%s]"), buff);
+        if((ntokens < 3) || (max_col > ntokens) ) {
+            if (skipline) {
+                   G_warning(_("Not enough data columns. "
+                     "Incorrect delimiter or column number? "
+                     "Found the following character(s) in row %d:\n[%s]"), line, buff);
+                   G_warning(_("Line ignored as requested"));
+                   continue; /* line is garbage */
+            } else {
+                   G_fatal_error(_("Not enough data columns. "
+                     "Incorrect delimiter or column number? "
+                     "Found the following character(s) in row %d:\n[%s]"), line, buff);
+            }
+        }
 
 /* too slow?