Changeset 35213 for trunk/ippTools/share

Timestamp:

Feb 28, 2013, 3:29:26 PM (13 years ago)

Author:

bills

Message:

Add tables relGroup and lapGroup
Add group_id to relExp
Rename releaseName release_name because I kept typing it wrong.

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (3 diffs)
• releasetool_definerelexp.sql (modified) (1 diff)
• releasetool_definerelgroup_select_data_group.sql (added)
• releasetool_definerelgroup_select_exp_data_group.sql (added)
• releasetool_definerelgroup_select_exp_lap.sql (added)
• releasetool_definerelgroup_select_lap.sql (added)
• releasetool_listrelexp.sql (modified) (2 diffs)
• releasetool_tocalibexp.sql (added)
• reltool_pendinggroup.sql (added)

trunk/ippTools/share/Makefile.am

@@ -464 +464 @@
         sctool_list.sql \
         releasetool_listsurvey.sql \
+        releasetool_tocalibexp.sql \
         releasetool_listrelease.sql \
         releasetool_listrelexp.sql \
         releasetool_definerelexp.sql \
         releasetool_definerelstack.sql \
-        releasetool_definerelstack_with_skycal.sql
+        releasetool_definerelstack_with_skycal.sql \
+        releasetool_definerelgroup_select_lap.sql \
+        releasetool_definerelgroup_select_data_group.sql \
+        releasetool_definerelgroup_select_exp_data_group.sql \
+        releasetool_definerelgroup_select_exp_lap.sql
 

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -2164 +2164 @@
     rel_id      INT(8) AUTO_INCREMENT,
     surveyID    INT(8),
-    releaseName VARCHAR(64),
+    release_name VARCHAR(64),
     relase_state VARCHAR(16),   -- active, pending, archive, drop 
     dataRelease INT(8),         -- PSPS dataRelease
     priority    INT(8),
     PRIMARY KEY(rel_id),
-    KEY(releaseName),
+    KEY(release_name),
     KEY(state),
     KEY(priority),
@@ -2181 +2181 @@
     chip_id     BIGINT,         -- links to the runs that supplied the data
     cam_id      BIGINT,         -- for this release
+    group_id    INT(8),         -- id of relGroup that this exposure is contained in
     state       VARCHAR(16),    -- released, pending, archive, drop  
     flags       INT UNSIGNED,   -- flags for relphot, relastro, ??
@@ -2229 +2230 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE relGroup (
+    group_id    INT(8) AUTO_INCREMENT,
+    rel_id      INT(8),
+    group_type  VARCHAR(16),
+    lap_id      BIGINT,
+    group_name  VARCHAR(16),
+    state       VARCHAR(16),    -- new full
+    label       VARCHAR(64),
+    exp_list_path   VARCHAR(255),
+    fault SMALLINT NOT NULL,
+    registered  DATETIME,
+    PRIMARY KEY (group_id),
+    KEY (rel_id, group_name),
+    KEY (group_type),
+    KEY (lap_id),
+    KEY (group_name),
+    KEY (state),
+    KEY (label),
+    KEY (fault),
+    FOREIGN KEY(rel_id) REFERENCES ippRelease(rel_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 
 

trunk/ippTools/share/releasetool_definerelexp.sql

@@ -1 +1 @@
 SELECT
     ippRelease.rel_id,
-    ippRelease.releaseName,
+    ippRelease.release_name,
     rawExp.exp_name,
     rawExp.filter,

trunk/ippTools/share/releasetool_listrelexp.sql

@@ -2 +2 @@
     relexp_id,
     relExp.state,
-    ippRelease.releaseName,
+    relExp.fault,
+    ippRelease.release_name,
     ippRelease.release_state,
     ippRelease.rel_id,
@@ -21 +22 @@
     camProcessedExp.path_base as cam_path_base,
     camProcessedExp.fwhm_major,
+    camProcessedExp.fwhm_minor,
     warpRun.warp_id,
     warpRun.state as warp_state,