Changeset 20862 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/avextract.c

Timestamp:

Dec 1, 2008, 4:25:00 AM (18 years ago)

Author:

eugene

Message:

finish imextract conversion to SQL style syntax

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/avextract.c (modified) (7 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/dvo/avextract.c

@@ -6 +6 @@
   int Nsecfilt, mode, VERBOSE;
   char **cstack, name[1024];
+  void *Signal;
+
+  Catalog catalog;
+
+  Vector **vec;
+  PhotCode *code;
+  dbStack *stack;
+  dbField *fields;
   dbValue *values;
-  void *Signal;
-
-  Catalog catalog;
   SkyList *skylist;
   SkyRegionSelection *selection;
-  PhotCode *code;
-  Vector **vec;
-  dbField *fields;
-  dbStack *stack;
 
   /* defaults */
+  vec = NULL;
+  code = NULL;
+  stack = NULL;
+  fields = NULL;
+  values = NULL;
   skylist = NULL;
   selection = NULL;
-  code = NULL;
+
   mode = MAG_AVE;
-  fields = NULL;
-  stack = NULL;
 
   if ((N = get_argument (argc, argv, "-h"))) goto help;
@@ -66 +70 @@
   Nreturn = Nfields; 
   if (!dbCheckStack (stack, Nstack, DVO_TABLE_AVERAGE, &fields, &Nfields)) goto escape;
-  // XXX handle errors
 
   /* load region corresponding to selection above */
@@ -81 +84 @@
     }
     if ((vec[i] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) goto escape;
+    ResetVector (vec[i], fields[i].type, NPTS);
   }
 
@@ -109 +113 @@
 
       m = catalog.average[j].measureOffset;
-      dbExtractAveragesInit (); // reset counters for saved fields 
+
+      // reset counters for saved fields, extract fields
+      dbExtractAveragesInit (); 
       for (n = 0; n < Nfields; n++) {
         values[n] = dbExtractAverages (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], &fields[n]);
       }
+
       // test the conditional statement
       if (!dbBooleanCond (stack, Nstack, values)) continue;
@@ -126 +133 @@
         NPTS += 2000;
         for (n = 0; n < Nreturn; n++) {
-          REALLOCATE (vec[n][0].elements.Flt, opihi_flt, NPTS);
+          if (vec[n][0].type == OPIHI_FLT) {
+            REALLOCATE (vec[n][0].elements.Flt, opihi_flt, NPTS);
+          } else {
+            REALLOCATE (vec[n][0].elements.Int, opihi_int, NPTS);
+          }
         }
       }
@@ -136 +147 @@
   for (n = 0; n < Nreturn; n++) {
     vec[n][0].Nelements = Npts;
-    REALLOCATE (vec[n][0].elements.Flt, opihi_flt, MAX(1,Npts));
-  }
-
-  free (values);
+    if (vec[n][0].type == OPIHI_FLT) {
+      REALLOCATE (vec[n][0].elements.Flt, opihi_flt, MAX(1,Npts));
+    } else {
+      REALLOCATE (vec[n][0].elements.Int, opihi_int, MAX(1,Npts));
+    }
+  }
+
+  if (vec) free (vec);
+  if (values) free (values);
   dbFreeFields (fields, Nfields);
   dbFreeStack (stack, Nstack);
-  free (stack);
+  if (stack) free (stack);
   SkyListFree (skylist);
   FreeSkyRegionSelection (selection);
@@ -148 +164 @@
 
  escape:
-  free (values);
+  if (vec) free (vec);
+  if (values) free (values);
   dbFreeFields (fields, Nfields);
   dbFreeStack (stack, Nstack);
-  free (stack);
+  if (stack) free (stack);
   SkyListFree (skylist);
   FreeSkyRegionSelection (selection);