Changeset 24438

Timestamp:

Jun 16, 2009, 2:24:25 PM (17 years ago)

Author:

Paul Price

Message:

Fixes to get workflow working.

Location:

branches/pap_mops/ippTools

Files:

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

branches/pap_mops/ippTools/share/pubtool_pending.sql

@@ -1 +1 @@
 SELECT
     publishToDo.*
-FROM ((
+FROM (
     SELECT
         publishRun.pub_id,
@@ -16 +16 @@
         AND publishRun.state = 'new'
         AND diffRun.state = 'full'
-    ) AS publishDiffs UNION (
+    UNION
     SELECT
         publishRun.pub_id,
@@ -30 +30 @@
         AND publishRun.state ='new'
         AND camRun.state = 'full'
-    ) AS publishCams
 ) AS publishToDo
 LEFT JOIN publishDone USING(pub_id)

branches/pap_mops/ippTools/src/pubtool.c

@@ -132 +132 @@
     if (psListLength(where->list)) {
         psString clause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&whereClause, " AND %s", clause);
+        psStringAppend(&whereClause, "\n AND %s", clause);
         psFree(clause);
     }
@@ -160 +160 @@
         psTrace("pubtool", PS_LOG_INFO, "No rows found");
         psFree(output);
-        if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "Database error");
-        }
         return true;
     }

branches/pap_mops/ippTools/src/pubtoolConfig.c

@@ -68 +68 @@
     psMetadata *addArgs = psMetadataAlloc();
     psMetadataAddS64(addArgs, PS_LIST_TAIL, "-pub_id", 0, "define pub_id (required)", 0);
+    psMetadataAddStr(addArgs, PS_LIST_TAIL, "-path_base", 0, "define path_base (required)", NULL);
     psMetadataAddS32(addArgs, PS_LIST_TAIL, "-fault", 0, "define fault code", 0);