Changeset 25736

Timestamp:

Oct 1, 2009, 3:46:48 PM (17 years ago)

Author:

bills

Message:

added pstamp_request_file. a script to create postage stamp request files

Location:

trunk/pstamp/scripts

Files:

• Makefile.am (modified) (1 diff)
• pstamp_request_file (modified) (6 diffs)

trunk/pstamp/scripts/Makefile.am

@@ -11 +11 @@
         pstamp_parser_run.pl \
         pstamp_queue_requests.pl \
+        pstamp_request_file \
         pstamp_results_file.pl \
         pstamp_revert_request.pl \

trunk/pstamp/scripts/pstamp_request_file

@@ -24 +24 @@
            'input|i=s'    => \$input,
            'output|o=s'   => \$output,
-           'req_name|j=s' => \$req_name,
+           'req_name|r=s' => \$req_name,
            'help|h'         => \$help,
 ) or pod2usage( 2 );
@@ -74 +74 @@
         { name => 'MJD_MIN',    type => 'D',   writetype => TDOUBLE },
         { name => 'MJD_MAX',    type => 'D',   writetype => TDOUBLE },
+
+        { name => 'COMMENT ',   type => '64A', writetype => TSTRING },
 ];
 
@@ -243 +245 @@
 
     my $num_rows = 0;
-    my $ncols = @$colData;
+    my $ncols = @$colData - 1;  # -1 because COMMENT is handled seperatly
     my @last_vals;
     my %used_ROWNUMS;
@@ -253 +255 @@
         next if ($line =~ /^#/);    # skip comment lines
 
-        my @vals = split /$sep/, $line;
+        my ($spec, $comment) = split /\|/, $line;
+        if (!$spec) {
+            print STDERR "improper format on line $line_num\n";
+            print STDERR "$line\n";
+            exit 1;
+        }
+        $comment = "null" if !$comment;
+        my @vals = split /$sep/, $spec;
         my $nvals = @vals;
         if ($nvals < $minimum_required_vals) {
@@ -266 +275 @@
             }
         }
+        $vals[$ncols] = $comment;
         @last_vals = @vals;
     
@@ -314 +324 @@
     print "  REQ_NAME EXTVER\n\n";
     print "REQUEST specification (1 or more lines). Format:\n\n";
-    print "  ROWNUM CENTER_X CENTER_Y WIDTH HEIGHT COORD_MASK JOB_TYPE OPTION_MASK PROJECT REQ_TYPE IMG_TYPE ID TESS_ID COMPONENT LABEL REQFILT MJD_MIN MJD_MAX\n\n";
+    print "  ROWNUM CENTER_X CENTER_Y WIDTH HEIGHT COORD_MASK JOB_TYPE OPTION_MASK PROJECT REQ_TYPE IMG_TYPE ID TESS_ID COMPONENT LABEL REQFILT MJD_MIN MJD_MAX | COMMENT\n\n";
 
     exit 0;