Changeset 23459

Timestamp:

Mar 20, 2009, 1:48:35 PM (17 years ago)

Author:

bills

Message:

Don't finish warpRuns unless none of the skyfiles faulted.
To allow reverting existing warpRuns with faults that are in the full state
and old state leave in the code that changes the warpRun.state back to new but don't
require a row be updated.

Location:

trunk/ippTools

Files:

• share/warptool_finished_run_select.sql (modified) (1 diff)
• src/warptool.c (modified) (3 diffs)

trunk/ippTools/share/warptool_finished_run_select.sql

@@ -19 +19 @@
    HAVING
        COUNT(warpSkyCellMap.warp_id) = COUNT(warpSkyfile.warp_id)
+       AND SUM(warpSkyfile.fault) = 0
  ) as Foo

trunk/ippTools/src/warptool.c

@@ -1095 +1095 @@
     int numUpdated;                     // Number updated
     {
+        // This query is no longer necessary because we do not set warpRun's to full statte
+        // if they have faulted skyfiles.
+        // We do have runs in the DB that follow the old convention so we leave this in for
+        // now
         psString query = pxDataGet("warptool_revertwarped_update.sql");
         if (!query) {
@@ -1122 +1126 @@
         numUpdated = psDBAffectedRows(config->dbh);
 
+#ifdef notdef
+        // new warpRuns won't get changed (they're already new) so don't require an update
         if (numUpdated < 1) {
-            psError(PS_ERR_UNKNOWN, false, "should have affected atleast 1 row");
+            psError(PS_ERR_UNKNOWN, false, "should have affected at least 1 row");
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1129 +1135 @@
             return false;
         }
+#endif
     }