Changeset 42541

Timestamp:

Nov 8, 2023, 10:56:44 AM (3 years ago)

Author:

eugene

Message:

adding xcstacktool and associated sql code

Location:

branches/eam_branches/ipp-20230313/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/pxadmin_create_tables.sql (modified) (1 diff)
• share/xcstacktool_addbyquery_select.sql (added)
• share/xcstacktool_addcamera.sql (added)
• share/xcstacktool_definebyquery_select.sql (added)
• share/xcstacktool_donecleanup.sql (added)
• share/xcstacktool_inputskyfile.sql (added)
• share/xcstacktool_pendingcleanuprun.sql (added)
• share/xcstacktool_pendingcleanupskyfile.sql (added)
• share/xcstacktool_revertsumskyfile_delete.sql (added)
• share/xcstacktool_sumskyfile.sql (added)
• share/xcstacktool_tosum.sql (added)
• src/Makefile.am (modified) (3 diffs)
• src/stacktool.c (modified) (1 diff)
• src/xcstacktool.c (added)
• src/xcstacktool.h (added)
• src/xcstacktoolConfig.c (added)

branches/eam_branches/ipp-20230313/ippTools/share/Makefile.am

@@ -554 +554 @@
         fpcamtool_queue_cam_id.sql \
         fpcamtool_revertprocessedexp.sql \
-        fpcamtool_revertupdatedexp.sql
+        fpcamtool_revertupdatedexp.sql \
+        xcstacktool_definebyquery_select.sql \
+        xcstacktool_addbyquery_select.sql \
+        xcstacktool_addcamera.sql \
+        xcstacktool_inputskyfile.sql \
+        xcstacktool_tosum.sql \
+        xcstacktool_sumskyfile.sql \
+        xcstacktool_revertsumskyfile_delete.sql \
+        xcstacktool_pendingcleanuprun.sql \
+        xcstacktool_pendingcleanupskyfile.sql \
+        xcstacktool_donecleanup.sql
 
+

branches/eam_branches/ipp-20230313/ippTools/share/pxadmin_create_tables.sql

@@ -2481 +2481 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE xcstackRun (
+        xcstack_id BIGINT AUTO_INCREMENT,
+        state VARCHAR(64),
+        workdir VARCHAR(255),
+        label VARCHAR(64),
+        data_group VARCHAR(64),
+        dist_group VARCHAR(64),
+        reduction VARCHAR(64),
+        registered DATETIME,
+        skycell_id VARCHAR(64),
+        tess_id VARCHAR(64),
+        filter VARCHAR(64),
+        software_ver VARCHAR(16),
+        note VARCHAR(255),
+        PRIMARY KEY(xcstack_id),
+        KEY(xcstack_id),
+        KEY(state),
+        KEY(skycell_id),
+        KEY(tess_id),
+        KEY(label),
+        KEY(data_group),
+        KEY(dist_group)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xcstackInputSkyfile (
+        xcstack_id BIGINT,
+        camera_id BIGINT,
+        stack_id BIGINT,
+        PRIMARY KEY(xcstack_id, stack_id),
+        FOREIGN KEY(xcstack_id) REFERENCES xcstackRun(xcstack_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xcstackSumSkyfile (
+        xcstack_id BIGINT,
+        path_base VARCHAR(255),
+        bg DOUBLE,
+        bg_stdev DOUBLE,
+        dtime_stack FLOAT,
+        dtime_script FLOAT,
+        hostname VARCHAR(64),
+        good_frac FLOAT,
+        fault SMALLINT,
+        software_ver VARCHAR(16),
+        quality SMALLINT NOT NULL DEFAULT 0,
+        PRIMARY KEY(xcstack_id),
+        KEY(dtime_stack),
+        KEY(good_frac),
+        KEY(fault),
+        KEY(quality),
+        FOREIGN KEY(xcstack_id) REFERENCES xcstackRun(xcstack_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE xcstackCamera (
+        camera_id BIGINT,
+        camera VARCHAR(255),
+        PRIMARY KEY(camera_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
 -- These comment lines are here to avoid an empty query error.
 -- Another way to avoid that problem is to omit the semicolon above but I think that is untidy.

branches/eam_branches/ipp-20230313/ippTools/src/Makefile.am

@@ -24 +24 @@
         stacktool \
         staticskytool \
+        xcstacktool \
         warptool \
         receivetool \
@@ -82 +83 @@
         regtool.h \
         stacktool.h \
+        xcstacktool.h \
         staticskytool.h \
         warptool.h \
@@ -245 +247 @@
     staticskytoolConfig.c
 
+xcstacktool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+xcstacktool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+xcstacktool_SOURCES = \
+    xcstacktool.c \
+    xcstacktoolConfig.c
+
 pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 pxadmin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la

branches/eam_branches/ipp-20230313/ippTools/src/stacktool.c

@@ -496 +496 @@
             psFree(insert);
             psFree(list);
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
             return false;
         }