Changeset 31083 for branches/eam_branches/ipp-20110213/ippTools/src/regtool.c

Timestamp:

Mar 30, 2011, 9:36:02 AM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20110213/ippTools/src

Files:

• . (modified) (1 prop)
• regtool.c (modified) (4 diffs)

branches/eam_branches/ipp-20110213/ippTools/src/regtool.c

@@ -311 +311 @@
 
   // required
-  PXOPT_LOOKUP_STR(dateobs_begin,     config->args, "-dateobs_begin", true, false);
-  PXOPT_LOOKUP_STR(dateobs_end,     config->args, "-dateobs_end", true, false);
-  PXOPT_LOOKUP_S32(valid_burntool, config->args, "-valid_burntool", true, false);
+  PXOPT_LOOKUP_STR(dateobs_begin,   config->args, "-dateobs_begin",  true, false);
+  PXOPT_LOOKUP_STR(dateobs_end,     config->args, "-dateobs_end",    true, false);
+  PXOPT_LOOKUP_S32(valid_burntool,  config->args, "-valid_burntool", true, false);
   // optional
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -894 +894 @@
     if (fault != INT16_MAX) {
         // this is fairly dangerous : can set all if the where is not set...
-        if (!pxSetFaultCode(config->dbh, "rawImfile", where, fault)) {
+        if (!pxSetFaultCode(config->dbh, "rawImfile", where, fault, 0)) {
             psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
             psFree (where);
@@ -1361 +1361 @@
 
     // set the state for the newExp to stop
-    if (!pxnewExpSetState(config, exp_id, "stop")) {
+    // but only if we didn't encounter a fault
+    if (fault == 0) {
+      if (!pxnewExpSetState(config, exp_id, "stop")) {
         // rollback
         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 change newExp.state for exp_id: %"PRId64, exp_id);
-    psFree(newExp);
-        return false;
+        psFree(newExp);
+        return false;
+      }
     }
 
@@ -1608 +1611 @@
   PXOPT_LOOKUP_S16(fault, config->args, "-fault", true, false);
 
-  if (!pxSetFaultCode(config->dbh, "rawExp", where, fault)) {
+  if (!pxSetFaultCode(config->dbh, "rawExp", where, fault, 0)) {
     psError(PS_ERR_UNKNOWN, false, "failed to set set fault flag");
     psFree(where);