Changeset 27356

Timestamp:

Mar 19, 2010, 8:36:36 AM (16 years ago)

Author:

bills

Message:

make sure that ID values passed to byid and byidff are valid ids (number > 0)
Fix bug in MJD* validation

File:

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

trunk/pstamp/scripts/pstampparse.pl

@@ -258 +258 @@
 
     # Temporary hack so that MOPS can get at non-magicked data
-    if ($product and ($product eq "mops-pstamp-results")) {
-        $need_magic = 0;
-    }
+#    if ($product and ($product eq "mops-pstamp-results")) {
+#        $need_magic = 0;
+#    }
 
     # For "stamp" and "list_uri" jobs collect rows with the same images of interest in a list so that they
@@ -285 +285 @@
         if (!$skycenter) {
             print STDERR "center must be specified in sky coordintes for bycoord" if $verbose;
+            insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
+            $num_jobs++;
+            next;
+        }
+    }
+    if (($req_type eq "byid") or ($req_type eq "bydiff")) {
+        if (!validID($id)) {
+            print STDERR "ID must be a positive integer for req_type $req_type\n" if $verbose;
             insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
             $num_jobs++;
@@ -368 +376 @@
         if (($stage ne "stack") and ($need_magic and !$image->{magicked})) {
             # XXX: should we add a faulted job so the client can know what happened if no images come back?
-            # This test is made in locate_images now so this code never runs. This leads to no feedback
-            # to users, but speeds up processing significatnly
+            # The test for destreaked is made in locate_images now so this code never runs. This leads to no feedback
+            # to users, but speeds up processing significantly
             print STDERR "skipping non-magicked image $imagefile\n" if $verbose;
 
@@ -859 +867 @@
     my $val = shift;
 
-    return $val =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/;
+    return 0 if !defined $val;
+
+    return ($val =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/);
+}
+sub validID
+{
+    my $val = shift;
+
+    return 0 if !$val;
+
+    return  ! ($val =~ /\D/);
 }