Changeset 28765

Timestamp:

Jul 29, 2010, 11:26:37 AM (16 years ago)

Author:

bills

Message:

if data_group is not supplied use the diffRun's data_group

Location:

trunk/ippTools

Files:

• share/magictool_definebyquery_select.sql (modified) (3 diffs)
• src/magictool.c (modified) (2 diffs)

trunk/ippTools/share/magictool_definebyquery_select.sql

@@ -4 +4 @@
     MAX(diffWarps.diff_id) AS diff_id,
     -- The following trick pulls out the 'inverse' value for the maximum diff_id
-    CONVERT(SUBSTRING_INDEX(GROUP_CONCAT(diffWarps.inverse ORDER BY diffWarps.diff_id), ',', 1), UNSIGNED) AS inverse
+    CONVERT(SUBSTRING_INDEX(GROUP_CONCAT(diffWarps.inverse ORDER BY diffWarps.diff_id), ',', 1), UNSIGNED) AS inverse,
+    diff_data_group
 FROM (
     -- Forward diffs
@@ -10 +11 @@
         diffRun.diff_id,
         warp1 AS warp_id,
-        0 AS inverse
+        0 AS inverse,
+        diffRun.data_group AS diff_data_group
     FROM diffRun
     JOIN diffInputSkyfile USING(diff_id)
@@ -22 +24 @@
         diffRun.diff_id,
         warp2 AS warp_id,
-        1 AS inverse
+        1 AS inverse,
+        diffRun.data_group AS diff_data_group
     FROM diffRun
     JOIN diffInputSkyfile USING(diff_id)

trunk/ippTools/src/magictool.c

@@ -246 +246 @@
         psS64 diff_id = psMetadataLookupS64(NULL, row, "diff_id"); // difference identifier
         bool inverse = psMetadataLookupU64(NULL, row, "inverse"); // Inverse subtraction? Note types!
+        psString diff_data_group = psMetadataLookupStr(NULL, row, "diff_data_group");
 
         // create a new magicRun for this group
@@ -256 +257 @@
                                             "dirty",    // workdir_state
                                             label,
-                                            data_group ? data_group : label,
+                                            data_group ? data_group : (diff_data_group ? diff_data_group : label),
                                             dvodb,
                                             registered,