Changeset 14262

Timestamp:

Jul 16, 2007, 6:54:55 PM (19 years ago)

Author:

jhoblitt

Message:

add warptool -runone

Location:

trunk/ippTools/src

Files:

• warptool.c (modified) (9 diffs)
• warptool.h (modified) (1 diff)
• warptoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/warptool.c

@@ -31 +31 @@
 #include "warptool.h"
 
-static bool definerunMode(pxConfig *config);
+static psS64 definerunMode(pxConfig *config);
+static bool runoneMode(pxConfig *config);
 static bool updaterunMode(pxConfig *config);
 static bool addinputexpMode(pxConfig *config);
@@ -45 +46 @@
 
 static bool parseAndInsertSkyCellMap(pxConfig *config, const char *mapfile);
-static bool setwarpRunState(pxConfig *config, const char *warp_id, const char *state);
+static bool setwarpRunState(pxConfig *config, psS64 warp_id, const char *state);
 static bool isValidMode(pxConfig *config, const char *mode);
 bool warpCompletedRuns(pxConfig *config);
@@ -68 +69 @@
     switch (config->mode) {
         MODECASE(WARPTOOL_MODE_DEFINERUN,         definerunMode);
+        MODECASE(WARPTOOL_MODE_RUNONE,            runoneMode);
         MODECASE(WARPTOOL_MODE_UPDATERUN,         updaterunMode);
         MODECASE(WARPTOOL_MODE_ADDINPUTEXP,       addinputexpMode);
@@ -101 +103 @@
 
 
-static bool definerunMode(pxConfig *config)
+static psS64 definerunMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -167 +169 @@
 
     // get the assigned warp_id
-    warpRun->warp_id = psDBLastInsertID(config->dbh);
+    psS64 warp_id = psDBLastInsertID(config->dbh);
+    warpRun->warp_id = warp_id;
 
     bool simple = false;
@@ -188 +191 @@
     psFree(warpRun);
 
-    return true;
-}
-
+    return warp_id;
+}
+
+static bool runoneMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    psS64 warp_id = definerunMode(config);
+    if (!warp_id) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "failed to define warpRun");
+        return false;
+    }
+
+    psString warp_id_str = psDBIntToString(warp_id);
+    if (!psMetadataAddStr(config->args, PS_LIST_TAIL, "-warp_id", 0, NULL, warp_id_str)) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
+        psFree(warp_id_str);
+        return false;
+    }
+    psFree(warp_id_str);
+
+    if (!addinputexpMode(config)) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "failed to add cam_id to warpRun");
+        return false;
+    }
+    if (!setwarpRunState(config, warp_id, "run")) {
+        // rollback
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "failed to set warpRun.state to run");
+        return false;
+    }
+
+    // point of no return
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}
 
 static bool updaterunMode(pxConfig *config)
@@ -219 +278 @@
     if (state) {
         // set detRun.state to state
-        return setwarpRunState(config, warp_id, state);
+        return setwarpRunState(config, (psS64)atoll(warp_id), state);
     }
 
@@ -1161 +1220 @@
 
 
-static bool setwarpRunState(pxConfig *config, const char *warp_id, const char *state)
-{
-    PS_ASSERT_PTR_NON_NULL(warp_id, false);
+static bool setwarpRunState(pxConfig *config, psS64 warp_id, const char *state)
+{
     PS_ASSERT_PTR_NON_NULL(state, false);
 
@@ -1178 +1236 @@
     }
 
-    char *query = "UPDATE warpRun SET state = '%s' WHERE warp_id = '%s'";
+    char *query = "UPDATE warpRun SET state = '%s' WHERE warp_id = %" PRId64;
     if (!p_psDBRunQuery(config->dbh, query, state, warp_id)) {
         psError(PS_ERR_UNKNOWN, false,
-                "failed to change state for warp_id %s", warp_id);
+                "failed to change state for warp_id %" PRId64, warp_id);
         return false;
     }

trunk/ippTools/src/warptool.h

@@ -26 +26 @@
     WARPTOOL_MODE_NONE           = 0x0,
     WARPTOOL_MODE_DEFINERUN,
+    WARPTOOL_MODE_RUNONE,
     WARPTOOL_MODE_UPDATERUN,
     WARPTOOL_MODE_ADDINPUTEXP,

trunk/ippTools/src/warptoolConfig.c

@@ -60 +60 @@
             "use the simple output format", false);
 
+    // -runone
+    psMetadata *runoneArgs = psMetadataAlloc();
+    psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-mode", 0,
+            "define mode (required)", NULL);
+    psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-workdir", 0,
+            "define workdir (required)", NULL);
+    psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-registered",  0,
+            "time detrend run was registered", now);
+    psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-cam_id", 0,
+            "define camtool ID (required)", NULL);
+    psMetadataAddBool(runoneArgs, PS_LIST_TAIL, "-magiced",  0,
+            "has this exposure been magiced", false);
+    psMetadataAddBool(runoneArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
+
     // -updaterun
     psMetadata *updaterunArgs = psMetadataAlloc();
@@ -195 +210 @@
 
     PXTOOL_ADD_MODE("-definerun",       "", WARPTOOL_MODE_DEFINERUN,      definerunArgs);
+    PXTOOL_ADD_MODE("-runone",          "", WARPTOOL_MODE_RUNONE,         runoneArgs);
     PXTOOL_ADD_MODE("-updaterun",       "", WARPTOOL_MODE_UPDATERUN,      updaterunArgs);
     PXTOOL_ADD_MODE("-addinputexp",     "", WARPTOOL_MODE_ADDINPUTEXP,    addinputexpArgs);