Changeset 26180 for trunk/ippTools

Timestamp:

Nov 18, 2009, 10:11:43 AM (17 years ago)

Author:

bills

Message:

remove diffRun state checks from -inputskyfile. They were broken for
state = 'update' and aren't needed. Fix handling of -template and -input parameters

Location:

trunk/ippTools

Files:

• share/difftool_inputskyfile.sql (modified) (4 diffs)
• src/difftool.c (modified) (2 diffs)

trunk/ippTools/share/difftool_inputskyfile.sql

@@ -29 +29 @@
     JOIN rawExp
         USING(exp_id)
-    WHERE
-        (diffRun.state = 'new' or diffRun.state = 'full')
-        AND (warpRun.state = 'full')
         -- where hook %s
     UNION
@@ -63 +60 @@
     JOIN rawExp
         USING(exp_id)
-    WHERE
-        (diffRun.state = 'new' or diffRun.state = 'full')
-        AND (warpRun.state = 'full')
         -- where hook %s
     UNION
@@ -97 +91 @@
     JOIN rawExp
         USING(exp_id)
-    WHERE
-        (diffRun.state = 'new' or diffRun.state = 'full')
         -- where hook %s
     UNION
@@ -130 +122 @@
     JOIN rawExp
         USING(exp_id)
-    WHERE
-        (diffRun.state = 'new' or diffRun.state = 'full')
         -- where hook %s
     ) as Foo
+-- template where hook %s

trunk/ippTools/src/difftool.c

@@ -386 +386 @@
     if (psListLength(where->list)) {
         whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringPrepend(&whereClause, "\n AND ");
+        psStringPrepend(&whereClause, "\n WHERE ");
     }
     psFree(where);
 
     // Add condition to get only templates or only inputs
+    psString templateClause = NULL;
     {
-        psString templateClause = NULL;
         if (template) {
-            psStringAppend(&templateClause, " %s", " template != 0");
+            psStringAppend(&templateClause, "\n WHERE %s", " template != 0");
         } else if (input) {
-            psStringAppend(&templateClause, " %s", " template = 0");
-        }
-        if (templateClause) {
-            psStringAppend(&whereClause, "\n AND %s", templateClause);
-        }
-        psFree(templateClause);
+            psStringAppend(&templateClause, "\n WHERE %s", " template = 0");
+        }
     }
 
@@ -412 +408 @@
     }
 
-    if (!p_psDBRunQueryF(config->dbh, query, whereClause, whereClause, whereClause, whereClause)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
+    if (!p_psDBRunQueryF(config->dbh, query, whereClause, whereClause, whereClause, whereClause, templateClause)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(templateClause);
         psFree(whereClause);
         psFree(query);
         return false;
     }
+    psFree(templateClause);
     psFree(whereClause);
     psFree(query);