Changeset 27914

Timestamp:

May 11, 2010, 12:09:05 PM (16 years ago)

Author:

bills

Message:

Fix error queuing update runs for get image jobs. Pass component = 'all' to locate_images if appropriate.
Several error messages had print if $verbose. Print unconditionally they are errors.

File:

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

trunk/pstamp/scripts/pstampparse.pl

@@ -224 +224 @@
     my $rownum   = $row->{ROWNUM};
     if (!validID($rownum)) {
-        print STDERR "$rownum is not a valid ROWNUM\n"  if $verbose;
+        print STDERR "$rownum is not a valid ROWNUM\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
         return 0;
@@ -230 +230 @@
     my $job_type = $row->{JOB_TYPE};
     if (($job_type ne "stamp") and ($job_type ne "get_image")) {
-        print STDERR "$job_type is not a valid JOB_TYPE\n"  if $verbose;
+        print STDERR "$job_type is not a valid JOB_TYPE\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
         return 0;
@@ -238 +238 @@
     if (($req_type ne "byid") and ($req_type ne "bycoord") and ($req_type ne "byexp") and
         ($req_type ne "byskycell") and ($req_type ne "bydiff")) {
-        print STDERR "$req_type is not a valid REQ_TYPE\n"  if $verbose;
+        print STDERR "$req_type is not a valid REQ_TYPE\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
         return 0;
     }
+    if ($job_type eq 'get_image') {
+        unless ($req_type eq 'byid' or $req_type eq 'byexp') {
+            print STDERR "REQ_TYPE must be 'byid' or 'byexp' for JOB_TYPE 'get_image'\n";
+            insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
+            return 0;
+        }
+    }
 
 
     my $component = $row->{COMPONENT};
     if (!defined $component or (lc($component) eq "null") or (lc($component) eq "all")) {
-        $row->{COMPONENT} = $component = "";
+        if ($job_type eq 'get_image') {
+            $row->{COMPONENT} = 'all';
+        } else {
+            $row->{COMPONENT} = $component = "";
+        }
     }
     $row->{TESS_ID} = "" if !defined $row->{TESS_ID};
@@ -259 +270 @@
     my $mjd_min = $row->{MJD_MIN};
     if (defined($mjd_min) and !validNumber($mjd_min)) {
-        print STDERR "$mjd_min is not a valid MJD_MIN\n"  if $verbose;
+        print STDERR "$mjd_min is not a valid MJD_MIN\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
         return 0;
@@ -265 +276 @@
     my $mjd_max = $row->{MJD_MAX};
     if (defined($mjd_max) and !validNumber($mjd_max)) {
-        print STDERR "$mjd_max is not a valid MJD_MAX\n"  if $verbose;
+        print STDERR "$mjd_max is not a valid MJD_MAX\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
         return 0;
@@ -289 +300 @@
 
     if (!$skycenter and !$component) {
-        print STDERR "COMPONENT must be specified for pixel coordinate ROI center\n" if $verbose;
+        print STDERR "COMPONENT must be specified for pixel coordinate ROI center\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
         return 0;
@@ -296 +307 @@
     my $stage = $row->{IMG_TYPE};
     if (!check_image_type($stage)) {
-        print STDERR "invalid IMG_TYPE for row $rownum\n" if $verbose;
+        print STDERR "invalid IMG_TYPE for row $rownum\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
         return 0;
@@ -302 +313 @@
 
     if ((($job_type eq "stamp") or ($req_type eq "bycoord")) and ! validROI($row)) {
-        print STDERR "invalid ROI for row $rownum\n" if $verbose;
+        print STDERR "invalid ROI for row $rownum\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
         return 0;
@@ -308 +319 @@
 
     if (($req_type eq "byexp") and ($stage eq "stack")) {
-        print STDERR "byexp not implemented for stack stage. row: $rownum\n" if $verbose;
+        print STDERR "byexp not implemented for stack stage. row: $rownum\n";
         insertFakeJobForRow($row, 1, $PSTAMP_NOT_IMPLEMENTED);
         return 0;
@@ -320 +331 @@
     if ($req_type eq "bycoord") {
         if (!$skycenter) {
-            print STDERR "center must be specified in sky coordintes for bycoord" if $verbose;
+            print STDERR "center must be specified in sky coordintes for bycoord";
             insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
             return 0;
@@ -328 +339 @@
     if (($req_type eq "byid") or ($req_type eq "bydiff")) {
         if (!validID($row->{ID})) {
-            print STDERR "ID must be a positive integer for req_type $req_type\n" if $verbose;
+            print STDERR "ID must be a positive integer for req_type $req_type\n";
             insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
             return 0
@@ -350 +361 @@
     my $proj_hash = resolve_project($ipprc, $project, $dbname, $dbserver);
     if (!$proj_hash) {
-        print STDERR "project $project not found\n"  if $verbose;
+        print STDERR "project $project not found\n" ;
         foreach $row (@$rowList) {
             insertFakeJobForRow($row, 1, $PSTAMP_UNKNOWN_PRODUCT);
@@ -714 +725 @@
                     # cause the image to be re-made
                     # set up to queue an update run
-                    queue_update_run(\$newState, \$fault, \$dep_id, $image->{image_db}, 
+                    queue_update_run(\$newState, \$fault, \$dep_id, $image->{imagedb}, 
                         $run_state, $stage, $image->{stage_id}, $image->{component}, $need_magic);
                 }