Changeset 14091 for trunk/ippTools/src/regtool.c

Timestamp:

Jul 9, 2007, 3:17:14 PM (19 years ago)

Author:

jhoblitt

Message:

• fix inhere. workdir rawExp to chipRun
• add option to supply workdir to addprocessedexp
• add 'reduction' to newExp and rawExp
• add inherit reduction from newexp -> rawExp and rawExp -> chipRun

File:

• trunk/ippTools/src/regtool.c (modified) (7 diffs)

trunk/ippTools/src/regtool.c

@@ -629 +629 @@
             return false;
         }
-        psFree(rawExp);
 
         // if this is a detrend image don't put it in the chip queue (and we're
@@ -641 +640 @@
                 }
                 psError(PS_ERR_UNKNOWN, false, "failed to change newExp.state for exp_id: %s", exp_id);
+                psFree(rawExp);
                 psFree(output);
                 return false;
@@ -655 +655 @@
             }
             psError(PS_ERR_UNKNOWN, false, "failed to change newExp.state for exp_id: %s", exp_id);
+            psFree(rawExp);
             psFree(output);
             return false;
@@ -661 +662 @@
         // insert an entry into the chipPendingExp table
         // this can only be run as the newExp's state has been set to stop
-        if (!pxchipQueueByExpTag(config, exp_id, NULL, NULL, NULL, NULL, NULL)) {
+        if (!pxchipQueueByExpTag(config,
+                    exp_id, // exp_id is the string version, rawExp->exp_id isa int
+                    rawExp->workdir,
+                    NULL, // label
+                    rawExp->reduction,
+                    NULL, // expgroup
+                    NULL  // dvodb
+        )) {
             // rollback
             if (!psDBRollback(config->dbh)) {
@@ -667 +675 @@
             }
             psError(PS_ERR_UNKNOWN, false, "failed to queue chipPendingExp");
+            psFree(rawExp);
             psFree(output);
             return false;
         }
+        psFree(rawExp);
     }
     psFree(output);
@@ -924 +934 @@
     }
 
+    psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -workdir");
+        return false;
+    }
+
+    psString reduction = psMetadataLookupStr(&status, config->args, "-reduction");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -reduction");
+        return false;
+    }
+
     psString filter = psMetadataLookupStr(&status, config->args, "-filter");
     if (!status) {
@@ -1065 +1087 @@
         exp_type,
         filelevel,
-        exp->workdir,
+        workdir ? workdir : exp->workdir,
+        reduction ? reduction : exp->reduction,
         filter,
         airmass,