Changeset 28375 for trunk/ippTools/share

Timestamp:

Jun 16, 2010, 5:30:27 PM (16 years ago)

Author:

watersc1

Message:

merge of stack association and warp/stack/diff jpegs

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (4 diffs)
• ippTools/share/difftool_addsummary.sql (copied) (copied from branches/czw_branch/20100519/ippTools/share/difftool_addsummary.sql )
• ippTools/share/difftool_tosummary.sql (copied) (copied from branches/czw_branch/20100519/ippTools/share/difftool_tosummary.sql )
• ippTools/share/pxadmin_create_tables.sql (modified) (3 diffs)
• ippTools/share/pxadmin_drop_tables.sql (modified) (1 diff)
• ippTools/share/stacktool_addsummary.sql (copied) (copied from branches/czw_branch/20100519/ippTools/share/stacktool_addsummary.sql )
• ippTools/share/stacktool_associationdefine_select.sql (copied) (copied from branches/czw_branch/20100519/ippTools/share/stacktool_associationdefine_select.sql ) (1 diff)
• ippTools/share/stacktool_sassskyfile.sql (copied) (copied from branches/czw_branch/20100519/ippTools/share/stacktool_sassskyfile.sql )
• ippTools/share/stacktool_tosummary.sql (copied) (copied from branches/czw_branch/20100519/ippTools/share/stacktool_tosummary.sql )
• ippTools/share/warptool_addsummary.sql (copied) (copied from branches/czw_branch/20100519/ippTools/share/warptool_addsummary.sql )
• ippTools/share/warptool_tosummary.sql (copied) (copied from branches/czw_branch/20100519/ippTools/share/warptool_tosummary.sql )

trunk/ippTools/share/Makefile.am

@@ -126 +126 @@
      difftool_skyfile.sql \
      difftool_todiffskyfile.sql \
+     difftool_tosummary.sql \
+     difftool_addsummary.sql \
      disttool_definebyquery_camera.sql \
      disttool_definebyquery_chip.sql \
@@ -278 +280 @@
      regtool_updatebyquery.sql \
      regtool_updatebyqueryimfile.sql \
+     stacktool_associationdefine_select.sql \
      stacktool_definebyquery_insert.sql \
      stacktool_definebyquery_insert_random_part1.sql \
@@ -293 +296 @@
      stacktool_revertsumskyfile_delete.sql \
      stacktool_sumskyfile.sql \
+     stacktool_sassskyfile.sql \
      stacktool_tosum.sql \
+     stacktool_tosummary.sql \
+     stacktool_addsummary.sql \
      staticskytool_definebyquery_select.sql \
      staticskytool_definebyquery_inputs.sql \
@@ -326 +332 @@
      warptool_updateskyfile.sql \
      warptool_warped.sql \
+     warptool_tosummary.sql \
+     warptool_addsummary.sql \
         diffphottool_definerun.sql \
         diffphottool_input.sql \

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -981 +981 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE warpSummary (
+       warp_id BIGINT,
+       projection_cell VARCHAR(64) NOT NULL,
+       path_base     VARCHAR(255) NOT NULL,
+       PRIMARY KEY(warp_id),
+       KEY(projection_cell),
+       FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 CREATE TABLE stackRun (
         stack_id BIGINT AUTO_INCREMENT,
@@ -1049 +1058 @@
         KEY(quality),
         FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE stackAssociation (
+    sass_id      BIGINT AUTO_INCREMENT,
+    data_group   VARCHAR(64) NOT NULL,
+    projection_cell VARCHAR(64) NOT NULL,
+    tess_id       VARCHAR(64) NOT NULL,
+    filter        VARCHAR(64) NOT NULL,
+    PRIMARY KEY(sass_id),
+    KEY(data_group),
+    KEY(projection_cell),
+    KEY(tess_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE stackAssociationMap (
+    sass_id      BIGINT,
+    stack_id     BIGINT,
+    PRIMARY KEY(sass_id, stack_id),
+    FOREIGN KEY(sass_id) REFERENCES stackAssociation(sass_id),
+    FOREIGN KEY(stack_id) REFERENCES stackRun(stack_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE stackSummary (
+    sass_id     BIGINT,
+    projection_cell VARCHAR(64) NOT NULL,
+    path_base   VARCHAR(255) NOT NULL,
+    PRIMARY KEY(sass_id),
+    KEY(projection_cell),
+    FOREIGN KEY(sass_id) REFERENCES stackAssociation(sass_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
@@ -1147 +1185 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE diffSummary (
+    diff_id     BIGINT,
+    projection_cell VARCHAR(64) NOT NULL,
+    path_base   VARCHAR(255) NOT NULL,
+    PRIMARY KEY(diff_id),
+    KEY(projection_cell),
+    FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 CREATE TABLE magicRun (
         magic_id BIGINT AUTO_INCREMENT,

trunk/ippTools/share/pxadmin_drop_tables.sql

@@ -41 +41 @@
 DROP TABLE IF EXISTS warpSkyfile;
 DROP TABLE IF EXISTS warpMask;
+DROP TABLE IF EXISTS warpSummary;
 DROP TABLE IF EXISTS diffRun;
 DROP TABLE IF EXISTS diffInputSkyfile;
 DROP TABLE IF EXISTS diffSkyfile;
+DROP TABLE IF EXISTS diffSummary;
 DROP TABLE IF EXISTS stackRun;
 DROP TABLE IF EXISTS stackInputSkyfile;
 DROP TABLE IF EXISTS stackSumSkyfile;
+DROP TABLE IF EXISTS stackSummary;
+DROP TABLE IF EXISTS stackAssociation;
+DROP TABLE IF EXISTS stackAssociationMap;
 DROP TABLE IF EXISTS magicRun;
 DROP TABLE IF EXISTS magicInputSkyfile;

trunk/ippTools/share/stacktool_associationdefine_select.sql

@@ -2 +2 @@
        sass_id,
        data_group,
+       projection_cell,
        tess_id,
-       filter,
-       CASE WHEN LOCATE('.',skycell_id,9) > 0 THEN
-            SUBSTRING_INDEX(skycell_id,'.',2) ELSE
-            SUBSTRING_INDEX(skycell_id,'.',1) END
-       AS projection_cell
+       filter
+       FROM stackAssociation
+RIGHT JOIN (
+      SELECT 
+             data_group,
+             tess_id,
+             filter,
+             CASE WHEN LOCATE('.',skycell_id,9) > 0 THEN
+                  SUBSTRING_INDEX(skycell_id,'.',2) ELSE
+                  SUBSTRING_INDEX(skycell_id,'.',1) END
+             AS projection_cell
        FROM stackRun 
-       LEFT JOIN stackAssociationMap USING (stack_id)
-       WHERE stackRun.stack_id = @STACK_ID@
+       WHERE stackRun.stack_id = @STACK_ID@ 
+             ) AS RUN USING (data_group,tess_id,filter,projection_cell) LIMIT 1