Changeset 32283 for trunk/ippTools/src/magictool.c

Timestamp:

Sep 1, 2011, 2:12:15 PM (15 years ago)

Author:

watersc1

Message:

Fix magictool to understand that we sometimes want to allow multiple diffs in the same label to be independently processed.

File:

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

trunk/ippTools/src/magictool.c

@@ -131 +131 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
-
+    PXOPT_LOOKUP_BOOL(multidiff, config->args, "-multidiff", false);
     psMetadata *diffWhere = psMetadataAlloc(); // WHERE conditions for diffRuns
     PXOPT_COPY_STR(config->args, diffWhere, "-diff_label", "diffRun.label", "==");
@@ -142 +142 @@
     // Get list of exposures ready to magic
     {
-        psString query = pxDataGet("magictool_definebyquery_select.sql");
+        psString query;
+        if (multidiff) {
+          query = pxDataGet("magictool_definebyquery_select_multidiff.sql");
+        }
+        else {
+          query = pxDataGet("magictool_definebyquery_select.sql");
+        }
         if (!query) {
             psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");