Changeset 27678

Timestamp:

Apr 14, 2010, 11:46:47 AM (16 years ago)

Author:

Paul Price

Message:

Simplifying stacktool_inputskyfile.sql

Location:

trunk/ippTools

Files:

• share/stacktool_inputskyfile.sql (modified) (1 diff)
• src/stacktool.c (modified) (1 diff)

trunk/ippTools/share/stacktool_inputskyfile.sql

@@ -1 @@
-SELECT DISTINCT
+SELECT
     warpSkyfile.*,
     rawExp.camera
 FROM stackRun
-JOIN stackInputSkyfile
-    USING(stack_id)
-JOIN warpSkyfile
-    ON  stackInputSkyfile.warp_id = warpSkyfile.warp_id
-    AND stackRun.skycell_id       = warpSkyfile.skycell_id
-    AND stackRun.tess_id          = warpSkyfile.tess_id
-JOIN warpRun
-    ON stackInputSkyfile.warp_id = warpRun.warp_id
-JOIN fakeRun
-    USING(fake_id)
-JOIN camRun
-    USING(cam_id)
-JOIN chipRun
-    USING(chip_id)
-JOIN chipProcessedImfile
-    USING(chip_id)
-JOIN rawExp
-    ON chipProcessedImfile.exp_id = rawExp.exp_id
+JOIN stackInputSkyfile USING(stack_id)
+JOIN warpRun USING(warp_id)
+JOIN warpSkyfile USING(warp_id, tess_id, skycell_id)
+JOIN fakeRun USING(fake_id)
+JOIN camRun USING(cam_id)
+JOIN chipRun USING(chip_id)
+JOIN rawExp USING(exp_id)

trunk/ippTools/src/stacktool.c

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