Changeset 18587 for trunk/pstamp/scripts/pstamp_finish.pl

Timestamp:

Jul 16, 2008, 3:27:19 PM (18 years ago)

Author:

bills

Message:

Changes to get detectability query processing working with the new
request processing scheme and tables

File:

• trunk/pstamp/scripts/pstamp_finish.pl (modified) (7 diffs)

trunk/pstamp/scripts/pstamp_finish.pl

@@ -31 +31 @@
 
 
-my ( $dbname, $limit, $verbose, $save_temps );
+my ( $req_id, $req_name, $product, $dbname, $verbose, $save_temps );
 
 # the char to the right of the bar may be used as a single - alias for the longer name
 # for example --input and -i are equivalent
 GetOptions(
-           'limit=s'    => \$limit,
+           'req_id=s'   => \$req_id,
+           'req_name=s' => \$req_name,
+           'product=s'  => \$product,
            'dbname=s'   => \$dbname,
-           'verbose'  => \$verbose,
+           'verbose'    => \$verbose,
            'save-temps' => \$save_temps,
 ) or pod2usage( 2 );
@@ -62 +64 @@
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
-my @requests;
 {
-    my $command = "$pstamptool -completedreq";
-    $command   .= " -limit $limit" if $limit;
-    $command   .= " -dbname $dbname" if $dbname;
-    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");
-    }
-    my $output = join "", @$stdout_buf;
-    if (!$output) {
-        if ($verbose) {
-            print STDERR "no completed requests pending\n"
-        }
-        exit 0;
-    }
-    my $metadata = $mdcParser->parse($output) or die("Unable to parse metdata config doc");
-
-    my $requests = parse_md_list($metadata);
-
-    @requests = @$requests
-}
-
-foreach my $req (@requests) {
-    my $req_id = $req->{req_id};
-
-    my $product = $req->{outProduct};
-    die "outProduct in request is null" if !$product;
-
-    my $req_name = $req->{name};
-    die "request name is null" if !$req_name;
-
-
     # set the output fileset's name to the request name.
     my $fileset = $req_name;
@@ -156 +125 @@
             # including those that produced no jobs.
             # for now add an entry for rownum 1 and a phony error code.
-            #
-            # possible fix: have pstampparse add a dummy job with state=stop and a fault code
             # we've included parse_results.txt to the fileset if it exists
             #
@@ -169 +136 @@
             my $jobs = parse_md_list($metadata);
 
-            @jobs = @$jobs
+            @jobs = @$jobs;
         }
     }
@@ -201 +168 @@
             }
         } else {
-            die "Unknown jobType: $job_type";
+            print STDERR "Unknown jobType: $job_type";
+            next;
         }
     }
@@ -235 +203 @@
     # set the request's state to stop
     {
-        
         my $command = "$pstamptool -processedreq -req_id $req_id -state stop -fault $request_fault";
         $command   .= " -dbname $dbname" if $dbname;
@@ -245 +212 @@
     }
 }
+sub stop_request {
+    my $req_id = shift;
+    my $fault  = shift;
+    my $dbname = shift;
+
+    my $command = "$pstamptool -processedreq -req_id $req_id -state stop -fault $fault";
+    $command   .= " -dbname $dbname" if $dbname;
+
+    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");
+    }
+}