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

Timestamp:

Apr 2, 2013, 3:01:21 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130307

Files:

• . (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/addtool_find_processedexp_cam.sql (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/laptool_filtersforgroup.sql (copied) (copied from trunk/ippTools/share/laptool_filtersforgroup.sql )
• ippTools/share/laptool_pendinggroup.sql (copied) (copied from trunk/ippTools/share/laptool_pendinggroup.sql )
• ippTools/share/laptool_revertgroup.sql (copied) (copied from trunk/ippTools/share/laptool_revertgroup.sql )
• ippTools/share/pxadmin_create_tables.sql (modified) (4 diffs, 1 prop)
• ippTools/share/releasetool_definerelgroup_select_exp_lap.sql (modified) (1 diff)
• ippTools/share/releasetool_pendingrelgroup.sql (modified) (1 diff)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)

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

@@ -457 +457 @@
         laptool_WSdiff_check.sql \
         laptool_stacks.sql \
+        laptool_pendinggroup.sql \
+        laptool_revertgroup.sql \
+        laptool_filtersforgroup.sql \
         vptool_find_rawexp.sql \
         vptool_pendingimfile.sql \

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

@@ -1 +1 @@
 SELECT
     addProcessedExp.*,
-    addRun.workdir
+    addRun.label,
+    addRun.workdir,
+    camRun.cam_id,
+    camRun.label as cam_label,
+    camRun.data_group as cam_data_group,
+    rawExp.exp_id,
+    exp_name
 FROM addProcessedExp
 JOIN addRun

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

@@ -1441 +1441 @@
         outProduct VARCHAR(64),
         uri VARCHAR(255),
-        outdir     VARCHAR(255),
+        outdir VARCHAR(255),
+        username VARCHAR(255),
+        proj_id BIGINT,
+        registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
         timestamp TIMESTAMP,
         fault SMALLINT,
@@ -1448 +1451 @@
         KEY(state),
         KEY(fault),
-        KEY(label)
+        KEY(label),
+        KEY(username)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -2194 +2198 @@
     KEY (state),
     KEY (fault),
+    KEY (group_id),
     FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id),
     FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id),
@@ -2253 +2258 @@
 CREATE TABLE lapGroup  (
     seq_id  BIGINT,
+    tess_id VARCHAR(64),
     projection_cell VARCHAR(64),
     state   VARCHAR(16),
+    label   VARCHAR(64),
+    registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time group was registered
     fault   SMALLINT,
-    PRIMARY KEY(seq_id, projection_cell),
+    PRIMARY KEY(seq_id, tess_id, projection_cell),
     KEY(state),
     KEY(fault),

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

@@ -1 +1 @@
 SELECT relExp.relexp_id
-FROM relGroup JOIN lapRun USING(lap_id)
+FROM relGroup 
+    JOIN lapRun USING(lap_id)
+    JOIN lapExp USING(lap_id)
     JOIN relExp using(rel_id, exp_id)
 WHERE relExp.group_id = 0

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

@@ -1 @@
-SELECT relGroup.*
+SELECT 
+    relGroup.*,
+    ippRelease.release_name
 FROM relGroup
     JOIN ippRelease USING(rel_id)