Changeset 28794 for branches/eam_branches/ipp-20100621/ippTools/src/magictool.c

Timestamp:

Jul 30, 2010, 9:31:50 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20100621/ippTools/src

Files:

• . (modified) (1 prop)
• magictool.c (modified) (5 diffs)

branches/eam_branches/ipp-20100621/ippTools/src

@@ -39 +39 @@
 warptool
 staticskytool
-
+bgtool
 diffphottool

@@ -39 +39 @@
 warptool
 staticskytool
-
+bgtool
 diffphottool

branches/eam_branches/ipp-20100621/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,
@@ -521 +522 @@
     psFree(where);
 
+    psStringAppend(&query, "\nORDER BY priority DESC, magic_id");
+
     // treat limit == 0 as "no limit"
     if (limit) {
@@ -830 +833 @@
     psFree(where);
 
+    psStringAppend(&query, "\nORDER BY priority DESC, magic_id");
+
     // treat limit == 0 as "no limit"
     if (limit) {
@@ -1365 +1370 @@
     // check that state is a valid string value
     if (!(
-            (strncmp(state, "new", 4) == 0)
-            || (strncmp(state, "full", 5) == 0)
-            || (strncmp(state, "drop", 5) == 0)
-            || (strncmp(state, "reg", 4) == 0)
+            (strncmp(state, "new", 3) == 0)
+            || (strncmp(state, "full", 4) == 0)
+            || (strncmp(state, "drop", 4) == 0)
+            || (strncmp(state, "reg", 3) == 0)
         )
     ) {

@@ -39 +39 @@
 warptool
 staticskytool
-
+bgtool
 diffphottool