Changeset 36193 for branches/eam_branches/ipp-20130904/ippTools/share

Timestamp:

Oct 9, 2013, 4:06:36 PM (13 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20130904/ippTools/share

Files:

• . (modified) (1 prop)
• camtool_find_pendingimfile.sql (modified) (1 prop)
• chiptool_setimfiletoupdate.sql (modified) (1 prop)
• pstamptool_pendingdependent.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (1 prop)
• releasetool_listrelstack.sql (modified) (2 diffs)
• warptool_towarped.sql (modified) (1 prop)

branches/eam_branches/ipp-20130904/ippTools/share/pstamptool_pendingdependent.sql

@@ -1 +1 @@
 SELECT DISTINCT
     pstampDependent.*,
+    pstampRequest.label,
     concat( pstampDependent.outdir, '/checkdep.', dep_id, '.log') as logfile,
     IFNULL(Label.priority, 10000) AS priority

branches/eam_branches/ipp-20130904/ippTools/share/releasetool_listrelstack.sql

@@ -10 +10 @@
     skycalResult.path_base AS skycal_path_base,
     skycalRun.data_group AS skycal_data_group,
+    staticskyResult.sky_id AS sky_id,
+    staticskyResult.path_base AS staticsky_path_base,
     'GPC1' AS camera
 FROM relStack
@@ -18 +20 @@
 LEFT JOIN skycalRun USING(skycal_id)
 LEFT JOIN skycalResult USING(skycal_id)
+LEFT JOIN staticskyResult USING(sky_id)