Changeset 18561 for trunk/ippTools/src/caltoolConfig.c

Timestamp:

Jul 15, 2008, 10:30:59 AM (18 years ago)

Author:

eugene

Message:

completely deprecate config->where; make all command-line handling consistent; move nearly all sql into share/*.sql; ensure consistency between args supplied and used

File:

• trunk/ippTools/src/caltoolConfig.c (modified) (3 diffs)

trunk/ippTools/src/caltoolConfig.c

@@ -49 +49 @@
     // -adddb
     psMetadata *adddbArgs = psMetadataAlloc();
-    psMetadataAddStr(adddbArgs, PS_LIST_TAIL, "-dvodb",  0,
-            "define DVO db (required)", NULL);
+    psMetadataAddStr(adddbArgs, PS_LIST_TAIL, "-dvodb",  0,            "define DVO db (required)", NULL);
 
     // -dbs
     psMetadata *dbsArgs = psMetadataAlloc();
-    psMetadataAddU64(dbsArgs, PS_LIST_TAIL, "-limit",  0,
-            "limit result set to N items", 0);
-    psMetadataAddBool(dbsArgs, PS_LIST_TAIL, "-simple", 0,
-            "use the simple output format", false);
+    psMetadataAddU64(dbsArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
+    psMetadataAddBool(dbsArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
 
     // -addrun
     psMetadata *addrunArgs = psMetadataAlloc();
-    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-cal_id",  0,
-            "define calibration DB ID (required)", NULL);
-    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-region",  0,
-            "define region (required)", NULL);
-    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-last_step",  0,
-            "define last step (required)", NULL);
-    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-state",  0,
-            "define state (required)", NULL);
+    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-cal_id",  0,            "define calibration DB ID (required)", NULL);
+    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-region",  0,            "define region (required)", NULL);
+    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-last_step",  0,            "define last step (required)", NULL);
+    psMetadataAddStr(addrunArgs, PS_LIST_TAIL, "-state",  0,            "define state (required)", NULL);
 
     // -runs
     psMetadata *runsArgs = psMetadataAlloc();
-    psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-cal_id",  0,
-            "search for calibration ID", NULL);
-    psMetadataAddU64(runsArgs, PS_LIST_TAIL, "-limit",  0,
-            "limit result set to N items", 0);
-    psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-faulted",  0,
-            "only return imfiles with a fault status set", false);
-    psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-simple",  0,
-            "use the simple output format", false);
+    psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-cal_id",  0,            "search for calibration ID", NULL);
+    psMetadataAddU64(runsArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
+    psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-faulted",  0,            "only return imfiles with a fault status set", false);
+    psMetadataAddBool(runsArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
 
     psFree(now);
@@ -86 +75 @@
     psMetadata *modes = psMetadataAlloc();
 
-    PXOPT_ADD_MODE("-adddb",   "add a DVO calibration DB",
-        CALTOOL_MODE_ADDDB,     adddbArgs);
-    PXOPT_ADD_MODE("-dbs",     "list DVO calibration DBs",
-        CALTOOL_MODE_DBS,       dbsArgs);
-    PXOPT_ADD_MODE("-addrun",  "add the results of a calibration run",
-        CALTOOL_MODE_ADDRUN,    addrunArgs);
-    PXOPT_ADD_MODE("-runs",    "list the results of calibration runs",
-        CALTOOL_MODE_RUNS,      runsArgs);
+    PXOPT_ADD_MODE("-adddb",   "add a DVO calibration DB",        CALTOOL_MODE_ADDDB,     adddbArgs);
+    PXOPT_ADD_MODE("-dbs",     "list DVO calibration DBs",        CALTOOL_MODE_DBS,       dbsArgs);
+    PXOPT_ADD_MODE("-addrun",  "add the results of a calibration run",        CALTOOL_MODE_ADDRUN,    addrunArgs);
+    PXOPT_ADD_MODE("-runs",    "list the results of calibration runs",        CALTOOL_MODE_RUNS,      runsArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
@@ -105 +90 @@
     psFree(argSets);
     psFree(modes);
-
-    // setup search criterion
-#define addWhereStr(name) \
-{ \
-    psString str = NULL; \
-    bool status = false; \
-    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
-        if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            psFree(config); \
-            return NULL; \
-        } \
-    } \
-}
-
-    // generate SQL where clause
-    config->where = psMetadataAlloc();
-
-    addWhereStr(det_id);
-    {
-        // XXX this is broke because you can't specify -iteration 0
-        psMetadataItem *item = psMetadataLookup(config->args, "-iteration");
-        if (item && psStrcasestr(item->comment, "found")) {
-            if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "iteration", 0, "==", item->data.S32)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item iteration");
-                psFree(config);
-                return NULL;
-            }
-        }
-    }
-
-    addWhereStr(det_id);
-
-    // convert '-code' to 'fault'
-    {
-        psS16 fault = 0;
-        bool status = false;
-        if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) {
-            if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
-                psFree(config);
-                return NULL;
-            }
-        }
-    }
-
-    if (config->where->list->n < 1) {
-        psFree(config->where);
-        config->where = NULL;
-    }
 
     // define Database handle, if used