Changeset 15695

Timestamp:

Nov 26, 2007, 4:49:32 PM (18 years ago)

Author:

jhoblitt

Message:

mostly impliement flatcorr -pending

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/flatcorr_completely_processed_chiprun.sql (added)
• share/flatcorr_create_tmp_chiprundone.sql (added)
• share/flatcorr_find_completed_floatcorruns.sql (added)
• share/flatcorr_pending.sql (modified) (1 diff)
• src/flatcorr.c (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -38 +38 @@
         difftool_todiffskyfile.sql \
         difftool_revertdiffskyfile.sql \
-        flatcorr_pending.sql \
+        flatcorr_create_tmp_chiprundone.sql \
+        flatcorr_completely_processed_chiprun.sql \
+        flatcorr_find_completed_floatcorruns.sql \
         magictool_toprocess_inputs.sql \
         magictool_toprocess_tree.sql \

trunk/ippTools/share/flatcorr_pending.sql

@@ -3 +3 @@
 FROM
 flatcorrRun
-JOIN floatcorrExp
+JOIN flatcorrExp
     USING(corr_id)
 JOIN chipRun

trunk/ippTools/src/flatcorr.c

@@ -337 +337 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    // create a temp table to hold completely processed chipRuns
+{
+    psString query = pxDataGet("flatcorr_create_tmp_chiprundone.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+
+    psFree(query);
+}
+
+   
+    // find all completed chipRuns
+{
+    psString query = pxDataGet("flatcorr_completely_processed_chiprun.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+
+    psFree(query);
+}
+    // find flatcorrRun's that have had all of their chipRun's completed by
+    // comparing against the temp table
+    psString query = pxDataGet("flatcorr_find_completed_floatcorruns.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+
+    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");
+            case PS_ERR_DB_SERVER:
+                psError(PXTOOLS_ERR_PROG, false, "database error");
+            default:
+                psError(PXTOOLS_ERR_PROG, false, "unknown error");
+        }
+
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        psTrace("regtool", PS_LOG_INFO, "no rows found");
+        psFree(output);
+        return true;
+    }
+
+    bool simple = false;
+    {
+        bool status = false;
+        simple = psMetadataLookupBool(&status, config->args, "-simple");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
+            return false;
+        }
+    }
+
+    if (psArrayLength(output)) {
+        // negative simple so the default is true
+        if (!ippdbPrintMetadatas(stdout, output, "flatcorrPending", !simple)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print array");
+            psFree(output);
+            return false;
+        }
+    }
+
+    psFree(output);
+
     return false;
 }