Changeset 27982

Timestamp:

May 17, 2010, 3:53:40 PM (16 years ago)

Author:

Paul Price

Message:

Adding magictool -exposure to get camProcessedExp.path_base from magic_id.

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/magictool_exposure.sql (added)
• share/magictool_inputs.sql (modified) (2 diffs)
• src/magictool.c (modified) (3 diffs)
• src/magictool.h (modified) (1 diff)
• src/magictoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -198 +198 @@
      magictool_rawimfile.sql \
      magictool_revertnode.sql \
+     magictool_exposure.sql \
      magicdstool_clearstatefaults.sql \
      magicdstool_completed_runs.sql \

trunk/ippTools/share/magictool_inputs.sql

@@ -2 +2 @@
 SELECT
     magicRun.magic_id,
+    magicRun.exp_id,
     magicRun.inverse, -- Using the inverse subtraction?
     magicRun.diff_id,
@@ -10 +11 @@
     magicInputs.warp_path_base, -- path_base for the template warp (if any)
     magicInputs.stack_path_base, -- path_base for the template stack (if any)
-    magicInputs.magic_path_base -- path_base for child nodes (if any)
+    magicInputs.magic_path_base, -- path_base for child nodes (if any)
+    magicInputs.cam_path_base -- path_base for the input camera
 FROM magicRun
 JOIN (

trunk/ippTools/src/magictool.c

@@ -48 +48 @@
 static bool maskMode(pxConfig *config);
 static bool censorrunMode(pxConfig *config);
+static bool exposureMode(pxConfig *config);
 
 static bool setmagicRunState(pxConfig *config, psS64 magic_id, const char *state);
@@ -87 +88 @@
         MODECASE(MAGICTOOL_MODE_MASK,                maskMode);
         MODECASE(MAGICTOOL_MODE_CENSORRUN,           censorrunMode);
+        MODECASE(MAGICTOOL_MODE_EXPOSURE,            exposureMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -1514 +1516 @@
     return true;
 }
+
+
+static bool exposureMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psMetadata *where = psMetadataAlloc();
+    PXOPT_COPY_S64(config->args, where, "-magic_id", "magicRun.magic_id", "==");
+    PXOPT_COPY_BOOL(config->args, where, "-inverse", "magicRun.inverse", "==");
+
+    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+
+    psString query = pxDataGet("magictool_exposure.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    psString whereClause = psStringCopy(""); // WHERE restrictions
+    if (psListLength(where->list)) {
+        psString clause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&whereClause, " AND %s", clause);
+        psFree(clause);
+    }
+    psFree(where);
+
+    if (!p_psDBRunQueryF(config->dbh, query, whereClause, whereClause)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psErrorCode err = psErrorCodeLast();
+        switch (err) {
+            case PS_ERR_DB_CLIENT:
+                psError(PXTOOLS_ERR_SYS, false, "database error");
+                break;
+            case PS_ERR_DB_SERVER:
+                psError(PXTOOLS_ERR_PROG, false, "database error");
+                break;
+            default:
+                psError(PXTOOLS_ERR_PROG, false, "unknown error");
+                break;
+        }
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        psTrace("magictool", PS_LOG_INFO, "no rows found");
+        psFree(output);
+        return true;
+    }
+
+    if (!ippdbPrintMetadatas(stdout, output, "magicMask", !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print array");
+        psFree(output);
+        return false;
+    }
+    psFree(output);
+
+    return true;
+}

trunk/ippTools/src/magictool.h

@@ -42 +42 @@
     MAGICTOOL_MODE_MASK,
     MAGICTOOL_MODE_CENSORRUN,
+    MAGICTOOL_MODE_EXPOSURE,
 } MAGICtoolMode;
 

trunk/ippTools/src/magictoolConfig.c

@@ -168 +168 @@
     psMetadataAddS64(censorrunArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure ID", 0);
     psMetadataAddStr(censorrunArgs, PS_LIST_TAIL, "-label",       0, "define label", NULL);
+
+    // -exposure
+    psMetadata *exposureArgs = psMetadataAlloc();
+    psMetadataAddS64(exposureArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID", 0);
+    psMetadataAddBool(exposureArgs, PS_LIST_TAIL, "-inverse", 0, "select the inverse subtraction?", false);
+    psMetadataAddBool(exposureArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
 
     psFree(now);
@@ -191 +197 @@
     PXOPT_ADD_MODE("-mask",                "", MAGICTOOL_MODE_MASK,                maskArgs);
     PXOPT_ADD_MODE("-censorrun",           "", MAGICTOOL_MODE_CENSORRUN,           censorrunArgs);
+    PXOPT_ADD_MODE("-exposure",            "", MAGICTOOL_MODE_EXPOSURE,            exposureArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {