Changeset 27795 for trunk/PS-IPP-PStamp

Timestamp:

Apr 28, 2010, 2:18:01 PM (16 years ago)

Author:

bills

Message:

first crack at queuing automatic updates for diffSkyfiles. Various bug fixes found in testing

File:

• trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (1 diff)

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -455 +455 @@
     my $inverse = $option_mask & $PSTAMP_SELECT_INVERSE;
 
-    my $command = "$difftool -diffskyfile -dbname $imagedb";
+    my $command = "$difftool -dbname $imagedb";
     
     if ($byid) {
-        $command .= " -diff_id $id";
+        $command .= " -listrun -diff_id $id";
     } else {
-        $command .= " -diff_skyfile_id $id";
+        $command .= " -diffskyfile -diff_skyfile_id $id";
     }
     $command .= " -skycell_id $skycell_id" if $skycell_id;
 
-    my $images = runToolAndParse($command, $verbose);
-
-    my $n = @$images;
+    my $output = runToolAndParse($command, $verbose);
+
+    my $n = @$output;
     if (!$byid && ($n > 1)) {
         die ("difftool returned an unexpected number of diffskyfiles: $n");
     } elsif ($n == 0) {
         return undef;
+    }
+
+    my $images;
+    if ($byid) {
+        $images = selectComponents($ipprc, $imagedb, 'byid', 'diff', $rowList, $output, $verbose);
+    } else {
+        $images = $output;
     }