Index: /branches/eam_branches/ipp-20230313/ippTools/share/pxadmin_create_pstamp_tables.sql
===================================================================
--- /branches/eam_branches/ipp-20230313/ippTools/share/pxadmin_create_pstamp_tables.sql	(revision 42635)
+++ /branches/eam_branches/ipp-20230313/ippTools/share/pxadmin_create_pstamp_tables.sql	(revision 42635)
@@ -0,0 +1,136 @@
+CREATE TABLE pstampDataStore (
+        ds_id BIGINT AUTO_INCREMENT,
+        state VARCHAR(64),
+        lastFileset VARCHAR(64),
+        timestamp  DATETIME,
+        label VARCHAR(64),
+        outProduct VARCHAR(64) UNIQUE,
+        uri VARCHAR(255),
+        pollInterval INTEGER DEFAULT 60,
+        need_magic TINYINT,
+        PRIMARY KEY(ds_id),
+        KEY(ds_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampProject (
+        proj_id BIGINT AUTO_INCREMENT,
+        name VARCHAR(64) UNIQUE,
+        state VARCHAR(64),
+        dbname VARCHAR(64),
+        dvodb VARCHAR(64),
+        camera VARCHAR(64),
+        telescope VARCHAR(64),
+        need_magic TINYINT,
+        PRIMARY KEY(proj_id),
+        KEY(proj_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampRequest (
+        req_id BIGINT AUTO_INCREMENT,
+        ds_id BIGINT,
+        state VARCHAR(64),
+        name VARCHAR(64) UNIQUE,
+        reqType VARCHAR(16),
+        label VARCHAR(64),
+        outProduct VARCHAR(64),
+        uri VARCHAR(255),
+        outdir VARCHAR(255),
+        username VARCHAR(255),
+        proj_id BIGINT,
+        registered datetime,
+        timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+        fault SMALLINT,
+        PRIMARY KEY(req_id),
+        KEY(req_id),
+        KEY(state),
+        KEY(fault),
+        KEY(label),
+        KEY(username)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampJob (
+        job_id BIGINT AUTO_INCREMENT,
+        req_id BIGINT,
+        rownum VARCHAR(64),
+        state VARCHAR(64),
+        jobType VARCHAR(16),
+        fault SMALLINT,
+        exp_id BIGINT,
+        outputBase VARCHAR(255),
+        options BIGINT,
+        dep_id BIGINT,
+        fault_count INT,
+        parent_id BIGINT DEFAULT NULL,
+        is_parent TINYINT DEFAULT 0,
+        PRIMARY KEY(job_id, req_id),
+        KEY(job_id),
+        KEY(req_id),
+        KEY(state),
+        KEY(fault),
+        KEY(dep_id),
+        KEY(parent_id),
+        KEY(is_parent),
+        FOREIGN KEY(req_id) REFERENCES pstampRequest(req_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampDependent (
+        dep_id BIGINT AUTO_INCREMENT,
+        state      VARCHAR(64),
+        stage      VARCHAR(64),
+        stage_id   BIGINT,
+        component  VARCHAR(64),
+        imagedb    VARCHAR(64),
+        outdir     VARCHAR(255),
+        rlabel     VARCHAR(64),
+        need_magic TINYINT,
+        fault      SMALLINT,
+        fault_count INT,
+        PRIMARY KEY(dep_id),
+        KEY(state),
+        KEY(stage),
+        KEY(stage_id),
+        KEY(component),
+        KEY(imagedb),
+        KEY(fault)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampFile (
+    file_id BIGINT AUTO_INCREMENT,
+    job_id BIGINT NOT NULL,
+    path VARCHAR(255),
+    PRIMARY KEY(file_id),
+    KEY(job_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampUserDomain (
+    domainName      VARCHAR(64),
+    accessLevel     INT,
+    defaultProduct  VARCHAR(255),
+    defaultLabel    VARCHAR(64),
+    PRIMARY KEY(domainName)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampUser (
+    userName        VARCHAR(64),
+    domainName      VARCHAR(64),
+    accessLevel     INT,
+    defaultProduct  VARCHAR(255),
+    defaultLabel    VARCHAR(64),
+    PRIMARY KEY (userName, domainName)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampAccessLevel (
+    proj_id         BIGINT,
+    accessLevel     INT,
+    mjd_min         FLOAT DEFAULT 0,
+    mjd_max         FLOAT DEFAULT 0,
+    PRIMARY KEY (proj_id, accessLevel),
+    UNIQUE KEY (proj_id, accessLevel),
+    FOREIGN KEY(proj_id) REFERENCES pstampProject(proj_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE pstampWebRequest (
+        num BIGINT AUTO_INCREMENT,
+        PRIMARY KEY(num)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
Index: /branches/eam_branches/ipp-20230313/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- /branches/eam_branches/ipp-20230313/ippTools/share/pxadmin_create_tables.sql	(revision 42634)
+++ /branches/eam_branches/ipp-20230313/ippTools/share/pxadmin_create_tables.sql	(revision 42635)
@@ -394,5 +394,4 @@
     KEY(fault),
     KEY(quality),
-    KEY(data_state),
     FOREIGN KEY(chip_id, exp_id) REFERENCES chipRun(chip_id, exp_id),
     FOREIGN KEY(exp_id, class_id) REFERENCES rawImfile(exp_id, class_id)
@@ -1414,140 +1413,4 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
-CREATE TABLE pstampDataStore (
-        ds_id BIGINT AUTO_INCREMENT,
-        state VARCHAR(64),
-        lastFileset VARCHAR(64),
-        timestamp  DATETIME,
-        label VARCHAR(64),
-        outProduct VARCHAR(64) UNIQUE,
-        uri VARCHAR(255),
-        pollInterval INTEGER DEFAULT 60,
-        need_magic TINYINT,
-        PRIMARY KEY(ds_id),
-        KEY(ds_id)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampProject (
-        proj_id BIGINT AUTO_INCREMENT,
-        name VARCHAR(64) UNIQUE,
-        state VARCHAR(64),
-        dbname VARCHAR(64),
-        dvodb VARCHAR(64),
-        camera VARCHAR(64),
-        telescope VARCHAR(64),
-        need_magic TINYINT,
-        PRIMARY KEY(proj_id),
-        KEY(proj_id)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampRequest (
-        req_id BIGINT AUTO_INCREMENT,
-        ds_id BIGINT,
-        state VARCHAR(64),
-        name VARCHAR(64) UNIQUE,
-        reqType VARCHAR(16),
-        label VARCHAR(64),
-        outProduct VARCHAR(64),
-        uri VARCHAR(255),
-        outdir VARCHAR(255),
-        username VARCHAR(255),
-        proj_id BIGINT,
-        registered datetime,
-        timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        fault SMALLINT,
-        PRIMARY KEY(req_id),
-        KEY(req_id),
-        KEY(state),
-        KEY(fault),
-        KEY(label),
-        KEY(username)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampJob (
-        job_id BIGINT AUTO_INCREMENT,
-        req_id BIGINT,
-        rownum VARCHAR(64),
-        state VARCHAR(64),
-        jobType VARCHAR(16),
-        fault SMALLINT,
-        exp_id BIGINT,
-        outputBase VARCHAR(255),
-        options BIGINT,
-        dep_id BIGINT,
-        fault_count INT,
-        parent_id BIGINT DEFAULT NULL,
-        is_parent TINYINT DEFAULT 0,
-        PRIMARY KEY(job_id, req_id),
-        KEY(job_id),
-        KEY(req_id),
-        KEY(state),
-        KEY(fault),
-        KEY(dep_id),
-        KEY(parent_id),
-        KEY(is_parent),
-        FOREIGN KEY(req_id) REFERENCES pstampRequest(req_id)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampDependent (
-        dep_id BIGINT AUTO_INCREMENT,
-        state      VARCHAR(64),
-        stage      VARCHAR(64),
-        stage_id   BIGINT,
-        component  VARCHAR(64),
-        imagedb    VARCHAR(64),
-        outdir     VARCHAR(255),
-        rlabel     VARCHAR(64),
-        need_magic TINYINT,
-        fault      SMALLINT,
-        fault_count INT,
-        PRIMARY KEY(dep_id),
-        KEY(state),
-        KEY(stage),
-        KEY(stage_id),
-        KEY(component),
-        KEY(imagedb),
-        KEY(fault)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampFile (
-    file_id BIGINT AUTO_INCREMENT,
-    job_id BIGINT NOT NULL,
-    path VARCHAR(255),
-    PRIMARY KEY(file_id),
-    KEY(job_id)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampUserDomain (
-    domainName      VARCHAR(64),
-    accessLevel     INT,
-    defaultProduct  VARCHAR(255),
-    defaultLabel    VARCHAR(64),
-    PRIMARY KEY(domainName)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampUser (
-    userName        VARCHAR(64),
-    domainName      VARCHAR(64),
-    accessLevel     INT,
-    defaultProduct  VARCHAR(255),
-    defaultLabel    VARCHAR(64),
-    PRIMARY KEY (userName, domainName)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampAccessLevel (
-    proj_id         BIGINT,
-    accessLevel     INT,
-    mjd_min         FLOAT DEFAULT 0,
-    mjd_max         FLOAT DEFAULT 0,
-    PRIMARY KEY (proj_id, accessLevel),
-    UNIQUE KEY (proj_id, accessLevel),
-    FOREIGN KEY(proj_id) REFERENCES pstampProject(proj_id)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
-CREATE TABLE pstampWebRequest (
-        num BIGINT AUTO_INCREMENT,
-        PRIMARY KEY(num)
-) ENGINE=innodb DEFAULT CHARSET=latin1;
-
 CREATE TABLE distTarget (
     target_id   BIGINT AUTO_INCREMENT,
@@ -1856,4 +1719,5 @@
     class_id VARCHAR(64) NOT NULL,     -- class (component) identifier
     path_base VARCHAR(255) NOT NULL,   -- root name for outputs
+    data_state VARCHAR(64),   
     magicked BIGINT,                   -- magic_id if magicked
     dtime_script FLOAT,                -- elapsed time for script
@@ -1905,4 +1769,5 @@
     skycell_id VARCHAR(64) NOT NULL,   -- skycell identifier
     path_base VARCHAR(255) NOT NULL,   -- root name for outputs
+    data_state VARCHAR(64),
     magicked BIGINT,                   -- magic_id if magicked
     dtime_script FLOAT,                -- elapsed time for script
@@ -2023,4 +1888,5 @@
        minidvodb_path VARCHAR(255) NOT NULL,
        state VARCHAR(64) NOT NULL,
+       note VARCHAR(255) NOT NULL,
        creation_date TIMESTAMP,
        PRIMARY KEY(minidvodb_id), KEY(minidvodb_name), INDEX(minidvodb_id)
@@ -2168,5 +2034,5 @@
       quality SMALLINT NOT NULL,
       hostname VARCHAR(64) NOT NULL,
-      software_ver VARCHAR(64),
+      software_ver VARCHAR(16),
       fault SMALLINT NOT NULL,
       PRIMARY KEY(skycal_id),
@@ -2630,5 +2496,5 @@
       quality SMALLINT NOT NULL,
       hostname VARCHAR(64) NOT NULL,
-      software_ver VARCHAR(64),
+      software_ver VARCHAR(16),
       fault SMALLINT NOT NULL,
       PRIMARY KEY(xccal_id),