Changeset 6214 for trunk/ippTools/src/p2searchRawFrames.c

Timestamp:

Jan 26, 2006, 1:48:43 PM (20 years ago)

Author:

jhoblitt

Message:

factor out 'where' query from parameter generation

File:

• trunk/ippTools/src/p2searchRawFrames.c (modified) (2 diffs)

trunk/ippTools/src/p2searchRawFrames.c

@@ -5 +5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    psMetadata *where = psMetadataAlloc();
-   
-    if (config->camera_name != NULL) {
-        psMetadataAddStr(where, PS_LIST_TAIL, "camera", 0, "==",
-            config->camera_name);
-    }
-    if (config->filter != NULL) {
-        psMetadataAddStr(where, PS_LIST_TAIL, "filter", 0, "==",
-            config->filter);
-    }
-    // psMetadataConfig does not support times yet
-    /*
-    if (!psTimeIsZero(config->start) && !psTimeIsZero(config->stop)) {
-        psMetadataAddTime (where, PS_LIST_TAIL, "TIME_START", 0, "<", config->stop);
-        psMetadataAddTime (where, PS_LIST_TAIL, "TIME_STOP", 0, ">", config->start);
-    }
-    */
-
-    // if no search criteria were added then set where to NULL to search for
-    // everything
-    // XXX fix handling of where
-    if (where->list->n < 1) {
-        psFree(where);
-        where = NULL;
-    }
-
-    psArray *exposures = rawScienceExpSelectRowObjects(config->database, where, 
-        MAX_ROWS);
-    psFree(where);
+    psArray *exposures = rawScienceExpSelectRowObjects(config->database,
+        config->where, MAX_ROWS);
     if (!exposures) {
         psError(PS_ERR_UNKNOWN, false, "no rawScienceExp rows found");
@@ -45 +18 @@
 
     // 'where' to select each exposure
-    where = psMetadataAlloc ();
+    psMetadata *where = psMetadataAlloc ();
     for (int i = 0; i < exposures->n; i++) {
         rawScienceExpRow *exposure = exposures->data[i];