Changeset 25353

Timestamp:

Nov 25, 2007, 3:09:36 AM (17 years ago)

Author:

martinl

Message:

Enable to read numbers given in scientific notation (thanks to Ivan Shmakov <ivan theory.asu.ru>

File:

• grass/trunk/vector/v.in.ascii/points.c (modified) (7 diffs)

grass/trunk/vector/v.in.ascii/points.c

@@ -9 +9 @@
 #include "local_proto.h"
 
-
-/* Determine if the string is integer, e.g. 123, +123, -123
+/* Determine if the string is integer, e.g. 123, +123, -123, 
  * return 1 if integer, 0 otherwise */
 static int is_int(char *str)
 {
-    int i = -1;
-
-    while (str[++i] != '\0') {
-        if (i == 0 && (str[i] == '+' || str[i] == '-'))
-            continue;
-
-        if (!isdigit(str[i]))
-            return 0;
+    char *tail;
+
+    if (strtol (str, &tail, 10),
+        tail == str || *tail != '\0') {
+        /* doesn't look like a number,
+           or has extra characters after what looks to be a number */
+        return 0;
     }
 
@@ -28 +26 @@
 
 
-/* Determine if the string is double, e.g. 123.456, +123.456, -123.456
+/* Determine if the string is double, e.g. 123.456, +123.456, -123.456, 1.23456e2
  * return 1 if double, 0 otherwise */
 static int is_double(char *str)
 {
-    int i = -1, ndots = 0;
-
-    while (str[++i] != '\0') {
-        if (i == 0 && (str[i] == '+' || str[i] == '-'))
-            continue;
-
-        if (str[i] == '.') {
-            if (ndots > 0)
-                return 0;       /* > 1 dot */
-
-            ndots++;
-            continue;
-        }
-
-        if (!isdigit(str[i]))
-            return 0;
+    char *tail;
+
+    if (strtod (str, &tail),
+        tail == str || *tail != '\0') {
+        /* doesn't look like a number,
+           or has extra characters after what looks to be a number */
+        return 0;
     }
 
     return 1;
 }
+
 
 
@@ -92 +82 @@
     sav_buf = NULL;
 
-    G_message(_("Scanning input for column types ..."));
+    G_message(_("Scanning input for column types..."));
     /* fetch projection for LatLong test */
     G_get_window(&window);
@@ -218 +208 @@
                     row, i, tokens[i], is_int(tokens[i]), is_double(tokens[i]));
 
-            if (is_int(tokens[i]))
+            if (is_int(tokens[i])) {
                 continue;       /* integer */
+            }
             if (is_double(tokens[i])) { /* double */
                 if (coltype[i] == DB_C_TYPE_INT) {
@@ -255 +246 @@
 
     if (region_flag)
-        G_message(_("Skipping [%d] of [%d] rows falling outside of current region"),
+        G_message(_("Skipping %d of %d rows falling outside of current region"),
                   skipped, row-1);
 
@@ -283 +274 @@
     struct Cell_head window;
 
-    G_message(_("Importing points ..."));
+    G_message(_("Importing points..."));
     /* fetch projection for LatLong test */
     G_get_window(&window);
@@ -395 +386 @@
 
             if (db_execute_immediate(driver, &sql) != DB_OK) {
-                G_fatal_error(_("Cannot insert values: %s"), db_get_string(&sql));
+                G_fatal_error(_("Unable to insert new record: %s"),
+                              db_get_string(&sql));
             }
         }