Index: trunk/ippTools/share/chiptool_pendingimfile.sql =================================================================== --- trunk/ippTools/share/chiptool_pendingimfile.sql (revision 21237) +++ trunk/ippTools/share/chiptool_pendingimfile.sql (revision 21308) @@ -1,5 +1,5 @@ SELECT chipRun.*, - 0 as chip_imfile_id, + chipImfile.chip_imfile_id, rawImfile.class_id, rawImfile.uri, @@ -9,5 +9,7 @@ rawExp.telescope, rawExp.filelevel -FROM chipRun +FROM chipImfile +JOIN chipRun + USING(chip_id) JOIN rawExp USING(exp_id) Index: trunk/ippTools/share/chiptool_processedimfile.sql =================================================================== --- trunk/ippTools/share/chiptool_processedimfile.sql (revision 21237) +++ trunk/ippTools/share/chiptool_processedimfile.sql (revision 21308) @@ -1,3 +1,5 @@ SELECT DISTINCT + chipProcessedImfile.chip_id, + chipImfile.chip_imfile_id, chipProcessedImfile.class_id, chipProcessedImfile.uri, @@ -14,10 +16,8 @@ rawExp.filelevel FROM chipRun +JOIN chipImfile + USING(chip_id) JOIN chipProcessedImfile USING(chip_id) JOIN rawExp ON chipProcessedImfile.exp_id = rawExp.exp_id -WHERE --- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too - chipProcessedImfile.exp_id is NOT NULL - Index: trunk/ippTools/share/difftool_definebyquery_part2.sql =================================================================== --- trunk/ippTools/share/difftool_definebyquery_part2.sql (revision 21237) +++ trunk/ippTools/share/difftool_definebyquery_part2.sql (revision 21308) @@ -2,11 +2,12 @@ INSERT INTO skycellsToDiff SELECT - 0, -- diff_id + 0, -- diff_id warpSkyfile.skycell_id, - warp_id, -- warp1 - NULL, -- stack1 - NULL, -- warp2 - max_stack_id, -- stack2 - warpSkyfile.tess_id + warpSkyfile.warp_id, -- warp1 + NULL, -- stack1 + NULL, -- warp2 + max_stack_id, -- stack2 + warpSkyfile.tess_id, + 0 FROM warpSkyfile JOIN warpRun USING(warp_id) @@ -28,5 +29,5 @@ USING(skycell_id) WHERE - warp_id = %lld + warpSkyfile.warp_id = %lld AND ignored = 0 AND filter = '%s' Index: trunk/ippTools/share/difftool_definebyquery_temp_create.sql =================================================================== --- trunk/ippTools/share/difftool_definebyquery_temp_create.sql (revision 21237) +++ trunk/ippTools/share/difftool_definebyquery_temp_create.sql (revision 21308) @@ -6,4 +6,5 @@ warp2 BIGINT, stack2 BIGINT, -tess_id VARCHAR(64) +tess_id VARCHAR(64), +diff_skycell_id BIGINT ) ENGINE=MEMORY; Index: trunk/ippTools/share/difftool_skyfile.sql =================================================================== --- trunk/ippTools/share/difftool_skyfile.sql (revision 21237) +++ trunk/ippTools/share/difftool_skyfile.sql (revision 21308) @@ -1,4 +1,5 @@ SELECT diffSkyfile.*, + diffInputSkyfile.diff_skyfile_id, diffRun.tess_id, diffRun.state, Index: trunk/ippTools/share/difftool_todiffskyfile.sql =================================================================== --- trunk/ippTools/share/difftool_todiffskyfile.sql (revision 21237) +++ trunk/ippTools/share/difftool_todiffskyfile.sql (revision 21308) @@ -4,5 +4,5 @@ SELECT DISTINCT diffRun.diff_id, - 0 as diff_skyfile_id, + diffInputSkyfile.diff_skyfile_id, diffRun.workdir, diffInputSkyfile.skycell_id, Index: trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_create_tables.sql (revision 21237) +++ trunk/ippTools/share/pxadmin_create_tables.sql (revision 21308) @@ -275,4 +275,13 @@ ENGINE=innodb DEFAULT CHARSET=latin1; +CREATE TABLE chipImfile ( + chip_id BIGINT, + class_id VARCHAR(64), + chip_imfile_id BIGINT AUTO_INCREMENT, + PRIMARY KEY(chip_id, class_id), + KEY(chip_imfile_id), + FOREIGN KEY (chip_id) REFERENCES chipRun(chip_id)) +ENGINE=innodb DEFAULT CHARSET=latin1; + CREATE TABLE chipProcessedImfile ( chip_id BIGINT, @@ -333,10 +342,8 @@ path_base VARCHAR(255), fault SMALLINT NOT NULL, - chip_image_id BIGINT AUTO_INCREMENT, magicked BIGINT, PRIMARY KEY(chip_id, exp_id, class_id), KEY(data_state), KEY(fault), - KEY(chip_image_id), FOREIGN KEY (chip_id, exp_id) REFERENCES chipRun(chip_id, exp_id), @@ -846,4 +853,14 @@ ) ENGINE=innodb DEFAULT CHARSET=latin1; +CREATE TABLE warpImfile ( + warp_id BIGINT, + skycell_id VARCHAR(64), + warp_skyfile_id BIGINT AUTO_INCREMENT, + PRIMARY KEY(warp_id, skycell_id), + KEY(warp_skyfile_id), + FOREIGN KEY (warp_id) REFERENCES warpRun(warp_id)) +ENGINE=innodb DEFAULT CHARSET=latin1; + + CREATE TABLE warpSkyfile ( warp_id BIGINT, @@ -865,10 +882,8 @@ ignored TINYINT, fault SMALLINT, - warp_image_id BIGINT AUTO_INCREMENT, magicked TINYINT, PRIMARY KEY(warp_id, skycell_id, tess_id), KEY(good_frac), KEY(ignored), KEY(fault), - KEY(warp_image_id), FOREIGN KEY (warp_id, skycell_id, tess_id) REFERENCES warpSkyCellMap(warp_id, skycell_id, tess_id) @@ -965,5 +980,7 @@ stack2 BIGINT, tess_id VARCHAR(64), - PRIMARY KEY(diff_id, skycell_id), + diff_skyfile_id BIGINT AUTO_INCREMENT, + KEY(diff_id, skycell_id), + KEY(diff_skyfile_id), KEY(warp1), KEY(warp2), @@ -1004,10 +1021,8 @@ good_frac FLOAT, fault SMALLINT, - diff_image_id BIGINT AUTO_INCREMENT, magicked TINYINT, PRIMARY KEY(diff_id, skycell_id), KEY(good_frac), KEY(fault), - KEY(diff_image_id), FOREIGN KEY (diff_id) REFERENCES diffRun(diff_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; Index: trunk/ippTools/share/pxadmin_drop_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_drop_tables.sql (revision 21237) +++ trunk/ippTools/share/pxadmin_drop_tables.sql (revision 21308) @@ -12,4 +12,5 @@ DROP TABLE IF EXISTS chipRun; DROP TABLE IF EXISTS chipProcessedImfile; +DROP TABLE IF EXISTS chipImfile; DROP TABLE IF EXISTS chipMask; DROP TABLE IF EXISTS camRun; @@ -33,4 +34,5 @@ DROP TABLE IF EXISTS warpRun; DROP TABLE IF EXISTS warpSkyCellMap; +DROP TABLE IF EXISTS warpImfile; DROP TABLE IF EXISTS warpSkyfile; DROP TABLE IF EXISTS warpMask; Index: trunk/ippTools/share/warptool_towarped.sql =================================================================== --- trunk/ippTools/share/warptool_towarped.sql (revision 21237) +++ trunk/ippTools/share/warptool_towarped.sql (revision 21308) @@ -1,5 +1,5 @@ SELECT DISTINCT warpSkyCellMap.warp_id, - 0 as warp_skyfile_id, + warpImfile.warp_skyfile_id, warpSkyCellMap.skycell_id, warpSkyCellMap.tess_id, @@ -13,4 +13,7 @@ JOIN warpSkyCellMap USING(warp_id) +JOIN warpImfile + ON warpSkyCellMap.warp_id = warpImfile.warp_id + AND warpSkyCellMap.skycell_id = warpImfile.skycell_id JOIN fakeRun USING(fake_id)