Changeset 28265

Timestamp:

Jun 9, 2010, 10:04:06 AM (16 years ago)

Author:

Paul Price

Message:

Don't change the state of a camRun when reverting.

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/camtool_reset_faulted_runs.sql (deleted)
• share/camtool_revertprocessedexp.sql (modified) (1 diff)
• src/camtool.c (modified) (7 diffs)

trunk/ippTools/share/Makefile.am

@@ -28 +28 @@
      camtool_pendingcleanuprun.sql \
      camtool_queue_chip_id.sql \
-     camtool_reset_faulted_runs.sql \
      camtool_revertprocessedexp.sql \
      camtool_export_run.sql \

trunk/ippTools/share/camtool_revertprocessedexp.sql

@@ -6 +6 @@
     AND chipRun.exp_id = rawExp.exp_id
     AND camProcessedExp.fault != 0
+    AND camRun.state = 'new'

trunk/ippTools/src/camtool.c

@@ -503 +503 @@
 
 /*     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s psastro %s ppstats %s ppImage %s streaks %s\n", */
-/*          ver_pslib,ver_psmodules,ver_psphot,ver_psastro,ver_ppstats,ver_ppimage,ver_streaks); */
+/*          ver_pslib,ver_psmodules,ver_psphot,ver_psastro,ver_ppstats,ver_ppimage,ver_streaks); */
     psString software_ver = NULL;
     if ((ver_pslib)&&(ver_psmodules)) {
@@ -637 +637 @@
         path_base,
         fault,
-        software_ver,
-        maskfrac_ref_npix,
-        maskfrac_ref_static,
-        maskfrac_ref_dynamic,
-        maskfrac_ref_magic,
-        maskfrac_ref_advisory,
-        maskfrac_max_npix,
-        maskfrac_max_static,
-        maskfrac_max_dynamic,
-        maskfrac_max_magic,
-        maskfrac_max_advisory,
-        quality
+        software_ver,
+        maskfrac_ref_npix,
+        maskfrac_ref_static,
+        maskfrac_ref_dynamic,
+        maskfrac_ref_magic,
+        maskfrac_ref_advisory,
+        maskfrac_max_npix,
+        maskfrac_max_static,
+        maskfrac_max_dynamic,
+        maskfrac_max_magic,
+        maskfrac_max_advisory,
+        quality
         );
 
@@ -677 +677 @@
     if (!pxSetRunSoftware(config, "camRun", "cam_id", cam_id, software_ver)) {
       if (!psDBRollback(config->dbh)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
+        psError(PS_ERR_UNKNOWN, false, "database error");
       }
       psError(PS_ERR_UNKNOWN, false, "failed to set camRun.software_ver for cam_id: %" PRId64,
-              cam_id);
+              cam_id);
       psFree(output);
       return(false);
@@ -687 +687 @@
     if (maskfrac_ref_npix) {
       if (!pxCamSetRunMaskfrac(config, "camRun", "cam_id",cam_id,
-                               (float) maskfrac_ref_npix, maskfrac_ref_static,
-                               maskfrac_ref_dynamic, maskfrac_ref_magic, maskfrac_ref_advisory,
-                               (float) maskfrac_max_npix, maskfrac_max_static,
-                               maskfrac_max_dynamic, maskfrac_max_magic, maskfrac_max_advisory)) {
-        if (!psDBRollback(config->dbh)) {
-          psError(PS_ERR_UNKNOWN, false, "database error");
-        }
-        psError(PS_ERR_UNKNOWN, false, "failed to set camRun.maskstats for cam_id: %" PRId64,
-                cam_id);
-        psFree(output);
-        return(false);
+                               (float) maskfrac_ref_npix, maskfrac_ref_static,
+                               maskfrac_ref_dynamic, maskfrac_ref_magic, maskfrac_ref_advisory,
+                               (float) maskfrac_max_npix, maskfrac_max_static,
+                               maskfrac_max_dynamic, maskfrac_max_magic, maskfrac_max_advisory)) {
+        if (!psDBRollback(config->dbh)) {
+          psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "failed to set camRun.maskstats for cam_id: %" PRId64,
+                cam_id);
+        psFree(output);
+        return(false);
       }
     }
@@ -709 +709 @@
         return false;
     }
-    
+
     psFree(row);
 
@@ -893 +893 @@
 
     {
-        psString query = pxDataGet("camtool_reset_faulted_runs.sql");
+        psString query = pxDataGet("camtool_revertprocessedexp.sql");
         if (!query) {
+            // rollback
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
             psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
             psFree(where);
@@ -919 +923 @@
         psFree(query);
     }
-
-    {
-        psString query = pxDataGet("camtool_revertprocessedexp.sql");
-        if (!query) {
-            // rollback
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
-            psFree(where);
-            return false;
-        }
-
-        // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE
-        if (where && psListLength(where->list)) {
-            psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-            psStringAppend(&query, " AND %s", whereClause);
-            psFree(whereClause);
-        }
-
-        if (!p_psDBRunQuery(config->dbh, query)) {
-            // rollback
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            psError(PS_ERR_UNKNOWN, false, "database error");
-            psFree(query);
-            psFree(where);
-            return false;
-        }
-        psFree(query);
-    }
     psFree(where);