Changeset 35412 for branches/eam_branches/ipp-20130307/ippTools/share

Timestamp:

Apr 19, 2013, 3:39:39 PM (13 years ago)

Author:

eugene

Message:

merged from trunk

Location:

branches/eam_branches/ipp-20130307/ippTools/share

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• camtool_find_pendingimfile.sql (modified) (1 prop)
• chiptool_setimfiletoupdate.sql (modified) (1 prop)
• pstamptool_completedreq.sql (modified) (1 diff)
• pstamptool_getdependent.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (1 prop)
• releasetool_listrelexp.sql (modified) (1 diff)
• releasetool_listrelstack.sql (copied) (copied from trunk/ippTools/share/releasetool_listrelstack.sql )
• releasetool_pendingrelgroup.sql (modified) (1 diff)
• warptool_towarped.sql (modified) (1 prop)

branches/eam_branches/ipp-20130307/ippTools/share/Makefile.am

@@ -473 +473 @@
         releasetool_definerelstack.sql \
         releasetool_definerelstack_with_skycal.sql \
+        releasetool_listrelstack.sql \
         releasetool_definerelgroup_select_lap.sql \
         releasetool_definerelgroup_select_data_group.sql \

branches/eam_branches/ipp-20130307/ippTools/share/pstamptool_completedreq.sql

@@ -8 +8 @@
         SELECT count(*) FROM pstampJob 
         WHERE pstampJob.req_id = pstampRequest.req_id
-                AND pstampJob.state != 'stop'
+                AND pstampJob.state != 'stop' 
+                AND pstampJob.state != 'cancel'
         ) = 0

branches/eam_branches/ipp-20130307/ippTools/share/pstamptool_getdependent.sql

@@ -1 +1 @@
 SELECT DISTINCT pstampDependent.*
 FROM pstampDependent
-WHERE pstampDependent.state = 'new'
+WHERE (pstampDependent.state = 'new' OR pstampDependent.state = 'hold')

branches/eam_branches/ipp-20130307/ippTools/share/releasetool_listrelexp.sql

@@ -25 +25 @@
     warpRun.warp_id,
     warpRun.state as warp_state,
+    warpRun.tess_id,
     rawExp.filter,
     rawExp.dateobs,

branches/eam_branches/ipp-20130307/ippTools/share/releasetool_pendingrelgroup.sql

@@ -5 +5 @@
     JOIN ippRelease USING(rel_id)
 WHERE relGroup.state = 'new'
+    AND relGroup.fault = 0