Changeset 6214 for trunk/ippTools/src/p2searchDoneFrames.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/p2searchDoneFrames.c (modified) (3 diffs)

trunk/ippTools/src/p2searchDoneFrames.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);
-    }
-
-    if (where->list->n < 1) {
-       psFree(where);
-       where = NULL;
-    }
-
-    psArray *exposures = p2DoneExpSelectRowObjects(config->database, where, 
-        MAX_ROWS);
-    psFree (where);
+    psArray *exposures = p2DoneExpSelectRowObjects(config->database,
+        config->where, MAX_ROWS);
     if (!exposures) {
         psError(PS_ERR_UNKNOWN, false, "no p2DoneExp rows found");
@@ -34 +17 @@
     frames->n = 0;
 
-    // 'where' to select each exposure
-    where = psMetadataAlloc ();
     for (int i = 0; i < exposures->n; i++) {
         p2DoneExpRow *exposure = exposures->data[i];
 
+        // 'where' to select each exposure
+        psMetadata *where = psMetadataAlloc ();
         psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", PS_META_REPLACE, "==",
             exposure->exp_id);
@@ -44 +27 @@
         psArray *images = p2DoneImfileSelectRowObjects(config->database, where,
             MAX_ROWS);
+        psFree(where);
         if (!images) {
             psError(PS_ERR_UNKNOWN, false, "database access failed");