Changeset 8288

Timestamp:

Aug 10, 2006, 7:26:49 PM (20 years ago)

Author:

jhoblitt

Message:

updated -pending

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (1 diff)
• dettoolConfig.c (modified) (1 diff)

trunk/ippTools/src/dettool.c

@@ -110 +110 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-     char *query = "SELECT rawDetrendExp.* FROM rawDetrendExp"
+     psString query = psStringCopy("SELECT rawDetrendExp.* FROM rawDetrendExp"
         " LEFT JOIN detInputExp ON rawDetrendExp.exp_id = detInputExp.exp_id"
-        " WHERE detInputExp.exp_id IS NULL";
+        " WHERE detInputExp.exp_id IS NULL");
+
+    if (config->where) {
+        psString whereClaus = psDBGenerateWhereConditionSQL(config->where);
+        psStringAppend(&query, " AND %s", whereClaus);
+        psFree(whereClaus);
+    }
 
     if (!p_psDBRunQuery(config->dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
         return false;
     } 
+    psFree(query);
 
     psArray *output = p_psDBFetchResult(config->dbh);

trunk/ippTools/src/dettoolConfig.c

@@ -23 +23 @@
     // -pending
     psMetadata *pendingArgs = psMetadataAlloc();
+    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_id",  0,
+            "search by exposure ID", NULL);
+    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type",  0,
+            "search by exposure type", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-inst",  0,
-            "define camera of interest", NULL);
+            "search by camera", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-telescope",  0,
-            "define telescope of interest", NULL);
+            "search by telescope", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-filter",  0,
-            "define filter of interest", NULL);
-    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_id",  0,
-            "define exposure ID", NULL);
-    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type",  0,
-            "define exposure type", NULL);
+            "search by filter", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-uri",  0,
-            "define URL", NULL);
+            "searc hby URL", NULL);
     psMetadataAddBool(pendingArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);