Changeset 27679

Timestamp:

Apr 14, 2010, 11:54:15 AM (16 years ago)

Author:

Paul Price

Message:

Fix stacktool -tosum to require that all inputs have state = 'full'.

Location:

trunk/ippTools

Files:

• share/stacktool_tosum.sql (modified) (2 diffs)
• src/stacktool.c (modified) (2 diffs)

trunk/ippTools/share/stacktool_tosum.sql

@@ -1 @@
-SELECT DISTINCT
+SELECT
     stackRun.stack_id,
     stackRun.tess_id,
@@ -8 +8 @@
     stackRun.state
 FROM stackRun
-JOIN stackInputSkyfile
-    USING(stack_id)
-LEFT JOIN stackSumSkyfile
-    USING(stack_id)
+JOIN stackInputSkyfile USING(stack_id)
+JOIN warpRun USING(warp_id)
+LEFT JOIN stackSumSkyfile USING(stack_id)
 WHERE
     ((stackRun.state = 'new' AND stackSumSkyfile.stack_id IS NULL)
     OR (stackRun.state = 'update' AND stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0))
+    -- WHERE hook %s
+GROUP BY stack_id
+HAVING COUNT(warpRun.state = 'full') = COUNT(stackInputSkyfile.warp_id)

trunk/ippTools/src/stacktool.c

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