Changeset 34786 for branches/czw_branch/20120906/ippTools/share

Timestamp:

Dec 10, 2012, 4:35:46 PM (14 years ago)

Author:

watersc1

Message:

Merge from trunk

Location:

branches/czw_branch/20120906

Files:

• . (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (3 diffs)
• ippTools/share/camtool_pendingcleanuprun.sql (modified) (1 diff)
• ippTools/share/chiptool_pendingcleanupimfile_all.sql (copied) (copied from trunk/ippTools/share/chiptool_pendingcleanupimfile_all.sql )
• ippTools/share/chiptool_pendingcleanuprun.sql (modified) (1 diff)
• ippTools/share/difftool_pendingcleanuprun.sql (modified) (4 diffs)
• ippTools/share/difftool_pendingcleanupskyfile_all.sql (copied) (copied from trunk/ippTools/share/difftool_pendingcleanupskyfile_all.sql )
• ippTools/share/pstamptool_revertdependent.sql (modified) (1 diff)
• ippTools/share/stacktool_pendingcleanuprun.sql (modified) (1 diff)
• ippTools/share/staticskytool_defineskycalrun.sql (modified) (2 diffs)
• ippTools/share/warptool_pendingcleanuprun.sql (modified) (1 diff)
• ippTools/share/warptool_pendingcleanupskyfile_all.sql (copied) (copied from trunk/ippTools/share/warptool_pendingcleanupskyfile_all.sql )

branches/czw_branch/20120906/ippTools/share/Makefile.am

@@ -88 +88 @@
         chiptool_listrun.sql \
         chiptool_pendingcleanupimfile.sql \
+        chiptool_pendingcleanupimfile_all.sql \
         chiptool_pendingcleanuprun.sql \
         chiptool_pendingimfile.sql \
@@ -172 +173 @@
         difftool_pendingcleanuprun.sql \
         difftool_pendingcleanupskyfile.sql \
+        difftool_pendingcleanupskyfile_all.sql \
         difftool_revertdiffskyfile_delete.sql \
         difftool_revertdiffskyfile_updated.sql \
@@ -424 +426 @@
         warptool_pendingcleanuprun.sql \
         warptool_pendingcleanupskyfile.sql \
+        warptool_pendingcleanupskyfile_all.sql \
         warptool_revertoverlap.sql \
         warptool_revertwarped_delete.sql \

branches/czw_branch/20120906/ippTools/share/camtool_pendingcleanuprun.sql

@@ -2 +2 @@
     camRun.cam_id,
     rawExp.camera,
+    rawExp.exp_tag,
+    camRun.workdir,
     camRun.state
 FROM camRun

branches/czw_branch/20120906/ippTools/share/chiptool_pendingcleanuprun.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     chipRun.chip_id,
     rawExp.camera,
-    chipRun.state
+    rawExp.exp_tag,
+    chipRun.state,
+    chipRun.workdir
 FROM chipRun
 JOIN rawExp 

branches/czw_branch/20120906/ippTools/share/difftool_pendingcleanuprun.sql

@@ -6 +6 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun
@@ -35 +37 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun
@@ -64 +68 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun
@@ -93 +99 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun

branches/czw_branch/20120906/ippTools/share/pstamptool_revertdependent.sql

@@ -4 +4 @@
 SET pstampDependent.fault = 0
 -- fault count hook %s
-WHERE pstampDependent.state = 'new'
+WHERE pstampRequest.state ='run'
+    AND pstampJob.state ='run'
+    AND pstampDependent.state = 'new'
     AND (pstampDependent.fault > 0)

branches/czw_branch/20120906/ippTools/share/stacktool_pendingcleanuprun.sql

@@ -8 +8 @@
     stackRun.stack_id,
     rawExp.camera,
-    stackRun.state
+    stackRun.state,
+    stackSumSkyfile.path_base
 FROM stackRun
+JOIN stackSumSkyfile using(stack_id)
 JOIN stackInputSkyfile
     USING(stack_id)

branches/czw_branch/20120906/ippTools/share/staticskytool_defineskycalrun.sql

@@ -2 +2 @@
     sky_id,
     stack_id,
+    skycell_id,
+    filter,
     staticskyRun.workdir,
     staticskyRun.label,
@@ -11 +13 @@
     JOIN stackRun USING(stack_id)
     JOIN stackSumSkyfile USING(stack_id)
+    JOIN skycell USING(tess_id, skycell_id)
     LEFT JOIN skycalRun USING(sky_id, stack_id)
 WHERE staticskyRun.state = 'full'

branches/czw_branch/20120906/ippTools/share/warptool_pendingcleanuprun.sql

@@ -1 +1 @@
 SELECT
     warpRun.warp_id,
+    warpRun.workdir,
     rawExp.camera,
+    rawExp.exp_tag,
     warpRun.state
 FROM warpRun