Changeset 6157

Timestamp:

Jan 21, 2006, 7:16:02 PM (20 years ago)

Author:

jhoblitt

Message:

fix handling of no search parameters

Location:

trunk/ippTools/src

Files:

• p2searchPendingFrames.c (modified) (2 diffs)
• p2searchRawFrames.c (modified) (2 diffs)

trunk/ippTools/src/p2searchPendingFrames.c

@@ -5 +5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    // build 'where' structure
     psMetadata *where = psMetadataAlloc();
 
-    // in order to include these restrictions, we need to define these table columns
     if (config->camera_name != NULL) {
         psMetadataAddStr(where, PS_LIST_TAIL, "camera", 0, "==",
@@ -37 +35 @@
     }
     */
+
+    // 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 = p2PendingExpSelectRowObjects(config->database, where, MAX_ROWS);

trunk/ippTools/src/p2searchRawFrames.c

@@ -5 +5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    // build 'where' structure
-    psMetadata *where = NULL;
+    psMetadata *where = psMetadataAlloc();
    
-//    psMetadataAddS32  (where, PS_LIST_TAIL, "TYPE",  0, "==", P2_TYPE_OBJECT);
-
     if (config->camera_name != NULL) {
         psMetadataAddStr(where, PS_LIST_TAIL, "camera", 0, "==",
@@ -26 +23 @@
     */
 
+    // 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);
+    psFree(where);
     if (!exposures) {
         psError(PS_ERR_UNKNOWN, false, "no rawScienceExp rows found");