Changeset 28503

Timestamp:

Jun 25, 2010, 10:45:22 AM (16 years ago)

Author:

Paul Price

Message:

Adding background restoration to disttool.

Location:

branches/pap/ippTools

Files:

• share/Makefile.am (modified) (2 diffs)
• share/disttool_definebyquery_chip_bg.sql (added)
• share/disttool_definebyquery_warp_bg.sql (added)
• src/disttool.c (modified) (2 diffs)

branches/pap/ippTools/share/Makefile.am

@@ -145 +145 @@
         disttool_definebyquery_camera.sql \
         disttool_definebyquery_chip.sql \
+        disttool_definebyquery_chip_bg.sql \
         disttool_definebyquery_diff.sql \
         disttool_definebyquery_fake.sql \
@@ -150 +151 @@
         disttool_definebyquery_stack.sql \
         disttool_definebyquery_warp.sql \
+        disttool_definebyquery_warp_bg.sql \
         disttool_definebyquery_SSdiff.sql \
         disttool_defineinterest.sql \

branches/pap/ippTools/src/disttool.c

@@ -210 +210 @@
             psStringAppend(&query, " AND (chipRun.dist_group = '%s')", dist_group);
         }
+    } else if (!strcmp(stage, "chip_bg")) {
+        magicRunType = "chipBackgroundRun";
+        runJoinStr = "chipBackgroundRun.chip_bg_id";
+        query = pxDataGet("disttool_definebyquery_chip_bg.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+            psFree(where);
+            return false;
+        }
+
+        if (label) {
+            psStringAppend(&query, " AND (chipBackgroundRun.label = '%s')", label);
+        }
+        if (dist_group) {
+            psStringAppend(&query, " AND (chipBackgroundRun.dist_group = '%s')", dist_group);
+        }
     } else if (!strcmp(stage, "camera")) {
         magicRunType = "camRun";    // This is used below to set the magicked business
@@ -258 +274 @@
         if (dist_group) {
             psStringAppend(&query, " AND (warpRun.dist_group = '%s')", dist_group);
+        }
+
+    } else if (!strcmp(stage, "warp_bg")) {
+        magicRunType = "warpBackgroundRun";
+        runJoinStr = "warpBackgroundRun.warp_bg_id";
+        query = pxDataGet("disttool_definebyquery_warp_bg.sql");
+        if (!query) {
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+            psFree(where);
+            return false;
+        }
+
+        if (label) {
+            psStringAppend(&query, " AND (warpBackgroundRun.label = '%s')", label);
+        }
+        if (dist_group) {
+            psStringAppend(&query, " AND (warpBackgroundRun.dist_group = '%s')", dist_group);
         }