Changeset 27578

Timestamp:

Apr 2, 2010, 10:03:50 AM (16 years ago)

Author:

bills

Message:

update the stub detectability query scripts to be compatible with the existing
request server workflow.

Location:

trunk/pstamp/scripts

Files:

• dquery_finish.pl (modified) (6 diffs)
• dqueryparse.pl (modified) (3 diffs)

trunk/pstamp/scripts/dquery_finish.pl

@@ -20 +20 @@
 use PS::IPP::Config qw( :standard );
 
-my ( $req_id, $req_name, $req_file, $product, $dbname, $dbserver, $verbose, $save_temps );
+my ( $req_id, $req_name, $req_file, $product, $out_dir, $dbname, $dbserver, $verbose, $save_temps );
 
 GetOptions(
            'req_id=s'   => \$req_id,
+           'req_name=s' => \$req_name,
            'req_file=s' => \$req_file,
-           'req_name=s' => \$req_name,
            'product=s'  => \$product,
+           'out_dir=s'  => \$out_dir,
            'dbname=s'   => \$dbname,
            'dbserver=s' => \$dbserver,
@@ -40 +41 @@
 $err .= "--req_name is required\n" if !$req_name;
 $err .= "--product is required\n" if !$product;
+$err .= "--out_dir is required\n" if !$out_dir;
 
 die "$err" if $err;
@@ -67 +69 @@
     exit 0;
 }
+if (0) {
 my $prod_dir = "$outputDataStoreRoot/$product";
 if (! -e $prod_dir ) {
@@ -74 +77 @@
 }
 my $out_dir = "$prod_dir/$req_name";
+}
 if (! -e $out_dir ) {
     # something must have gone wrong at the parse stage
@@ -113 +117 @@
 }
 
+# XXX: have the jobs produce the reglist as with postage stamp requests
 my ($REGLIST, $reg_list) = tempfile("$out_dir/reqlist.XXXX", UNLINK => !$save_temps);
 foreach my $job (@jobs) {
@@ -131 +136 @@
 if (-s $reg_list) {
     my $command = "$dsreg --add $req_name --product $product --list $reg_list";
+    $command .= " --copy --datapath $out_dir";
     $command .= " --type MOPS_DETECTABILITY_RESPONSE";
     $command .= " --dbname $dbname" if $dbname;

trunk/pstamp/scripts/dqueryparse.pl

@@ -73 +73 @@
 
 if (!$dbserver) {
-    my $ipprc = = PS::IPP::Config->new();
+    my $ipprc = PS::IPP::Config->new();
     $dbserver =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBSERVER');
 }
@@ -99 +99 @@
 die "$req_file is version $extver expecting 1" if $extver ne 1;
 
+if (0) {
 $out_dir .= "/$req_name";
+}
 if (! -e $out_dir ) {
     mkdir $out_dir or die "cannot create output directory $out_dir";
@@ -133 +135 @@
 my $result;
 {
-    my $command = "$pstamptool -addjob -req_id $req_id -uri $req_file -outputBase $out_dir";
+    my $command = "$pstamptool -addjob -req_id $req_id -outputBase $out_dir"; 
     $command .= " -job_type detect_query -state stop -fault $fault";
-    $command .= " -rownum 0";
+    $command .= " -rownum 1";
     $command .= " -dbname $dbname" if $dbname;
     $command .= " -dbserver $dbserver" if $dbserver;