Changeset 36633 for trunk/ippTools/share

Timestamp:

Apr 2, 2014, 10:50:14 AM (12 years ago)

Author:

bills

Message:

Merge with ipp-20140401 (The staticsky tag)

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/share/fftool_definebyquery_select_warps.sql (modified) (1 diff)
• ippTools/share/fftool_result.sql (modified) (1 diff)
• ippTools/share/fftool_summary.sql (modified) (1 diff)
• ippTools/share/fftool_toadvance.sql (modified) (1 diff)

trunk/ippTools/share/fftool_definebyquery_select_warps.sql

@@ -5 +5 @@
     JOIN chipRun USING(chip_id)
     JOIN rawExp USING(exp_id)
+    JOIN skycell ON skycell.tess_id = warpSkyfile.tess_id AND skycell.skycell_id = warpSkyfile.skycell_id
 WHERE warpRun.tess_id = '%s' AND warpSkyfile.skycell_id = '%s' AND rawExp.filter = '%s'
     AND warpRun.state = 'full' AND warpSkyfile.quality = 0 and warpSkyfile.fault = 0

trunk/ippTools/share/fftool_result.sql

@@ -6 +6 @@
     fullForceRun.skycal_id,
     fullForceRun.workdir,
+    fullForceRun.sources_path_base,
     CONCAT_WS('.', warp_id, skycell_id) AS dist_component,
     stackRun.tess_id,

trunk/ippTools/share/fftool_summary.sql

@@ -6 +6 @@
     fullForceRun.skycal_id,
     fullForceRun.workdir,
+    fullForceRun.sources_path_base,
     'summary' AS dist_component,
     stackRun.tess_id,

trunk/ippTools/share/fftool_toadvance.sql

@@ -15 +15 @@
     JOIN rawExp USING(exp_id)
     LEFT JOIN fullForceResult USING(ff_id, warp_id)
-WHERE fullForceRun.state = 'new'
+    LEFT JOIN fullForceSummary USING(ff_id)
+WHERE fullForceRun.state = 'new' AND fullForceSummary.ff_id IS NULL
     -- WHERE hook %s
     GROUP BY ff_id