Changeset 30049 for trunk/ippTools/share

Timestamp:

Dec 15, 2010, 1:29:28 PM (16 years ago)

Author:

watersc1

Message:

Merge of realtime burntool and new nightly science code into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (2 diffs)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_find_rawexp.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (2 diffs, 1 prop)
• ippTools/share/regtool_checkburntoolimfile.sql (copied) (copied from branches/czw_branch/20101203/ippTools/share/regtool_checkburntoolimfile.sql )
• ippTools/share/regtool_pendingburntoolimfile.sql (copied) (copied from branches/czw_branch/20101203/ippTools/share/regtool_pendingburntoolimfile.sql )
• ippTools/share/regtool_pendingexp.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -316 +316 @@
         receivetool_revert.sql \
         receivetool_toadvance.sql \
+        regtool_checkburntoolimfile.sql \
         regtool_create_dup_table.sql \
         regtool_export_exp.sql \
@@ -331 +332 @@
         regtool_updatebyquery.sql \
         regtool_updatebyqueryimfile.sql \
+        regtool_pendingburntoolimfile.sql \
         stacktool_associationdefine_select.sql \
         stacktool_definebyquery_insert.sql \

trunk/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

trunk/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;
@@ -251 +252 @@
     md5sum VARCHAR(32),
     burntool_state SMALLINT,
+    video_cells TINYINT DEFAULT 0,
     PRIMARY KEY(exp_id, class_id),
     KEY(tmp_class_id),

trunk/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