Changeset 11986

Timestamp:

Feb 21, 2007, 4:25:52 PM (19 years ago)

Author:

jhoblitt

Message:

change p6tool -define run to accept -p4_id ...

Location:

trunk/ippTools/src

Files:

• stacktool.c (modified) (4 diffs)
• stacktoolConfig.c (modified) (1 diff)

trunk/ippTools/src/stacktool.c

@@ -124 +124 @@
     }
 
+    // we have to support multipe exp_tags
+    psMetadataItem *p4_ids = psMetadataLookup(config->args, "-p4_id");
+    if (!p4_ids) {
+        // this shouldn't actually happen when using psArgs
+        psError(PS_ERR_UNKNOWN, true, "-p4_id is required");
+        return false;
+    }
+
     psTime *registered = NULL;
     {
@@ -141 +149 @@
     p6RunRow *run = p6RunRowAlloc(
             0,          // ID
-            "reg",      // state
+            "run",      // state
             workdir,
             NULL,       // dvodb
@@ -153 +161 @@
         return true;
     }
+
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
     if (!p6RunInsertObject(config->dbh, run)) {
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(run);
@@ -161 +178 @@
     // get the assigned p4_id
     run->p6_id = psDBLastInsertID(config->dbh);
+
+    // insert the p6InputSkyfile rows
+    psListIterator *iter = psListIteratorAlloc(p4_ids->data.list, 0, false);
+    psMetadataItem *item = NULL;
+    while ((item = psListGetAndIncrement(iter))) {
+        if (!p6InputSkyfileInsert(config->dbh, run->p6_id, atoi((char *)item->data.V))) {
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            psError(PS_ERR_UNKNOWN, false, "failed to insert p6InputSkyfile rows");
+            return false;
+        }
+    }
+    psFree(iter);
+
+    // point of no return
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
 
     bool simple = false;

trunk/ippTools/src/stacktoolConfig.c

@@ -56 +56 @@
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id",  0,
             "define tessellation ID (required)", NULL);
+    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-p4_id",
+             PS_META_DUPLICATE_OK,
+             "include this p4 ID (multiple OK, required)", NULL);
+
     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);