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

Timestamp:

Oct 17, 2008, 9:42:10 AM (18 years ago)

Author:

bills

Message:

exit with error status if no matching images are found
add class_id to the filelist if image has one

File:

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

trunk/pstamp/scripts/pstampparse.pl

@@ -192 +192 @@
             $x, $y, $mjd_min, $mjd_max, $filter);
 
+    if (!$images) {
+        print STDERR "no matching images found\n";
+        exit $PS_EXIT_DATA_ERROR;
+    }
     if ($mode eq "list_uri") {
         foreach my $image (@$images) {
@@ -201 +205 @@
         my $listfile = "$out_dir/filelist";
 
+
+        # map our img_type to the Data Store file types.
+        my %filelist_img_types = ( "raw" => "chip", 
+                                   "chip" => "chipproc",
+                                   "warp" => "warp", 
+                                   "stack"=>"stack",
+                                   "diff" => "diff");
+
+        my $filelist_img_type = $filelist_img_types{$img_type};
+
         open LISTFILE, ">$listfile"
             or die "failed to open file list: $listfile while parsing get_image request $req_id";
 
         foreach my $image (@$images) {
-            print LISTFILE "$image->{image}|$img_type\n";
+            my $class_id = $image->{class_id} ? $image->{class_id} : "";
+            print LISTFILE "$image->{image}|$filelist_img_type|$class_id|\n";
         }
         close LISTFILE;
@@ -234 +249 @@
             my $uri = $image->{image};
             my $exp_id = $image->{exp_id};
+            
 
             $job_num++;