Changeset 25515 for trunk/ippTools/src/difftool.c

Timestamp:

Sep 23, 2009, 3:15:52 PM (17 years ago)

Author:

Paul Price

Message:

Fixing query for advance mode.

File:

• trunk/ippTools/src/difftool.c (modified) (3 diffs)

trunk/ippTools/src/difftool.c

@@ -583 +583 @@
     }
 
+    psString whereString = psStringCopy("");
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " WHERE %s", whereClause);
+        psStringAppend(&whereString, "\n AND %s", whereClause);
         psFree(whereClause);
     }
@@ -599 +600 @@
     if (!psDBTransaction(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-
-    if (!p_psDBRunQuery(config->dbh, query)) {
+        psFree(whereString);
+        return false;
+    }
+
+    if (!p_psDBRunQueryF(config->dbh, query, whereString)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);
+        psFree(whereString);
         if (!psDBRollback(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -611 +614 @@
     }
     psFree(query);
+    psFree(whereString);
 
     psArray *output = p_psDBFetchResult(config->dbh);