Changeset 24439 for branches/pap_mops/ippTools/src/pubtool.c

Timestamp:

Jun 16, 2009, 2:28:57 PM (17 years ago)

Author:

Paul Price

Message:

Fixing labels for pubtool -pending

File:

• branches/pap_mops/ippTools/src/pubtool.c (modified) (2 diffs)

branches/pap_mops/ippTools/src/pubtool.c

@@ -210 +210 @@
     }
 
+    psString whereClause = psStringCopy(""); // WHERE conditions to add
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " AND %s", whereClause);
-        psFree(whereClause);
+        psString clause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&whereClause, "\nAND %s", clause);
+        psFree(clause);
     }
     psFree(where);
@@ -223 +224 @@
     }
 
-    if (!p_psDBRunQuery(config->dbh, query)) {
-        psError(PS_ERR_UNKNOWN, false, "Database error");
+    if (!p_psDBRunQueryF(config->dbh, query, whereClause, whereClause)) {
+        psError(PS_ERR_UNKNOWN, false, "Database error");
+        psFree(whereClause);
         psFree(query);
         return false;
     }
+    psFree(whereClause);
     psFree(query);