Changeset 13454 for branches/kapa-mods-2007-05/Ohana/src/opihi/dvo/dbCmdlineFields.c

Timestamp:

May 21, 2007, 3:38:16 PM (19 years ago)

Author:

eugene

Message:

boolean db extractions now working

File:

• branches/kapa-mods-2007-05/Ohana/src/opihi/dvo/dbCmdlineFields.c (modified) (4 diffs)

branches/kapa-mods-2007-05/Ohana/src/opihi/dvo/dbCmdlineFields.c

@@ -2 +2 @@
 
 // identify the fields to be extracted (test for where, check syntax)
-dvoField *dbCmdlineFields (int argc, char **argv, int table, int *last, int *nfields) {
+dbField *dbCmdlineFields (int argc, char **argv, int table, int *last, int *nfields) {
 
-  int i, Nfields, NFIELDS, 
+  int i, j, status, Nfields, NFIELDS;
+  char *p, *q, *field;
+  dbField *fields;
 
   *nfields = 0;
   Nfields = 0;
   NFIELDS = 10;
-  ALLOCATE (fields, dvoField, NFIELDS);
+  ALLOCATE (fields, dbField, NFIELDS);
+  dbInitField (&fields[0]);
 
   // examine each argv[i] entry until we reach a where 
@@ -36 +39 @@
         gprint (GP_ERR, "unknown database field %s\n", field);
         free (field);
+        for (j = 0; j <= Nfields; j++) {
+          if (fields->name != NULL) free (fields->name);
+        }
         free (fields);
         return (NULL);
@@ -42 +48 @@
 
       Nfields ++;
-      CHECK_REALLOCATE (fields, dvoField, NFIELDS, Nfields, 10);
+      CHECK_REALLOCATE (fields, dbField, NFIELDS, Nfields, 10);
+      dbInitField (&fields[Nfields]);
     }
   }
@@ -53 +60 @@
       return (NULL);
     }
-    if (i >= argc - 2) {
+    if (i > argc - 2) {
       gprint (GP_ERR, "missing boolean expression\n");
       free (fields);