Changeset 33638 for branches/eam_branches/ipp-20111122/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (6 diffs)

branches/eam_branches/ipp-20111122/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -351 +351 @@
         $command .= " -dateobs_begin $dateobs_begin" if $dateobs_begin;
         $command .= " -dateobs_end $dateobs_end" if $dateobs_end;
-    } else {
+    } elsif ($req_type ne "byid") {
         $command .= " -mjd_obs_begin $mjd_min" if $mjd_min;
         $command .= " -mjd_obs_end $mjd_max" if $mjd_max;
@@ -438 +438 @@
         } elsif ($stage eq "stack") {
             $stage_id = $out->{stack_id};
+            # dquery wants these set
+            $out->{magicked} = 0;
+            $out->{data_state} = $out->{state};
         }
         $out->{stage_id} = $stage_id;
@@ -487 +490 @@
     my $command = "$difftool -dbname $imagedb -pstamp_order";
     
-    my $listrun = 0;
+    my $choose_components = 0;
     if ($byid) {
         if ($skycell_id and ($skycell_id ne 'all')) {
             $command .= " -diffskyfile -diff_id $id -skycell_id $skycell_id";
         } else {
-            $listrun = 1;
+            $choose_components = 1;
             $command .= " -listrun -diff_id $id";
             # the following is a work around for the problem reported in ticket #1394
@@ -512 +515 @@
 
     my $images;
-    if ($listrun) {
+    if ($choose_components) {
         $images = selectComponents($ipprc, $imagedb, 'byid', 'diff', $rowList, $output, $verbose);
     } else {
@@ -603 +606 @@
             my @imageList = ($image);
 
-            setRowRefs($rowList, \@imageList);
+            setRowRefs($rowList, \@imageList) unless $choose_components;
             # the $image is going to be returned directly in this case so we need to duplicate
             # some of processing that lookup does for other img_types
@@ -847 +850 @@
     {
         my $command = "$whichimage $ra $dec";
+        $command .= " --tess_id $requested_tess_id" if $requested_tess_id;
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
                     run(command => $command, verbose => $verbose);