Changeset 31628 for branches/eam_branches/ipp-20110505/ippTools/share

Timestamp:

Jun 15, 2011, 5:25:23 AM (15 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20110505

Files:

• . (modified) (1 prop)
• ippTools/share/addtool_find_sky_id.sql (modified) (2 diffs)
• ippTools/share/addtool_find_sky_id_dvo.sql (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/laptool_definerun.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/regtool_pendingimfile.sql (modified) (1 diff)

branches/eam_branches/ipp-20110505/ippTools/share/addtool_find_sky_id.sql

@@ -3 +3 @@
 FROM 
      staticskyResult
-join staticSkyRun using (sky_id)
-join staticSkyInput using (stack_id)
+join staticskyRun using (sky_id)
+join staticskyInput using(sky_id)
 JOIN stackRun USING(stack_id)
 
@@ -13 +13 @@
           ) as foo
      ON sky_id = added_sky_id 
-     AND stage = 'sky'
+     AND stage = 'staticsky'
      -- hook for qualifying the join on the previous_dvodb
      AND %s

branches/eam_branches/ipp-20110505/ippTools/share/addtool_find_sky_id_dvo.sql

@@ -1 +1 @@
 SELECT staticskyRun.* FROM staticskyResult
 JOIN staticskyRun USING(sky_id)
+join staticskyInput using(sky_id)
+JOIN stackRun USING(stack_id)
+
 WHERE staticskyRun.state = 'full' and staticskyResult.quality = 0
     AND sky_id NOT IN (SELECT sky_id

branches/eam_branches/ipp-20110505/ippTools/share/laptool_definerun.sql

@@ -8 +8 @@
   ) AS want
   LEFT JOIN 
-  (SELECT exp_id,MAX(chip_id) AS chip_id
-     FROM lapExp 
+  (SELECT exp_id,MAX(chip_id) AS chip_id, chipRun.state
+     FROM lapExp JOIN chipRun USING(exp_id,chip_id) 
      where private IS FALSE 
      AND chip_id IS NOT NULL
-     AND active = TRUE ) AS have USING(exp_id)
+     AND 
+         (
+          -- (active = TRUE) OR 
+          (chipRun.state = 'full') OR
+          (chipRun.state = 'new')
+          -- when we can do updates, put that here.
+          )
+     GROUP BY exp_id
+) AS have USING(exp_id)
      
 

branches/eam_branches/ipp-20110505/ippTools/share/regtool_pendingimfile.sql

@@ -8 +8 @@
     newImfile.uri,
     newImfile.bytes,
-    newImfile.md5sum
+    newImfile.md5sum,
+    summitExp.dateobs AS summit_dateobs
 FROM newImfile
 JOIN newExp
     USING(exp_id)
+JOIN summitExp USING(summit_id)
 LEFT JOIN rawImfile
     ON newExp.exp_id = rawImfile.exp_id