Changeset 35856 for trunk/ippTools/src/stacktool.c

Timestamp:

Jul 25, 2013, 4:05:32 PM (13 years ago)

Author:

watersc1

Message:

Better blocking in stack summary stage

File:

• trunk/ippTools/src/stacktool.c (modified) (2 diffs)

trunk/ippTools/src/stacktool.c

@@ -1475 +1475 @@
   // generate where strings for arguments that require extra processing
   // beyond PXOPT_COPY*
+  psString whereClause;
   if (psListLength(where->list)) {
-    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-    psStringAppend(&query, " AND %s", whereClause);
-    psFree(whereClause);
+    whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+    psStringPrepend(&whereClause, "\n AND ");
   } else if (!all) {
     psError(PXTOOLS_ERR_CONFIG, true, "search parameters or -all are required");
+    psFree(whereClause);
     return false;
   }
@@ -1493 +1494 @@
   }
 
-  if (!p_psDBRunQuery(config->dbh, query)) {
+  if (!p_psDBRunQueryF(config->dbh, query, whereClause)) {
     psError(PS_ERR_UNKNOWN, false, "database error");
+    psFree(whereClause);
     psFree(query);
     return false;
   }
+  psFree(whereClause);
   psFree(query);