Changeset 34446

Timestamp:

Sep 18, 2012, 10:37:22 AM (14 years ago)

Author:

mhuber

Message:

merging difftool querystackstack to not re-queue on change of template and staticskytool skycal label/data_group fix

Location:

tags/ipp-20120802/ippTools

Files:

• share/difftool_definestackstack_part0.sql (modified) (1 diff, 1 prop)
• share/difftool_definestackstack_part1.sql (modified) (1 diff, 1 prop)
• src/difftoolConfig.c (modified) (1 diff, 1 prop)

tags/ipp-20120802/ippTools/share/difftool_definestackstack_part0.sql

@@ -39 +39 @@
           WHERE 1
           @STACK1_QUERY@ -- input condition
-) AS diffExp ON diffExp.stack1 = stackRun.stack_id AND diffExp.stack2 = template.max_stack_id
+) AS diffExp ON diffExp.stack1 = stackRun.stack_id 
 WHERE
         stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0

tags/ipp-20120802/ippTools/share/difftool_definestackstack_part1.sql

@@ -40 +40 @@
           WHERE 1
           @STACK1_QUERY@ -- input constraint
-) AS diffExp ON diffExp.stack1 = stackRun.stack_id AND diffExp.stack2 = template.max_stack_id
+) AS diffExp ON diffExp.stack1 = stackRun.stack_id 
 WHERE
         stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0

tags/ipp-20120802/ippTools/src/difftoolConfig.c

@@ -351 +351 @@
     psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-rerun", 0, "define new run even if one exists", false);
     psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-available", 0, "define new run even if no stacks available for some skycells", false);
-    psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-new-templates", 0, "also search for diffs with new template", false);
+    psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-new-templates", 0, "also search for diffs with new template and same template label", false);
     psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
     psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-pretend", 0, "list results but do not queue", false);