Changeset 8288 for trunk/ippTools/src/dettool.c

Timestamp:

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

Author:

jhoblitt

Message:

updated -pending

File:

• trunk/ippTools/src/dettool.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);