Changeset 25027 for branches/pap/pstamp/scripts/pstamp_parser_run.pl

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

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

branches/pap/pstamp/scripts/pstamp_parser_run.pl

@@ -13 +13 @@
 use Getopt::Long qw( GetOptions );
 use File::Basename qw( basename dirname);
+use POSIX qw( strftime );
 
 my $req_id;
@@ -20 +21 @@
 my $verbose;
 my $dbname;
+my $dbserver;
 
 GetOptions(
@@ -28 +30 @@
     'verbose'           =>  \$verbose,
     'dbname=s'          =>  \$dbname,
+    'dbserver=s'         =>  \$dbserver,
 );
 
@@ -68 +71 @@
 exit ($PS_EXIT_CONFIG_ERROR) unless defined $pstamp_workdir; # lookup failure outputs a message
 
-# workdir is where we download request files to and place any error output from the parser
+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 $workdir = "$pstamp_workdir/$req_id";
-
+my $datestr = strftime "%Y%m%d", gmtime;
+my $datedir = "$pstamp_workdir/$datestr";
+if (! -e $datedir ) {
+    mkdir $datedir or die "failed to create working directory $datedir for request id $req_id";
+}
+
+my $workdir = "$datedir/$req_id";
 if (! -e $workdir ) {
     mkdir $workdir or die "failed to create working directory $workdir for request id $req_id";
@@ -167 +179 @@
     $command   .= " -fault $PS_EXIT_DATA_ERROR";
     $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);
@@ -177 +190 @@
 $parse_cmd .= " --mode queue_job --req_id $req_id --product $product --out_dir $workdir --file $uri";
 $parse_cmd .= " --dbname $dbname" if $dbname;
+$parse_cmd .= " --dbserver $dbserver" if $dbserver;
 $parse_cmd .= " --verbose" if $verbose;
 
@@ -218 +232 @@
     $command   .= " -fault $fault" if $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);