Changeset 12232

Timestamp:

Mar 5, 2007, 12:15:54 PM (19 years ago)

Author:

jhoblitt

Message:

add chipPendingExp.workdir

Location:

trunk/ippTools

Files:

• share/chiptool_queuerawexp.sql (modified) (1 diff)
• src/chipqueue.c (modified) (2 diffs)
• src/chiptool.c (modified) (2 diffs)
• src/chiptool.h (modified) (1 diff)
• src/chiptoolConfig.c (modified) (1 diff)
• src/regtool.c (modified) (1 diff)

trunk/ippTools/share/chiptool_queuerawexp.sql

@@ -6 +6 @@
         exp_tag,        -- exp_tag
         0xdeadbeef,     -- guide_id
+        '%s',           -- workdir
         '%s',           -- label
         '%s',           -- recipe

trunk/ippTools/src/chipqueue.c

@@ -28 +28 @@
 bool chipQueueExpTag(pxConfig *config,
                      psString exp_tag,
+                     psString workdir,
                      psString label,
                      psString recipe,
@@ -58 +59 @@
     // queue the exp
     if (!p_psDBRunQuery(config->dbh, queuerawexp_query,
+                workdir  ? workdir  : "NULL",
                 label    ? label    : "NULL",
                 recipe   ? recipe   : "NULL",

trunk/ippTools/src/chiptool.c

@@ -158 +158 @@
 
     bool status = false;
+    psString workdir = psMetadataLookupStr(&status, config->args, "-set_workdir");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_workdir");
+        return false;
+    }
+
     psString label = psMetadataLookupStr(&status, config->args, "-set_label");
     if (!status) {
@@ -234 +240 @@
 
         // queue the exp
-        if (!chipQueueExpTag(config, exp_tag, label, recipe, expgroup, dvodb)) {
+        if (!chipQueueExpTag(config, exp_tag, workdir, label, recipe, expgroup, dvodb)) {
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");

trunk/ippTools/src/chiptool.h

@@ -37 +37 @@
 pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv);
 
-bool chipQueueExpTag(pxConfig *config, psString exp_tag, psString label, psString recipe, psString expgroup, psString dvodb);
+bool chipQueueExpTag(pxConfig *config,
+                     psString exp_tag,
+                     psString workdir,
+                     psString label,
+                     psString recipe,
+                     psString expgroup,
+                     psString dvodb);
 
 #endif // CHIPTOOL_H

trunk/ippTools/src/chiptoolConfig.c

@@ -85 +85 @@
     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object",  0,
             "search by exposure object", NULL);
+    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_workdir",  0,
+            "define workdir", NULL);
     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label",  0,
             "define label", NULL);

trunk/ippTools/src/regtool.c

@@ -646 +646 @@
 
         // insert an entry into the chipPendingExp table
-        if (!chipQueueExpTag(config, exp_tag, NULL, NULL, NULL, NULL)) {
+        if (!chipQueueExpTag(config, exp_tag, NULL, NULL, NULL, NULL, NULL)) {
             // rollback
             if (!psDBRollback(config->dbh)) {