Changeset 27839 for branches/simmosaic_branches/pstamp/scripts/pstamp_parser_run.pl

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• pstamp/scripts/pstamp_parser_run.pl (modified) (9 diffs)

branches/simmosaic_branches/pstamp/scripts/pstamp_parser_run.pl

@@ -13 +13 @@
 use Getopt::Long qw( GetOptions );
 use File::Basename qw( basename dirname);
+use File::Copy;
+use POSIX qw( strftime );
+use Carp;
+use IPC::Cmd 0.36 qw( can_run run );
+
+use PS::IPP::Metadata::Config;
+use PS::IPP::Metadata::Stats;
+use PS::IPP::Metadata::List qw( parse_md_list );
+
+use PS::IPP::Config qw( :standard );
 
 my $req_id;
@@ -18 +28 @@
 my $redirect_output;
 my $product;
+my $label;
 my $verbose;
 my $dbname;
@@ -26 +37 @@
     'uri=s'             =>  \$uri,
     'product=s'         =>  \$product,
+    'label=s'           =>  \$label,
     'redirect-output'   =>  \$redirect_output,
     'verbose'           =>  \$verbose,
@@ -38 +50 @@
 }
 
-die "--req_id --uri --product are required" 
-    if !defined($req_id) or
-       !defined($uri) or
-       !defined($product);
-
-use IPC::Cmd 0.36 qw( can_run run );
-
-use PS::IPP::Metadata::Config;
-use PS::IPP::Metadata::Stats;
-use PS::IPP::Metadata::List qw( parse_md_list );
-
-use PS::IPP::Config qw($PS_EXIT_SUCCESS
-                       $PS_EXIT_UNKNOWN_ERROR
-                       $PS_EXIT_SYS_ERROR
-                       $PS_EXIT_CONFIG_ERROR
-                       $PS_EXIT_PROG_ERROR
-                       $PS_EXIT_DATA_ERROR
-                       $PS_EXIT_TIMEOUT_ERROR
-                       metadataLookupStr
-                       metadataLookupBool
-                       caturi
-                       );
-
-my $ipprc = PS::IPP::Config->new(); # IPP Configuration
-
-my $outputDataStoreRoot = metadataLookupStr($ipprc->{_siteConfig}, 'DATA_STORE_ROOT');
-exit ($PS_EXIT_CONFIG_ERROR) unless defined $outputDataStoreRoot; # lookup failure outputs a message
-my $defaultOutputRoot = $outputDataStoreRoot;
-
-my $pstamp_workdir = metadataLookupStr($ipprc->{_siteConfig}, 'PSTAMP_WORKDIR');
-exit ($PS_EXIT_CONFIG_ERROR) unless defined $pstamp_workdir; # lookup failure outputs a message
-
-if (!$dbserver) {
-    $dbserver =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBSERVER');
-}
-
-# workdir is where we download request files to and place any error output from the parser
-# NOTE: this location needs to be kept in sync with the web interface ( request.php )
-my $workdir = "$pstamp_workdir/$req_id";
-
-if (! -e $workdir ) {
-    mkdir $workdir or die "failed to create working directory $workdir for request id $req_id";
-}
-
-if ($redirect_output) {
-    my $logDest = "$workdir/psparse.$req_id.log";
-    $ipprc->redirect_output($logDest);
-}
-
-my $defaultDSProduct = metadataLookupStr($ipprc->{_siteConfig}, 'PSTAMP_DATA_STORE_PRODUCT');
-exit ($PS_EXIT_CONFIG_ERROR) unless defined $defaultDSProduct;
-    
 my $missing_tools;
 
@@ -102 +62 @@
 }
 
+
+my_die("--req_id --uri --product are required", $req_id, $PS_EXIT_CONFIG_ERROR)
+    if !defined($req_id) or
+       !defined($uri) or
+       !defined($product);
+
+my $ipprc = PS::IPP::Config->new(); # IPP Configuration
+
+my $outputDataStoreRoot = metadataLookupStr($ipprc->{_siteConfig}, 'DATA_STORE_ROOT');
+exit ($PS_EXIT_CONFIG_ERROR) unless defined $outputDataStoreRoot; # lookup failure outputs a message
+my $defaultOutputRoot = $outputDataStoreRoot;
+
+my $pstamp_workdir = metadataLookupStr($ipprc->{_siteConfig}, 'PSTAMP_WORKDIR');
+exit ($PS_EXIT_CONFIG_ERROR) unless defined $pstamp_workdir; # lookup failure outputs a message
+
+if (!$dbserver) {
+    $dbserver =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBSERVER');
+}
+
+# workdir is where all of the files generated for this request are placed
+# NOTE: this location needs to be kept in sync with the web interface ( request.php )
+my $datestr = strftime "%Y%m%d", gmtime;
+my $datedir = "$pstamp_workdir/$datestr";
+if (! -e $datedir ) {
+    mkdir $datedir or my_die( "failed to create working directory $datedir for request id $req_id", $req_id,
+        $PS_EXIT_CONFIG_ERROR);
+}
+
+my $workdir = "$datedir/$req_id";
+if (! -e $workdir ) {
+    mkdir $workdir or my_die("failed to create working directory $workdir for request id $req_id", $req_id,
+        $PS_EXIT_CONFIG_ERROR);
+}
+
+if ($redirect_output) {
+    my $logDest = "$workdir/psparse.$req_id.log";
+    $ipprc->redirect_output($logDest);
+}
+
+my $defaultDSProduct = metadataLookupStr($ipprc->{_siteConfig}, 'PSTAMP_DATA_STORE_PRODUCT');
+exit ($PS_EXIT_CONFIG_ERROR) unless defined $defaultDSProduct;
+    
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
@@ -113 +115 @@
         run(command => $command, verbose => $verbose);
     unless ($success) {
-        die("Unable to perform $command error code: $error_code");
+        my_die("Unable to perform $command error code: $error_code", $req_id, $error_code >> 8);
     }
 } elsif ($uri ne $new_uri) {
     # put a link to the file into the workdir
     if (-e $new_uri) {
-        unlink $new_uri or die "failed to unlink $new_uri";
-    }
-    if (! symlink $uri, $new_uri) {
-        die ("failed to link request file $uri to workdir $workdir");
+        unlink $new_uri or my_die("failed to unlink $new_uri", $req_id, $PS_EXIT_UNKNOWN_ERROR);
+    }
+    if (! copy $uri, $new_uri) {
+        my_die ("failed to copy request file $uri to workdir $workdir", $req_id, $PS_EXIT_UNKNOWN_ERROR);
     }
 }
 $uri = $new_uri;
 
-die "request file $uri not found" if ! -e $uri;
+my_die("request file $uri not found", $req_id, $PS_EXIT_UNKNOWN_ERROR) if ! -e $uri;
 
 #  if product was not defined (in database), use the default
@@ -146 +148 @@
         if ($request_type eq "PS1_PS_REQUEST") {
             $reqType = 'pstamp';
-            $parse_cmd = $pstampparse;
+            $parse_cmd = "$pstampparse";
+            $parse_cmd .= " --label $label" if $label;
         } elsif ($request_type eq "MOPS_DETECTABILITY_QUERY") {
             $reqType = 'dquery';
@@ -193 +196 @@
     # get rid of any error file from previous attempt to parse this request
     unlink $error_file_name if (-e $error_file_name);
+
+    # Run the parser
 
     my $command = "$parse_cmd";
@@ -255 +260 @@
     }
 }
+
+sub my_die {
+    my $msg = shift;
+    my $req_id = shift;
+    my $fault = shift;
+
+    carp($msg);
+
+    my $command = "$pstamptool -updatereq -req_id $req_id  -fault $fault";
+    $command   .= " -dbname $dbname" if $dbname;
+    $command   .= " -dbserver $dbserver" if $dbserver;
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => $verbose);
+    unless ($success) {
+        die("Unable to perform $command error code: $error_code");
+    }
+    exit $fault;
+}