Changeset 13440

Timestamp:

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

Author:

eugene

Message:

working towards full boolean db expressions

Location:

branches/kapa-mods-2007-05/Ohana/src/opihi/dvo

Files:

• avextract.c (modified) (2 diffs)
• dbStackMath.c (added)
• db_check_stack.c (added)
• db_convert_to_RPN.c (added)
• dvoBooleanElements.c (added)
• dvoEvaluateStack.c (added)
• dvodb.c (modified) (2 diffs)
• dvofields.c (modified) (5 diffs)

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

@@ -24 +24 @@
   Nsecfilt = GetPhotcodeNsecfilt ();
 
+  // command-line is of the form: avextract field,field, field [where (field op value)...]
+
+  // parse the fields to be extracted and returned
+  narg = argc;
+  fields = ParseCmdlineFields (argc, argv, DVO_TABLE_AVERAGE, &last, &Nfields);
+  if (fields == NULL) return (FALSE);
+
+  // require 'where' before boolean math
+  if ((last != argc) && (strcasecmp(argv[last], "where") || (last >= argc - 2))) {
+    gprint (GP_ERR, "syntax error\n");
+    free (fields);
+    return (FALSE);
+  }
+
+  // parse the remainder of the line as a boolean math expression
+  cstack = isolate_elements (argv-last, &argv[last+1], &Ncstack);
+  
+  // construct the db Boolean math stack
+  dbStack = db_convert_to_RPN (Ncstack, cstack, &NdbStack);
+
+  Nreturn = Nfields; 
+  db_check_stack (dbStack, NdbStack, DVO_TABLE_AVERAGE, fields, &Nfields);
+
   /* interpret command-line options */
   SetSelectionParam (0);
   if (!SetRegionSelection (&argc, argv, &RegionName, &RegionList)) goto escape;
-  if (!SetPhotSelections (&argc, argv, 1)) goto usage;
-
-  /* interpret required command-line arguments: mextract (value) */
-  if (argc != 2) { goto usage; }
-  param = GetAverageParam (argv[1]);
-  if (param == AVE_ZERO) {
-    if (!GetPhotcodeInfo (argv[1], &code, &mode)) {
-      GetAverageParamHelp ();
-      goto escape;
-    }
-    param = AVE_MAG;
-    for (p = argv[1]; *p != 0; p++) { 
-      if (*p == '.') *p = ':';
-    }
-  } 
-  if (!TestPhotSelections (&code, &mode, param)) goto escape;
 
   /* load region corresponding to selection above */
   if ((skylist = SelectRegions (RegionName, RegionList)) == NULL) goto escape;
 
-  /* create storage vector */
-  N = 0;
+  /* create output storage vectors */
+  ALLOCATE (return, float, Nreturn);
+  ALLOCATE (vec, Vector, Nreturn);
+  for (i = 0; i < Nreturn; i++) {
+    if ((vec[i] = SelectVector (fields[i].name, ANYVECTOR, TRUE)) == NULL) goto escape;
+  }
+
+  Npts = 0;
   NPTS = 1;
-  if ((vec = SelectVector (argv[1], ANYVECTOR, TRUE)) == NULL) goto escape;
 
   // XXX need to add interrupt test to this loop
@@ -70 +82 @@
       // extract the relevant values
       for (n = 0; n < Nfields; n++) {
-        value[n] = ExtractAveragesNew (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], field[n]);
+        values[n] = ExtractAveragesNew (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], fields[n]);
       }
       // test the conditional statement
-      if (!CheckBooleanCond (stack, Nstack, value, field, Nfield)) continue;
-      for (n = 0; n < Nfields; n++) {
-        vec[n].elements[N] = value[n];
+      if (!CheckBooleanCond (dbStack, NdbStack, values, fields, Nfields)) continue;
+      for (n = 0; n < Nreturn; n++) {
+        vec[n].elements[N] = values[n];
       }
       N++;

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);
+}

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

@@ -1 @@
-
-# define ESCAPE(F,M) { \
-  field->fieldNumber = (F); \
-  field->magMode = (M); \
-  field->photcode = NULL; \
-  return (TRUE);
 
 int GetMagMode (char *string) {
@@ -20 +14 @@
 }
 
+PhotCode *ParsePhotcodeField (char *field, int *mode, int default) {
+
+  char *tmpstring, *p;
+  PhotCode *code;
+
+  *mode = default;
+
+  p = strchr (field, ':');
+  if (p != NULL) {
+    *mode = GetMagMode (p + 1);
+    if (*mode == MAG_NONE) return (NULL);
+    tmpstring = strncreate (field, p - field);
+  } else {
+    tmpstring = strcreate (field);
+  }
+  code = GetPhotcodebyName (tmpstring);
+  free (tmpstring);
+
+  return (code);
+}
+
+# define ESCAPE(F,M) { \
+  field->ID = (F); \
+  field->magMode = (M); \
+  field->photcode = NULL; \
+  return (TRUE);
+
 int ParseMeasureField (dvoField *field, char *fieldName) {
 
   PhotCode *code;
+
+  field->table = DVO_TABLE_MEASURE;
+  field->name  = strcreate (fieldName);
 
   if (!strcasecmp (fieldName, "RA"))       ESCAPE (MEAS_RA,       MAG_NONE);
@@ -45 +69 @@
 
   // check for code:mode in photcode name 
-  mode = MAG_REL;
-  p = strchr (fieldName, ':');
-  if (p != NULL) {
-    mode = GetMagMode (p + 1);
-    if (mode == MAG_NONE) return (FALSE);
-    tmpstring = strncreate (fieldName, p - fieldName);
-  } else {
-    tmpstring = strcreate (fieldName);
-  }
-  code = GetPhotcodebyName (tmpstring);
-  free (tmpstring);
-
+  code = ParsePhotcodeField (&mode, MAG_REL);
   if (code == NULL) return (FALSE);
 
   if (mode == MAG_ERR) {
-    field->fieldNumber = MEAS_dMAG;
+    field->ID = MEAS_dMAG;
   } else {
-    field->fieldNumber = MEAS_MAG;
+    field->ID = MEAS_MAG;
   }    
   
+  field->magMode = mode;
   field->photcode = code;
   return (TRUE);
@@ -72 +86 @@
 
   PhotCode *code;
+
+  field->table = DVO_TABLE_AVERAGE;
 
   if (!strcasecmp (fieldName, "RA"))    ESCAPE (AVE_RA,        MAG_NONE);
@@ -98 +114 @@
 
   // check for code:mode in photcode name 
-  mode = MAG_AVE;
-  p = strchr (fieldName, ':');
-  if (p != NULL) {
-    mode = GetMagMode (p + 1);
-    if (mode == MAG_NONE) return (FALSE);
-    tmpstring = strncreate (fieldName, p - fieldName);
-  } else {
-    tmpstring = strcreate (fieldName);
-  }
-  code = GetPhotcodebyName (tmpstring);
-  free (tmpstring);
-
+  code = ParsePhotcodeField (&mode, MAG_AVE);
   if (code == NULL) return (FALSE);
 
   // need to distinguish phot, sys errors and scatter
   if (mode == MAG_ERR) {
-    field->fieldNumber = MEAS_dMAG;
+    field->ID = MEAS_dMAG;
   } else {
-    field->fieldNumber = MEAS_MAG;
+    field->ID = MEAS_MAG;
   }    
   
+  field->magMode = mode;
   field->photcode = code;
   return (TRUE);