Changeset 13440 for branches/kapa-mods-2007-05/Ohana/src/opihi/dvo/dvodb.c

Timestamp:

May 21, 2007, 7:48:06 AM (19 years ago)

Author:

eugene

Message:

working towards full boolean db expressions

File:

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

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

@@ -8 +8 @@
 */
 
+enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE};
+
 // a single db field 
 typedef struct {
-  int fieldNumber;
+  char *name;
+  int extract;
+  int table;
+  int ID;
   int magMode;
   PhotCode *photcode;
 } dvoField;
 
-ParseFields (int argc, char **argv) {
+// db boolean operations
+typedef struct {
+  char   *name;
+  char    type;
+  int     field;
+  float   Float;
+} dvoStack;
+
+dvoField *ParseCmdlineFields (int argc, char **argv, int table, int *last, int *nfields) {
+
+  int i, Nfields, NFIELDS, 
+
+  *nfields = 0;
+  Nfields = 0;
+  NFIELDS = 10;
+  ALLOCATE (fields, dvoField, NFIELDS);
 
   // examine each argv[i] entry until we reach a where 
-  for (i = 0; (i < argc) && strcasecmp (argv[i], "where"); i++) {
+  for (i = 1; (i < argc) && strcasecmp (argv[i], "where"); i++) {
     // split the word by ","
     p = argv[i];
@@ -32 +52 @@
       // identify field for word
       // need to know which type of fields to look for...
-      ParseAverageField ();
+      // xxx extend this more generally later
+      if (table == DVO_TABLE_MEASURE) {
+        status = ParseMeasureField (&fields[Nfields], field);
+      } 
+      if (table == DVO_TABLE_AVERAGE) {
+        status = ParseAverageField (&fields[Nfields], field);
+      } 
+      if (!status) {
+        gprint (GP_ERR, "unknown database field %s\n", field);
+        free (field);
+        free (fields);
+        return (NULL);
+      }
       free (field);
+
+      Nfields ++;
+      CHECK_REALLOCATE (fields, dvoField, NFIELDS, Nfields, 10);
     }
   }
 
+  *last = i;
+  *nfields = Nfields;
+  return (fields);
+}