Changeset 12259 for trunk/ippTools/src/detselect.c

Timestamp:

Mar 5, 2007, 5:41:11 PM (19 years ago)

Author:

jhoblitt

Message:

split detselect SQL out into their own files
add rawExp.filelevel field

File:

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

trunk/ippTools/src/detselect.c

@@ -168 +168 @@
     }
 
-    psString query = psStringCopy(
-        "SELECT DISTINCT"
-        "   detRunSummary.det_id,"
-        "   detRunSummary.iteration"
-        " FROM detRun"
-        " JOIN detRunSummary"
-        "   USING(det_id)"
-        " WHERE"
-        "   detRun.state = 'stop'"
-        "   AND detRun.mode  = 'master'"
-        "   AND detRunSummary.accept = 1" 
-    );
+    psString query = pxDataGet("detselect_search.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {
@@ -246 +239 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    psString query = psStringCopy(
-        "SELECT DISTINCT"
-        "   detNormalizedImfile.*"
-        " FROM detNormalizedImfile"
-        " JOIN detRun"
-        "   USING(det_id)"
-        " JOIN detRunSummary"
-        "   ON detNormalizedImfile.det_id = detRunSummary.det_id"
-        "   AND detNormalizedImfile.iteration = detRunSummary.iteration"
-        " WHERE"
-        "   detRun.state = 'stop'"
-        "   AND detRun.mode  = 'master'"
-        "   AND detRunSummary.accept = 1" 
-    );
+    psString query = pxDataGet("detselect_select.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
 
     if (config->where) {