Changeset 29982 for branches/czw_branch/20101203/ippTools/share

Timestamp:

Dec 8, 2010, 7:21:36 PM (16 years ago)

Author:

watersc1

Message:

rtbt works in test case up through auto-chip-queue

Location:

branches/czw_branch/20101203/ippTools/share

Files:

• chiptool_find_rawexp.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (1 diff)
• regtool_pendingburntoolimfile.sql (modified) (1 diff)
• regtool_pendingexp.sql (modified) (1 diff)

branches/czw_branch/20101203/ippTools/share/chiptool_find_rawexp.sql

@@ -1 +1 @@
 -- this query is used to find potental rawExps to be queued for chiptool
 -- processeing
-SELECT
+SELECT DISTINCT 
     rawExp.*,
     newExp.label
 FROM rawExp
 JOIN newExp using (exp_id)
+LEFT JOIN chipRun USING (exp_id)
 WHERE
     rawExp.fault = 0

branches/czw_branch/20101203/ippTools/share/pxadmin_create_tables.sql

@@ -9 +9 @@
     uri VARCHAR(255),
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    use_compress SMALLINT,
     PRIMARY KEY(camera, telescope)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;

branches/czw_branch/20101203/ippTools/share/regtool_pendingburntoolimfile.sql

@@ -25 +25 @@
             LEFT JOIN newImfile USING(exp_id)
             LEFT JOIN rawExp USING(exp_id, exp_name)
-            LEFT JOIN rawImfile ON (rawImfile.exp_name = rawExp.exp_name AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
+            LEFT JOIN rawImfile ON (rawImfile.exp_name = newExp.tmp_exp_name AND rawImfile.tmp_class_id = newImfile.tmp_class_id)
        WHERE
              summitExp.dateobs >= '@DATE@T00:00:00'

branches/czw_branch/20101203/ippTools/share/regtool_pendingexp.sql

@@ -39 +39 @@
         newExp.state = 'run'
         AND rawExp.exp_id IS NULL
+        AND rawImfile.data_state = 'full'
 -- where hook %s
     GROUP BY