Changeset 28373

Timestamp:

Jun 16, 2010, 4:08:30 PM (16 years ago)

Author:

Paul Price

Message:

Fix pending query similar to definerun query.

Location:

trunk/ippTools

Files:

• share/pubtool_pending.sql (modified) (2 diffs)
• src/pubtool.c (modified) (1 diff)

trunk/ippTools/share/pubtool_pending.sql

@@ -27 +27 @@
         AND publishRun.state = 'new'
         AND diffRun.state IN ('full', 'cleaned', 'goto_cleaned')
-        AND (diffRun.magicked > 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
+        AND (diffRun.magicked != 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
         -- WHERE hook %s
     UNION
@@ -48 +48 @@
         AND publishRun.state ='new'
         AND camRun.state IN ('full', 'cleaned', 'goto_cleaned')
-        AND (camRun.magicked > 0 OR publishClient.magicked = 0)
+        AND (camRun.magicked != 0 OR publishClient.magicked = 0)
         -- WHERE hook %s
 ) AS publishToDo

trunk/ippTools/src/pubtool.c

@@ -293 +293 @@
     PXOPT_COPY_STR(config->args, where, "-stage", "publishClient.stage", "==");
     PXOPT_COPY_STR(config->args, where, "-comment", "publishClient.comment", "LIKE");
-    pxAddLabelSearchArgs(config, where, "-label", "label", "==");
+    pxAddLabelSearchArgs(config, where, "-label", "publishRun.label", "==");
 
     // optional