Changeset 27445 for trunk/ippTools

Timestamp:

Mar 24, 2010, 10:49:29 PM (16 years ago)

Author:

Paul Price

Message:

Only select warp runs that are 'full'. This is necessary following the removal of the '-available' flag.

Location:

trunk/ippTools

Files:

• share/difftool_definewarpwarp_select.sql (modified) (1 diff)
• src/difftool.c (modified) (2 diffs)

trunk/ippTools/share/difftool_definewarpwarp_select.sql

@@ -23 +23 @@
     ON templateRawExp.exp_id = templateChipRun.exp_id
     AND templateRawExp.filter = inputRawExp.filter
+WHERE inputWarpRun.state = 'full'
+    AND templateWarpRun.state = 'full'
 -- WHERE hook %s
 GROUP BY input_warp_id

trunk/ippTools/src/difftool.c

@@ -1656 +1656 @@
     if (psListLength(selectWhere->list)) {
         psString new = psDBGenerateWhereConditionSQL(selectWhere, NULL);
-        psStringAppend(&whereClause, "\n%s %s", whereClause ? "AND" : "WHERE", new);
+        psStringAppend(&whereClause, "\nAND %s", new);
         psFree(new);
     }
@@ -1662 +1662 @@
 
     if (!rerun) {
-        psStringAppend(&whereClause, "\n%s diffs.diff_id IS NULL", whereClause ? "AND" : "WHERE");
+        psStringAppend(&whereClause, "\nAND diffs.diff_id IS NULL");
     }