Changeset 134

Timestamp:

04/23/09 00:21:13 (3 years ago)

Author:

assefa

Message:

modify a bit test to detect if a user value passed is numeric or text #30

Files:

• src/fe/fe_filter.c (modified) (2 diffs)

src/fe/fe_filter.c

@@ -137 +137 @@
 {
     xmlChar *content;
+    int isstring = 0;
 
     assert(o != NULL);
@@ -183 +184 @@
 
         } else {
-            if (check_regexp((char *) content, "^[A-Za-z]") == 1
-                    || check_regexp((char *) content, ".*-.*") == 1)
-                buffer_add_str(sql, "'");
-
-            buffer_add_str(sql, (char *) content);
-
-            if (check_regexp((char *) content, "^[A-Za-z]") == 1
-                    || check_regexp((char *) content, ".*-.*") == 1)
-                buffer_add_str(sql, "'");
+          if (!check_regexp((char *)content, "[-+]?\\b[0-9]*\\.?[0-9]+\\b"))
+          {
+              isstring = 1;
+              buffer_add_str(sql, "'");
+          }
+          buffer_add_str(sql, (char *) content);
+
+          if (isstring)
+            buffer_add_str(sql, "'");
         }
     } else if (strcmp((char *) n->name, "PropertyName") == 0)