Changeset 16083

Timestamp:

Jan 15, 2008, 11:41:05 AM (18 years ago)

Author:

jhoblitt

Message:

extend dvodb, tess_id, & end_stage input to the pxinject level

Location:

branches/end_stage

Files:

• dbconfig/tasks.md (modified) (3 diffs)
• ippTools/share/regtool_pendingexp.sql (modified) (1 diff)
• ippTools/src/pxinject.c (modified) (2 diffs)
• ippTools/src/pxinjectConfig.c (modified) (1 diff)
• ippTools/src/pztool.c (modified) (1 diff)
• ippTools/src/regtool.c (modified) (3 diffs)

branches/end_stage/dbconfig/tasks.md

@@ -1 @@
-# $Id: tasks.md,v 1.143 2007-12-08 03:17:56 eugene Exp $
+# $Id: tasks.md,v 1.143.2.1 2008-01-15 21:41:05 jhoblitt Exp $
 
 # this table records all exposure ID ever seen from the summit
@@ -95 +95 @@
     workdir_state STR       64      # key
     reduction   STR         64      # Reduction class
+    dvodb       STR         255
+    tess_id     STR         64
+    end_stage   STR         64      # Key
 END
 
@@ -117 +120 @@
     workdir     STR         255     # destination for output files
     reduction   STR         64      # Reduction class
+    dvodb       STR         255
+    tess_id     STR         64
+    end_stage   STR         64      # Key
     filter      STR         64
     comment     STR         80

branches/end_stage/ippTools/share/regtool_pendingexp.sql

@@ -8 +8 @@
     workdir,
     workdir_state,
-    reduction
+    reduction,
+    dvodb,
+    tess_id,
+    end_stage
 FROM
     (SELECT

branches/end_stage/ippTools/src/pxinject.c

@@ -121 +121 @@
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -reduction");
+        return false;
+    }
+
+    psString dvodb = psMetadataLookupStr(&status, config->args, "-dvodb");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -dvodb");
+        return false;
+    }
+
+    psString tess_id = psMetadataLookupStr(&status, config->args, "-tess_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tess_id");
+        return false;
+    }
+
+    psString end_stage = psMetadataLookupStr(&status, config->args, "-end_stage");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -end_stage");
         return false;
     }
@@ -132 +150 @@
                 workdir,
                 "dirty",
-                reduction
+                reduction,
+                dvodb,
+                tess_id,
+                end_stage
             )
         ) {

branches/end_stage/ippTools/src/pxinjectConfig.c

@@ -55 +55 @@
     psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-reduction",  0,
             "define reduction class", NULL);
+    psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-dvodb",  0,
+            "define the dvodb for the next processing step", NULL);
+    psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-tess_id",  0,
+            "define the tess_id for the next processing step", NULL);
+    psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-end_stage",  0,
+            "define the end goal processing step", NULL);
     psMetadataAddBool(newExpArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);

branches/end_stage/ippTools/src/pztool.c

@@ -615 +615 @@
                     NULL,               // workdir
                     "dirty",            // workdir state
-                    NULL                // reduction class
+                    NULL,               // reduction class
+                    NULL,               // dvodb
+                    NULL,               // tess_id
+                    NULL                // end_stage
                 )
         ) {

branches/end_stage/ippTools/src/regtool.c

@@ -846 +846 @@
         return false;
     }
+
     psString exp_name = psMetadataLookupStr(&status, config->args, "-exp_name");
     if (!status) {
@@ -1236 +1237 @@
     psFree(output);
 
-    if (!rawExpInsert(
-        config->dbh,
+    if (!rawExpInsert(config->dbh,
         (psS64)atoll(exp_id),
         exp_name,
@@ -1248 +1248 @@
         workdir ? workdir : newExp->workdir,
         reduction ? reduction : newExp->reduction,
+        dvodb ? dvodb : newExp->dvodb,
+        tess_id ? tess_id : newExp->tess_id,
+        end_stage ? end_stage : newExp->end_stage,
         filter,
         comment,