Changeset 25776 for trunk/pstamp/scripts/pstampparse.pl

Timestamp:

Oct 5, 2009, 2:17:58 PM (17 years ago)

Author:

bills

Message:

first implementation of REQ_TYPE bycoord
other bug fixes

File:

• trunk/pstamp/scripts/pstampparse.pl (modified) (4 diffs)

trunk/pstamp/scripts/pstampparse.pl

@@ -195 +195 @@
     my $mjd_max = $row->{MJD_MAX};
     my $label   = $row->{LABEL};
+    my $x       = $row->{CENTER_X};
+    my $y       = $row->{CENTER_Y};
 
     my $option_mask= $row->{OPTION_MASK};
@@ -205 +207 @@
     
     if (!$skycenter and !$search_component) {
-        print STDERR "COMPONENT must be specified for pixel coordinate ROI\n" if $verbose;
+        print STDERR "COMPONENT must be specified for pixel coordinate ROI center\n" if $verbose;
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
         $num_jobs++;
@@ -213 +215 @@
     $search_component = "" if $search_component eq "all";
 
-    if (($job_type eq "stamp") and ! validROI($row)) {
+    if ((($job_type eq "stamp") or ($req_type eq "bycoord")) and ! validROI($row)) {
         print STDERR "invalid ROI for row $rownum\n" if $verbose;
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
@@ -262 +264 @@
             next;
         }
-        print STDERR "lookup bycoord is not yet implemented" if $verbose;
-        insertFakeJobForRow($row, 1, $PSTAMP_NOT_IMPLEMENTED);
-        $num_jobs++;
-        next;
-    } else {
-        # Call PS::IPP::PStamp::Job locate_images subroutine to get the images for this
-        # request specification. An array reference is returned.
-        my ($x, $y);
-
-        $imageList = locate_images($ipprc, $image_db, $req_type, $stage, $id, $tess_id, $search_component,
+        if ($stage eq "stack") {
+            print STDERR "lookup bycoord is not yet implemented for stage stack" if $verbose;
+            insertFakeJobForRow($row, 1, $PSTAMP_NOT_IMPLEMENTED);
+            $num_jobs++;
+            next;
+        }
+    }
+    # Call PS::IPP::PStamp::Job locate_images subroutine to get the images for this
+    # request specification. An array reference is returned.
+    $imageList = locate_images($ipprc, $image_db, $req_type, $stage, $id, $tess_id, $search_component,
                 $inverse, $need_magic, $x, $y, $mjd_min, $mjd_max, $filter, $label, $verbose);
 
-        if (!$imageList or !@$imageList) {
-            print STDERR "no matching images found for row $rownum\n" if $verbose;
-            # note in this case queueJobs inserts the fake job for these rows
-        }
-        $row->{need_magic} = $need_magic;
-        push @rowList, $row;
-    }
+    if (!$imageList or !@$imageList) {
+        print STDERR "no matching images found for row $rownum\n" if $verbose;
+        # note in this case queueJobs inserts the fake job for these rows
+    }
+    $row->{need_magic} = $need_magic;
+    push @rowList, $row;
 }