Changeset 9369 for trunk/ippTools/src/dettool.c

Timestamp:

Oct 6, 2006, 3:02:28 PM (20 years ago)

Author:

jhoblitt

Message:

update normalizedimfile mode to remove mask, the required args, and to only list imfiles in active detruns

File:

• trunk/ippTools/src/dettool.c (modified) (2 diffs)

trunk/ippTools/src/dettool.c

@@ -3130 +3130 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    // det_id is required
-    // psString det_id is unused in the first query... it is checked for to
-    // make sure it is in config->where
-    bool status = false;
-    psString det_id = psMetadataLookupStr(&status, config->args, "-det_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -det_id");
-        return false;
-    }
-    if (!det_id) {
-        psError(PS_ERR_UNKNOWN, true, "-det_id is required");
-        return false;
-    }
-
-    psArray *normalizedImfiles =
-        detNormalizedImfileSelectRowObjects(config->dbh, config->where, 0);
-    if (!normalizedImfiles) {
+    psString query = psStringCopy(
+        "SELECT detNormalizedImfile.*"
+        " FROM detNormalizedImfile"
+        " JOIN detRun"
+        "   ON detNormalizedImfile.det_id = detRun.position"
+        " WHERE"
+        "   detRun.state = 'run'"
+    );
+
+    if (config->where) {
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, NULL);
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        // XXX check psError here
         psError(PS_ERR_UNKNOWN, false, "no detNormalizedImfile rows found");
-        return false;
-    }
-
-    // mask out normalized imfiles that have residuals registered for them
-    psArray *residImfiles = detResidImfileSelectRowObjects(config->dbh,
-            config->where, 0);
-    if (residImfiles) {
-        for (long i = 0; i < psArrayLength(normalizedImfiles); i++) {
-            for (long j = 0; j < psArrayLength(residImfiles); j++) {
-                if (
-                (((detNormalizedImfileRow *)normalizedImfiles->data[i])->det_id
-                    ==
-                ((detResidImfileRow *)residImfiles->data[j])->det_id)
-                &&
-                (((detNormalizedImfileRow *)normalizedImfiles->data[i])->iteration
-                    ==
-                ((detResidImfileRow *)residImfiles->data[j])->iteration)
-                &&
-                (strcmp(
-                ((detNormalizedImfileRow *)normalizedImfiles->data[i])->class_id,
-                ((detResidImfileRow *)residImfiles->data[j])->class_id) == 0))
-                 {
-
-                    // remove the rawImfiles from the list
-                    psArrayRemove(normalizedImfiles, normalizedImfiles->data[i]);
-                    i--;
-                    break;
-                }
-            }
-        }
-        psFree(residImfiles);
+        psFree(output)
+        return true;
     }
 
@@ -3192 +3175 @@
 
     // negative simple so the default is true
-    if (normalizedImfiles->n) {
-        if (!detNormalizedImfilePrintObjects(stdout, normalizedImfiles, !simple)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to print array");
-            psFree(normalizedImfiles);
-            return false;
-        }
-    }
-
-    psFree(normalizedImfiles);
+    if (!ippdbPrintMetadatas(stdout, output, "detNormalizedImfile", !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print array");
+        psFree(output);
+        return false;
+    }
+
+    psFree(output);
 
     return true;