Changeset 29155

Timestamp:

Sep 13, 2010, 2:51:50 PM (16 years ago)

Author:

bills

Message:

fix bugs in lookup byexp diff

Location:

tags/ipp-20100823/PS-IPP-PStamp

Files:

• . (modified) (1 prop)
• lib/PS/IPP/PStamp/Job.pm (modified) (6 diffs)

tags/ipp-20100823/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -287 +287 @@
             $choose_components = 1;
         }
+        $command .= " -template" if $inverse;
         $id_opt = $use_imfile_id ? "-diff_skyfile_id" : "-diff_id";
         $image_name  = "PPSUB.OUTPUT";
@@ -361 +362 @@
         # The image selectors are such that multiple runs my have be returned for the same exposure.
         # Return only the latest one.
-        $images = filterRuns($stage, $need_magic, $images, $verbose);
+        $images = filterRuns($stage, $need_magic, $images, $inverse, $verbose);
     }
     if ($choose_components) {
@@ -479 +480 @@
     my $listrun = 0;
     if ($byid) {
-        if ($skycell_id) {
+        if ($skycell_id and ($skycell_id ne 'all')) {
             $command .= " -diffskyfile -diff_id $id -skycell_id $skycell_id";
         } else {
@@ -1235 +1236 @@
     my $need_magic = shift;
     my $inputs     = shift;
+    my $inverse     = shift;
     my $verbose    = shift;
 
@@ -1254 +1256 @@
     my $printed = 0;
     foreach my $input (@$inputs) {
-        my $exp_id = $input->{exp_id};
+        my $exp_id;
+        if ($stage ne "diff") {
+            $exp_id = $input->{exp_id};
+        } elsif (!$inverse) {
+            $exp_id = $input->{exp_id_1};
+            $input->{exp_id} = $exp_id;
+        } else {
+            $exp_id = $input->{exp_id_2};
+            $input->{exp_id} = $exp_id;
+        }
         my $run_id = $input->{$id_name};
         my $magicked = $input->{magicked};  # this will be either stageRun.magicked or stage%file.magicked
@@ -1260 +1271 @@
 
         # can't process run in these states
+        # XXX: also goto_purged or goto_scrubbed or drop
         if (($state eq 'new') or ($state eq 'purged') or ($state eq 'scrubbed')) {
             print "skipping ${stage}Run $run_id for exp_id $exp_id in state $state\n";