Changeset 19579 for trunk/Ohana/src/opihi/dvo/dbCmdlineFields.c

Timestamp:

Sep 16, 2008, 9:16:26 AM (18 years ago)

Author:

eugene

Message:

adding mmextract and supporting api changes to dbCmdlineField.c functions

File:

• trunk/Ohana/src/opihi/dvo/dbCmdlineFields.c (modified) (3 diffs)

trunk/Ohana/src/opihi/dvo/dbCmdlineFields.c

@@ -1 +1 @@
 # include "dvoshell.h"
 
-// identify the fields to be extracted (test for where, check syntax)
+// check for 'where' or 'matched to'; return first field after the word, and the value
+int dbCmdlineConditions (int argc, char **argv, int first, int *nextField) {
+
+  int isWhere, isMatch;
+
+  *nextField = argc;
+
+  // require 'where' or 'matched to' before boolean math
+  if (first == argc) return DVO_DB_CMDLINE_IS_END;
+
+  isWhere = !strcasecmp(argv[first], "where");
+  isMatch = !strcasecmp(argv[first], "match");
+    
+  if (!isMatch && !isWhere) {
+    gprint (GP_ERR, "WHERE or MATCH TO\n");
+    return DVO_DB_CMDLINE_ERROR;
+  }
+  if (isMatch && ((first + 1 >= argc - 1) || strcasecmp(argv[first+1], "to"))) {
+    gprint (GP_ERR, "missing boolean expression\n");
+    return DVO_DB_CMDLINE_ERROR;
+  }
+  if (isWhere && (first >= argc - 1)) {
+    gprint (GP_ERR, "missing boolean expression\n");
+    return DVO_DB_CMDLINE_ERROR;
+  }
+
+  if (isWhere) {
+    *nextField = first + 1;
+    return DVO_DB_CMDLINE_IS_WHERE;
+  }
+
+  if (isMatch) {
+    *nextField = first + 2;
+    return DVO_DB_CMDLINE_IS_MATCH;
+  }
+
+  gprint (GP_ERR, "programming error?\n");
+  return DVO_DB_CMDLINE_ERROR;
+}
+
+// identify the fields to be extracted (check syntax)
+// the 'last' pointer ends on the first word after the fields (where, match or EOL) 
 dbField *dbCmdlineFields (int argc, char **argv, int table, int *last, int *nfields) {
 
@@ -15 +56 @@
 
   // examine each argv[i] entry until we reach a 'where' or a 'matched' 
-  for (i = 1; (i < argc) && strcasecmp (argv[i], "where") && strcasecmp (argv[i], "matched"); i++) {
+  for (i = 1; (i < argc) && strcasecmp (argv[i], "where") && strcasecmp (argv[i], "match"); i++) {
     // split the word by ","
     p = argv[i];
@@ -50 +91 @@
   }
 
-  // require 'where' or 'matched to' before boolean math
-  // XXX push this to a test up one level
-  if (i != argc) {
-    if (strcasecmp(argv[i], "where")) {
-      gprint (GP_ERR, "syntax error\n");
-      free (fields);
-      return (NULL);
-    }
-    if (i > argc - 2) {
-      gprint (GP_ERR, "missing boolean expression\n");
-      free (fields);
-      return (NULL);
-    }
-    i++; // skip over the 'where'
-  }
-
   *last = i;
   *nfields = Nfields;