Changeset 19276

Timestamp:

Aug 28, 2008, 4:24:03 PM (18 years ago)

Author:

bills

Message:

fix incorrect sql for stackSumSkyfile lookup

Location:

trunk/ippTools

Files:

• share/stacktool_sumskyfile.sql (modified) (2 diffs)
• src/stacktool.c (modified) (1 diff)

trunk/ippTools/share/stacktool_sumskyfile.sql

@@ -6 +6 @@
 JOIN stackSumSkyfile
     USING(stack_id)
+JOIN stackInputSkyfile
+    USING(stack_id)
 JOIN warpRun
-    -- just need 1 warp to find the camera
-    ON warpRun.warp_id = (SELECT warp_id FROM stackInputSkyfile 
-                            WHERE stackInputSkyfile.stack_id = stackRun.stack_id limit 1)
+    USING(warp_id)
 JOIN fakeRun
     ON warpRun.fake_id = fakeRun.fake_id
@@ -18 +18 @@
 JOIN rawExp
     ON chipRun.exp_id  = rawExp.exp_id
-WHERE
--- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too
--- XXX EAM : this is not needed : fix the stacktool code.
-    stackRun.stack_id is NOT NULL

trunk/ippTools/src/stacktool.c

@@ -749 +749 @@
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " AND %s", whereClause);
+        psStringAppend(&query, " WHERE %s", whereClause);
         psFree(whereClause);
     }