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

Timestamp:

Oct 26, 2010, 4:00:42 PM (16 years ago)

Author:

bills

Message:

if file is unreadable or has a bad EXTNAME set fault to invalid request

File:

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

trunk/pstamp/scripts/pstamp_parser_run.pl

@@ -23 +23 @@
 
 use PS::IPP::Config qw( :standard );
+use PS::IPP::PStamp::RequestFile qw( :standard );
 
 my $req_id;
@@ -146 +147 @@
 my $reqType;    # for the database
 
+my $request_fault = $PSTAMP_INVALID_REQUEST;
+
 if (-r $uri) {
     # run the appropriate parse command to parse the queue the jobs for this request
@@ -157 +160 @@
             $parse_cmd = "$pstampparse";
             $parse_cmd .= " --label $label" if $label;
+            $request_fault = 0;
         } elsif ($request_type eq "MOPS_DETECTABILITY_QUERY") {
             $reqType = 'dquery';
             $parse_cmd = "$dqueryparse";
             $parse_cmd .= " --label $label" if $label;
+            $request_fault = 0;
         } else {
             print STDERR "Unknown request type $request_type found in $uri";
@@ -182 +187 @@
     my $command = "$pstamptool -updatereq -req_id $req_id -set_state run";
     $command   .= " -set_reqType unknown";
-    $command   .= " -set_fault $PS_EXIT_DATA_ERROR";
+    $command   .= " -set_fault $request_fault";
     $command   .= " -dbname $dbname" if $dbname;
     $command   .= " -dbserver $dbserver" if $dbserver;
@@ -190 +195 @@
         die("Unable to perform $command error code: $error_code");
     }
-    exit $PS_EXIT_DATA_ERROR;
+    exit $request_fault;
 }