Changeset 7247

Timestamp:

May 30, 2006, 3:59:22 PM (20 years ago)

Author:

jhoblitt

Message:

impliment -runs

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (4 diffs)
• dettool.h (modified) (1 diff)
• dettoolConfig.c (modified) (6 diffs)

trunk/ippTools/src/dettool.c

@@ -4 +4 @@
 
 #include <stdlib.h>
+#include <metadatadb.h>
 
 #include "pxtools.h"
@@ -9 +10 @@
 
 static bool defineMode(pxConfig *config);
+static bool runsMode(pxConfig *config);
 static bool rawMode(pxConfig *config);
 static bool addprocMode(pxConfig *config);
@@ -31 +33 @@
         case DETTOOL_MODE_DEFINE:
             if (!defineMode(config)) {
+                goto FAIL;
+            }
+            break;
+        case DETTOOL_MODE_RUNS:
+            if (!runsMode(config)) {
                 goto FAIL;
             }
@@ -163 +170 @@
     // print the new det_id
     printf("%ld\n", det_id);
+
+    return true;
+}
+
+static bool runsMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+//    psArray *runs = detRunSelectRowObjects(config->dbh, config->where, 0);
+    // XXX fix the hard coding of the table name
+    psArray *runs = psDBSelectRows(config->dbh, "detRun", config->where, 0);
+    if (!runs) {
+        psError(PS_ERR_UNKNOWN, false, "no detRun rows found");
+        return false;
+    }
+
+    // print imfile list
+    psMetadata *output = psMetadataAlloc();
+    for (long i = 0; i < psArrayLength(runs); i++) {
+        psMetadata *run = runs->data[i];
+        psMetadata *md = psMetadataAlloc();
+        bool status = false;
+        // we need to change "position" to "det_id"
+        // lookup values
+        psS32 det_id = psMetadataLookupS32(&status, run, "position");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false,
+                    "failed to lookup value for position");
+            psFree(output);
+            psFree(md);
+            psFree(runs);
+            return false;
+        }
+        psString det_type = psMetadataLookupStr(&status, run, "det_type");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false,
+                    "failed to lookup value for det_type");
+            psFree(output);
+            psFree(md);
+            psFree(runs);
+            return false;
+        }
+        // add values
+        if (!psMetadataAddS32(md, PS_LIST_TAIL, "det_id", PS_META_DUPLICATE_OK,
+                NULL, det_id)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item det_id");
+            psFree(output);
+            psFree(md);
+            psFree(runs);
+            return false;
+        }
+        if (!psMetadataAddStr(md, PS_LIST_TAIL, "det_type",
+                    PS_META_DUPLICATE_OK, NULL, det_type)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item det_type");
+            psFree(output);
+            psFree(md);
+            psFree(runs);
+            return false;
+        }
+        psMetadataAddMetadata(
+            output, PS_LIST_TAIL, "detRun", PS_META_DUPLICATE_OK, NULL, md
+        );
+    }
+
+    psString str = psMetadataConfigFormat(output); 
+    psFree(output);
+    fprintf(stdout, "%s\n", str);
+    psFree(str);
+
+    psFree(runs);
 
     return true;

trunk/ippTools/src/dettool.h

@@ -7 +7 @@
     DETTOOL_MODE_NONE           = 0x0,
     DETTOOL_MODE_DEFINE,
+    DETTOOL_MODE_RUNS,
     DETTOOL_MODE_RAW,
     DETTOOL_MODE_ADDPROCESSED,

trunk/ippTools/src/dettoolConfig.c

@@ -21 +21 @@
         exit(EXIT_FAILURE);
     }
-
-    // CLI options
-    // modes
-    psMetadata *modes = psMetadataAlloc();
-    psMetadataAddStr(modes , PS_LIST_TAIL, "-define",  0,
-        "create a new detrend run", NULL);
-    psMetadataAddStr(modes , PS_LIST_TAIL, "-raw",  0,
-        "list raw imfiles pending processing", NULL);
-    psMetadataAddStr(modes , PS_LIST_TAIL, "-addprocessed",  0,
-        "add a processed imfile", NULL);
-    psMetadataAddStr(modes , PS_LIST_TAIL, "-processed",  0,
-        "list processed imfiles", NULL);
-    psMetadataAddStr(modes , PS_LIST_TAIL, "-addstacked",  0,
-        "add a stacked imfile", NULL);
-    psMetadataAddStr(modes , PS_LIST_TAIL, "-stacked",  0,
-        "list stacked imfiles", NULL);
 
     // -define 
@@ -44 +28 @@
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-det_type",  0,
         "define the type of detrend run", NULL);
+
+    // -runs
+    psMetadata *runsArgs = psMetadataAlloc();
+    psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-det_type",  0,
+        "search for type of detrend run", NULL);
 
     // -raw
@@ -194 +183 @@
     }
     PXTOOL_MODE("-raw",             DETTOOL_MODE_RAW,           rawArgs);
+    PXTOOL_MODE("-runs",            DETTOOL_MODE_RUNS,          runsArgs);
     PXTOOL_MODE("-addprocessed",    DETTOOL_MODE_ADDPROCESSED,  addprocArgs);
     PXTOOL_MODE("-processed",       DETTOOL_MODE_PROCESSED,     procArgs);
@@ -219 +209 @@
         psArgumentHelp(defineArgs);
         psFree(defineArgs);
+        fprintf (stdout, "-runs ");
+        psArgumentHelp(runsArgs);
+        psFree(runsArgs);
         fprintf (stdout, "-raw ");
         psArgumentHelp(rawArgs);
@@ -247 +240 @@
         psFree(normalizedframeArgs);
 
-        psFree(modes);
         exit(EXIT_FAILURE);
     }
 
-    psFree(modes);
     psFree(defineArgs);
+    psFree(runsArgs);
     psFree(rawArgs);
     psFree(addprocArgs);
@@ -279 +271 @@
 
     addWhereStr(det_id);
+    addWhereStr(det_type);
     addWhereStr(exp_id);
     addWhereStr(class_id);