Changeset 28472

Timestamp:

Jun 24, 2010, 12:50:19 PM (16 years ago)

Author:

Paul Price

Message:

Fix pending queries.

Location:

branches/pap/ippTools

Files:

• share/bgtool_tochip.sql (modified) (1 diff)
• share/bgtool_towarp.sql (modified) (1 diff)
• src/bgtool.c (modified) (3 diffs)

branches/pap/ippTools/share/bgtool_tochip.sql

@@ -15 +15 @@
     AND chipProcessedImfile.quality = 0
     AND (Label.active OR Label.active IS NULL)
+-- WHERE hook %s
+ORDER BY priority DESC, chip_bg_id

branches/pap/ippTools/share/bgtool_towarp.sql

@@ -22 +22 @@
     AND chipBackgroundImfile.quality = 0
     AND (Label.active OR Label.active IS NULL)
+-- WHERE hook %s
+ORDER BY priority DESC, chip_bg_id

branches/pap/ippTools/src/bgtool.c

@@ -495 +495 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-chip_bg_id", "chipBackgroundRun.chip_bg_id", "==");
-    pxAddLabelSearchArgs (config, where, "-label", "chipBackgroundRun.label", "==");
+    pxAddLabelSearchArgs(config, where, "-label", "chipBackgroundRun.label", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -514 +514 @@
     psFree(where);
 
-    psString limitString = psStringCopy("\nORDER BY priority DESC, chip_bg_id");
     if (limit) {
-        psStringAppend(&limitString, "%s", psDBGenerateLimitSQL(limit));
+        psString limitString = psDBGenerateLimitSQL(limit);
         psStringAppend(&query, " %s", limitString);
-    }
-
-    if (!p_psDBRunQueryF(config->dbh, query, whereStr, limitString, whereStr,  limitString)) {
+        psFree(limitString);
+    }
+
+    if (!p_psDBRunQueryF(config->dbh, query, whereStr)) {
         psError(psErrorCodeLast(), false, "database error");
         psFree(query);
         return false;
     }
-    psFree(limitString);
     psFree(whereStr);
     psFree(query);
@@ -1286 +1285 @@
     psFree(where);
 
-    psString limitString = psStringCopy("\nORDER BY priority DESC, warp_bg_id");
     if (limit) {
-        psStringAppend(&limitString, "%s", psDBGenerateLimitSQL(limit));
+        psString limitString = psDBGenerateLimitSQL(limit)
         psStringAppend(&query, " %s", limitString);
-    }
-
-    if (!p_psDBRunQueryF(config->dbh, query, whereStr, limitString, whereStr,  limitString)) {
+        psFree(limitString);
+    }
+
+    if (!p_psDBRunQueryF(config->dbh, query, whereStr)) {
         psError(psErrorCodeLast(), false, "database error");
         psFree(query);
         return false;
     }
-    psFree(limitString);
     psFree(whereStr);
     psFree(query);