Changeset 12096 for trunk/ippTools/src/chiptool.c

Timestamp:

Feb 27, 2007, 2:19:32 PM (19 years ago)

Author:

jhoblitt

Message:

move SQL out of chiptool into separate data files

File:

• trunk/ippTools/src/chiptool.c (modified) (5 diffs)

trunk/ippTools/src/chiptool.c

@@ -27 +27 @@
 
 #include "pxtools.h"
+#include "pxdata.h"
 #include "chiptool.h"
 
@@ -221 +222 @@
     // XXX does this need to be constrained so that it won't return any results
     // if a match chipPendingExp hasn't been registered?
-    psString query = psStringCopy(
-            "SELECT"
-            "   chipPendingImfile.*,"
-            "   rawExp.camera,"
-            "   rawExp.workdir"
-            " FROM chipPendingImfile"
-            " JOIN chipPendingExp"
-            "   USING(exp_tag)"
-            " JOIN rawExp"
-            "   USING(exp_tag)"
-            " LEFT JOIN chipMask"
-            "   ON chipPendingExp.label = chipMask.label"
-            " WHERE"
-            "   chipMask.label IS NULL"
-        );
+    psString query = pxDataGet("chiptool_pendingimfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {
@@ -307 +298 @@
     // if so move the chipPendingExp(s) to chipProcessedExp
 
-    psString query = psStringCopy(
-        "SELECT DISTINCT"
-        "   chipPendingImfile.*"
-        " FROM chipPendingImfile "
-        " LEFT JOIN chipProcessedImfile"
-        "   USING(exp_tag, class_id)"
-        " WHERE"
-        "  chipProcessedImfile.exp_tag IS NULL"
-        "  AND chipProcessedImfile.class_id IS NULL"
-        );
+    psString query = pxDataGet("chiptool_find_unprocessed_imfile.pl");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
     {
         psMetadata *where = psMetadataAlloc();
@@ -475 +462 @@
     // XXX does this need to be constrained so that it won't return any results
     // if a match chipPendingExp hasn't been registered?
-    psString query = psStringCopy(
-            "SELECT"
-            "   chipProcessedImfile.*,"
-            "   rawExp.camera,"
-            "   rawExp.workdir"
-            " FROM chipProcessedImfile"
-            " JOIN rawExp"
-            "   USING(exp_tag)"
-            " WHERE "
-            "   chipProcessedImfile.exp_tag is NOT NULL" // bogus test -- just here so there there is a 'WHERE' stmt to append conditionals too
-        );
+    psString query = pxDataGet("chiptool_processedimfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {
@@ -673 +654 @@
     // look for completed chipPendingExp
     // migrate them to chipProccessedExp & camPendingExp
-
-    // select * from chipPendingExp
-    // where exp_tag is not in chipProcessedExp
-    // where exp_tag is not in chipPendingImfile
-    // where the number of entries in chipProccessedImfile matches the .imfiles
-    // entry in rawExp
-    psString query = psStringCopy(
-        "SELECT DISTINCT"
-        "   chipPendingExp.*,"
-        "   rawExp.imfiles,"
-        "   chipProcessedImfile.class_id"
-        " FROM chipPendingExp"
-        " JOIN rawExp"
-        "   ON chipPendingExp.exp_tag = rawExp.exp_tag"
-        " LEFT JOIN chipProcessedExp"
-        "   ON chipPendingExp.exp_tag = chipProcessedExp.exp_tag"
-        " LEFT JOIN chipPendingImfile"
-        "   ON chipPendingExp.exp_tag = chipPendingImfile.exp_tag"
-        " LEFT JOIN chipProcessedImfile"
-        "   ON chipPendingExp.exp_tag = chipProcessedImfile.exp_tag"
-        " WHERE"
-        "  chipProcessedExp.exp_tag IS NULL"
-        "  AND chipPendingImfile.exp_tag IS NULL"
-        "  AND chipProcessedImfile.exp_tag IS NOT NULL"
-        " GROUP BY"
-        "   chipPendingExp.exp_tag"
-        " HAVING rawExp.imfiles = COUNT(chipProcessedImfile.class_id)"
-        );
+    psString query = pxDataGet("chiptool_completely_processed_exp.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (!p_psDBRunQuery(config->dbh, query)) {