Changeset 27524

Timestamp:

Mar 30, 2010, 9:14:30 AM (16 years ago)

Author:

bills

Message:

catch invalid IMG_TYPE

File:

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

trunk/pstamp/scripts/pstampparse.pl

@@ -233 +233 @@
     # user requested us to search all components. Set to ""
     $search_component = "" if $search_component eq "all";
+
+    if (!check_image_type($stage)) {
+        print STDERR "invalid IMG_TYPE for row $rownum\n" if $verbose;
+        insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
+        $num_jobs++;
+        next;
+    }
 
     if ((($job_type eq "stamp") or ($req_type eq "bycoord")) and ! validROI($row)) {
@@ -958 +965 @@
 }
 
+sub check_image_type
+{
+    my $img_type = shift;
+    if (!$img_type) {
+            print STDERR "NULL IMG_TYPE supplied\n";
+            return 0;
+    }
+    if (($img_type eq "raw") or ($img_type eq "chip") or ($img_type eq "warp") or
+        ($img_type eq "stack") or ($img_type eq "diff")) {
+        return 1;
+    } else {
+        print STDERR "$img_type is not a valid IMG_TYPE\n";
+        return 0;
+    }
+}
+
 sub my_die
 {