Changeset 28115

Timestamp:

May 26, 2010, 1:54:51 PM (16 years ago)

Author:

bills

Message:

Fix error in byid requests for chip images where no component is supplied.
Astrometry file wasn't being resolved early enough.

File:

• trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (3 diffs)

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

@@ -1045 +1045 @@
     $last_project = $proj_hash->[0];
 
+    $ipprc->define_camera($last_project->{camera});
+
     return $last_project;
 }
@@ -1105 +1107 @@
     close $pointsList;
 
-    # XXX: need to loop over these
-    # my $run = $runList->[0];
     if (($req_type eq "byid") or ($req_type eq "byexp")) {
         my ($last_tess_id, $tess_dir_abs, $astrom_file) = ("", "", "");
@@ -1114 +1114 @@
                 # XXX: use file rule and handle cameras where the astrometry is solved at
                 # the chip stage.
-                $astrom_file = $run->{cam_path_base} . ".smf";
+                my $cam_path_base = $run->{cam_path_base};
+                if ($cam_path_base) {
+                    $astrom_file = $run->{cam_path_base} . ".smf";
+                } else {
+                    if (! find_astrometry($ipprc, $imagedb, $run, $verbose) ) {
+                        setErrorCodes($rowList, $PSTAMP_NOT_AVAILABLE);
+                        next;
+                    }
+                    $cam_path_base = $run->{cam_path_base};
+                    $astrom_file = $run->{astrom_file};
+                }
                 my $astrom_file_resolved = $ipprc->file_resolve($astrom_file);
                 if (!$astrom_file_resolved) {