Changeset 17893 for trunk/pstamp/scripts/pstamp_parser_run.pl

Timestamp:

Jun 3, 2008, 9:37:51 AM (18 years ago)

Author:

bills

Message:

Various changes to allow processing of detectability query requests
by the postage stamp server request processor

File:

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

trunk/pstamp/scripts/pstamp_parser_run.pl

@@ -5 +5 @@
 ###
 
+#XXX TODO: accept dbname save-temps and verbose as command line parameters
+#XXX see notes about error handling
+
 use warnings;
 use strict;
 
 use Sys::Hostname;
-my $host = hostname();
-print "\n\n";
-print "Starting script $0 on $host\n\n";
+
+my $verbose = 1;
+if ($verbose) {
+    my $host = hostname();
+    print "\n\n";
+    print "Starting script $0 on $host\n\n";
+}
 
 if (@ARGV != 1) {
@@ -18 +25 @@
 
 my $request_id = $ARGV[0];
-
 
 use IPC::Cmd 0.36 qw( can_run run );
@@ -57 +63 @@
 my $pstamptool  = can_run('pstamptool')  or (warn "Can't find pstamptool"  and $missing_tools = 1);
 my $pstampparse = can_run('pstampparse') or (warn "Can't find pstampparse" and $missing_tools = 1);
+my $dqueryparse = can_run('dqueryparse.pl') or (warn "Can't find dqueryparse.pl" and $missing_tools = 1);
 my $dsget = can_run('dsget') or (warn "Can't find dsget" and $missing_tools = 1);
 
@@ -71 +78 @@
     my $command = "$pstamptool -pendingreq -req_id $request_id";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 1);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
         die("Unable to perform $command error code: $error_code");
@@ -85 +92 @@
     my $requests = parse_md_list($metadata);
 
-    $psrequest = ${@$requests}[0];
+    # TODO: We are assuming that we get an array of length 1 (or zero)
+    # should we fail if we get more? 
+    #$psrequest = ${@$requests}[0];
+    $psrequest = $requests->[0];
 }
 
@@ -112 +122 @@
         my $command = "$dsget --uri $uri --filename $new_uri";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => 1);
+            run(command => $command, verbose => $verbose);
         unless ($success) {
             die("Unable to perform $command error code: $error_code");
@@ -121 +131 @@
 }
 
-#  create the output diredtory
+#  find the name of the output directory
 my $outdir;
 if ($ds_id) {
     my $command = "$pstamptool -datastore -ds_id $ds_id";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 1);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
         die("Unable to perform $command error code: $error_code");
@@ -140 +150 @@
     my $dataStores = parse_md_list($metadata);
 
-    my $dataStore = ${@$dataStores}[0];
+    my $dataStore = $dataStores->[0];
 
     $outdir = "$outputDataStoreRoot/$psrequest->{outFileset}";
@@ -147 +157 @@
 }
 
+#  create the output directory
 if (! -e $outdir ) {
     mkdir $outdir or die("unable to create output directory $outdir");
@@ -153 +164 @@
 }
 
-# run pstampparse to parse the queue the jobs for this request
+# run the appropriate parse command to parse the queue the jobs for this request
+# first check the extension header to find the EXTNAME
+my $request_type = find_request_type($uri);
+
+print STDERR "request_type is $request_type\n" if $verbose;
+
+my $parse_cmd;
+if ($request_type eq "PS1_PS_REQUEST") {
+    $parse_cmd = $pstampparse . " -mode queue_job -req_id $request_id -out_dir $outdir $uri";
+} elsif ($request_type eq "MOPS_DETECTABILITY_QUERY") {
+    $parse_cmd = $dqueryparse  . " --mode queue_job --req_id $request_id --out_dir $outdir --uri $uri";
+}
+
+if (!$parse_cmd) {
+    # XXX TODO mark the error state for the job and set it to stop
+    die "null request type found in $uri" if !$request_type;
+    die "unknown request type $request_type found in $uri";
+}
+
 {
-    my $command = "$pstampparse -mode queue_job -req_id $request_id -out_dir $outdir $uri";
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 1);
-    unless ($success) {
-#        die("Unable to perform $command error code: $error_code");
+    my $command = "$parse_cmd";
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => $verbose);
+    unless ($success) {
         if (!open OUT, ">$outdir/parse_error") {
             die("unable to open parse_error file $outdir/parse_error");
@@ -167 +195 @@
     }
 }
-
 # XXX make sure that a job got actually got queued. If not set the request result and set state to
 # run so that the "request finisher" can build the results file.
@@ -177 +204 @@
     my $command = "$pstamptool -processedreq -req_id $request_id -state run";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 1);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
         die("Unable to perform $command error code: $error_code");
@@ -184 +211 @@
 
 exit 0;
+
+sub find_request_type {
+    # find the EXTNAME in the input fits table
+    # TODO: do this right handling errors etc.
+    my $file_name = shift;
+    my $out = `echo $file_name | fields -x 0 EXTNAME`;
+
+    # output from fields is filename value
+    my ($dummy, $extname) = split " ", $out;
+
+    return $extname;
+}