Changeset 25299 for trunk/ippTools/share

Timestamp:

Sep 8, 2009, 5:32:55 PM (17 years ago)

Author:

watersc1

Message:

Merge my branch back into the trunk. This includes:

ipp_cleanup.pl : and associated edits to allow cleanup to work
burntool : updated to newest version, ipp_apply_burntool.pl modified to use persist=t options
ppImageBurntoolMask.c : masks region burntool identifies
psastro : allow selection of wcs header format
addtool : splits addstar step off from the camera stage

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/addtool_find_pendingexp.sql (copied) (copied from branches/czw_branch/cleanup/ippTools/share/addtool_find_pendingexp.sql )
• ippTools/share/addtool_queue_cam_id.sql (copied) (copied from branches/czw_branch/cleanup/ippTools/share/addtool_queue_cam_id.sql )
• ippTools/share/addtool_reset_faulted_runs.sql (copied) (copied from branches/czw_branch/cleanup/ippTools/share/addtool_reset_faulted_runs.sql )
• ippTools/share/addtool_revertprocessedexp.sql (copied) (copied from branches/czw_branch/cleanup/ippTools/share/addtool_revertprocessedexp.sql )
• ippTools/share/dettool_pendingcleanup_normalizedimfile.sql (modified) (1 diff)
• ippTools/share/dettool_pendingcleanup_stacked.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (2 diffs)
• ippTools/share/pxadmin_drop_tables.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -4 +4 @@
 
 dist_pkgdata_DATA = \
+     addtool_find_pendingexp.sql \
+     addtool_queue_cam_id.sql \
+     addtool_reset_faulted_runs.sql \
+     addtool_revertprocessedexp.sql \
      camtool_donecleanup.sql \
      camtool_find_chip_id.sql \

trunk/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     detNormalizedImfile.*,
     detRunSummary.data_state

trunk/ippTools/share/dettool_pendingcleanup_stacked.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     detStackedImfile.*,
     detRunSummary.data_state

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -451 +451 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE addRun (
+    add_id BIGINT AUTO_INCREMENT,
+    cam_id BIGINT,
+    state VARCHAR(64),
+    workdir VARCHAR(255),
+    workdir_state VARCHAR(64),
+    label VARCHAR(64),
+    dvodb VARCHAR(255),
+    magicked BIGINT,
+    PRIMARY KEY(add_id),
+    KEY(add_id),
+    KEY(cam_id),
+    KEY(state),
+    KEY(workdir_state),
+    KEY(label),
+    INDEX(add_id, cam_id),
+    FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE addProcessedExp (
+    add_id BIGINT AUTO_INCREMENT,
+    dtime_addstar FLOAT,
+    n_stars INT,
+    path_base VARCHAR(255),
+    fault SMALLINT NOT NULL,
+    PRIMARY KEY(add_id),
+    FOREIGN KEY(add_id) REFERENCES addRun(add_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE addMask (
+    label VARCHAR(64),
+    PRIMARY KEY(label)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 CREATE TABLE fakeRun (
     fake_id BIGINT AUTO_INCREMENT,
@@ -1086 +1120 @@
         KEY(magic_id),
         KEY(label),
-        FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id)
+        FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id),
+        FOREIGN KEY(inv_magic_id) REFERENCES magicRun(magic_id)
         FOREIGN KEY(inv_magic_id) REFERENCES magicRun(magic_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;

trunk/ippTools/share/pxadmin_drop_tables.sql

@@ -19 +19 @@
 DROP TABLE IF EXISTS detRun;
 DROP TABLE IF EXISTS detInputExp;
+DROP TABLE IF EXISTS addRun;
+DROP TABLE IF EXISTS addProcessedExp;
+DROP TABLE IF EXISTS addMask;
 DROP TABLE IF EXISTS fakeRun;
 DROP TABLE IF EXISTS fakeProcessedImfile;