Changeset 21098

Timestamp:

Jan 9, 2009, 10:08:38 AM (17 years ago)

Author:

bills

Message:

where clauses for stack tables were in the wrong part of the query

Location:

trunk/ippTools

Files:

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

trunk/ippTools/share/difftool_definebyquery_part2.sql

@@ -19 +19 @@
             FROM stackRun
             JOIN stackSumSkyfile USING(stack_id)
+            -- stacks where hook %s
             GROUP BY 
                 skycell_id,
@@ -31 +32 @@
         -- (good fraction test goes here for example also above)
         -- warp where hook %s
-        -- stacks where hook %s

trunk/ippTools/src/difftool.c

@@ -1003 +1003 @@
     if (psListLength(stackWhere->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(stackWhere, NULL);
-        psStringAppend(&stackQuery, "\nAND %s", whereClause);
+        psStringAppend(&stackQuery, "\nWHERE %s", whereClause);
         psFree(whereClause);
     } else {
@@ -1112 +1112 @@
             return false;
         }
-        if (!p_psDBRunQuery(config->dbh, skycell_query, warp_id, filter, warpQuery, stackQuery)) {
+        if (!p_psDBRunQuery(config->dbh, skycell_query, stackQuery, warp_id, filter, warpQuery)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(warpQuery);