Changeset 18247

Timestamp:

Jun 20, 2008, 3:08:02 PM (18 years ago)

Author:

bills

Message:

more tweaks.

Location:

trunk/pstamp

Files:

• scripts/pstamp_listjobs.pl (modified) (4 diffs)
• scripts/pstamp_queue_requests.pl (modified) (1 diff)
• scripts/pstamp_webrequest.pl (modified) (2 diffs)
• src/pstampfinish.c (modified) (3 diffs)
• src/pstampparse.c (modified) (2 diffs)
• web/request.php (modified) (6 diffs)

trunk/pstamp/scripts/pstamp_listjobs.pl

@@ -8 +8 @@
 use warnings;
 use strict;
+use Getopt::Long qw( GetOptions );
+
+my $verbose;
+my $dbname;
+
+GetOptions(
+    'verbose'   =>  \$verbose,
+    'dbname=s'  =>  \$dbname,
+);
 
 if (@ARGV != 1) {
@@ -15 +24 @@
 my $request_id = $ARGV[0];
 
-my $verbosity = 0;
 
 use Sys::Hostname;
@@ -21 +29 @@
 
 ## This isn't a script to be launched by pantasks we probably want go get rid of this
-if ($verbosity) {
+if ($verbose) {
     print STDERR "\n\n";
     print STDERR "Starting script $0 on $host\n\n";
@@ -59 +67 @@
 {
     my $command = "$pstamptool -listjob -req_id $request_id";
+    $command .= " -dbname $dbname" if $dbname;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbosity);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
         die("Unable to perform pstamptool -pendingreq: $error_code");

trunk/pstamp/scripts/pstamp_queue_requests.pl

@@ -17 +17 @@
 my $verbose;
 my $dbname;
+my $limit;
 
 GetOptions(
     'verbose'       =>  \$verbose,
     'dbname=s'      =>  \$dbname,
+    'limit=s'       =>  \$limit,
 );
 

trunk/pstamp/scripts/pstamp_webrequest.pl

@@ -68 +68 @@
 # if -list is used, it must be the first argument
 my $listMode;
-if ($ARGV[0] eq "-list" ) {
+if ($ARGV[0] eq "-list_uri" ) {
     $listMode=1;
 } else  {
@@ -92 +92 @@
     ### In list mode just parse the file print the output and we're done
     ###
-    my $command = "$pstampparse $request_file";
+    ### XXX TODO: I shouldn't need this -mode list_uri since it's in the request file
+    my $command = "$pstampparse -mode list_uri $request_file";
     $command .= " -dbname $dbname" if $dbname;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =

trunk/pstamp/src/pstampfinish.c

@@ -26 +26 @@
     psString    dsRoot;
     psString    dsProduct;
+    psString    dbName;
     int         exitStatus;
 } psrfOptions;
@@ -70 +71 @@
         return NULL;
     }
+    psBool status;
+    options->dbName = psMetadataLookupStr(&status, options->config->complete, "DBNAME");
 
     if ((argnum = psArgumentGet(argc, argv, "-mode"))) {
@@ -265 +268 @@
     psString command = NULL;
 
-    psStringAppend(&command, "dsreg --add --type PSRESULTS --product %s --fileset %s", 
-            options->dsProduct, fileset_id);
-
-    printf("command is: %s\n", command);
+    psStringAppend(&command, "dsreg --dbname %s --add --type PSRESULTS --product %s --fileset %s", 
+            options->dbName, options->dsProduct, fileset_id);
+
+    if (options->verbose) {
+        fprintf(stderr, "command is: %s\n", command);
+    }
 
     // open a pipe to dsreg and set up the output fileset

trunk/pstamp/src/pstampparse.c

@@ -64 +64 @@
     }
 
+    // XXX: need to sort out the interactions of this mode option and the JOB_TYPE
+    // listed in the request file.
     if ((argnum = psArgumentGet(argc, argv, "-mode"))) {
         psArgumentRemove(argnum, &argc, argv);
@@ -629 +631 @@
         psStringAppend(&cmd, " -args '%s'", commandArgs);
     }
+    // XXX We may want to have the data store name be different than the default DB
+    psBool status;
+    psString dbName = psMetadataLookupStr(&status, options->config->complete, "DBNAME");
+    fprintf(stderr, "\n\n   dbName is %s\n", dbName);
+    if (dbName) {
+        psStringAppend(&cmd, " -dbname %s", dbName);
+    }
+
     psStringAppend(&cmd, " > /dev/null");
 

trunk/pstamp/web/request.php

@@ -1 +1 @@
 <?php 
 
+// prototype postage stamp server web interface
+
 // A php program that generates a postage stamp request form
 
-// There are two modes on the form List Images simply lists the input images that match
-// the image selection critera
+// There are two modes on the form List Images simply lists the input images
+// that match the image selection critera
 
 // When make stamps is selected when the page is posted, a postage stamp request is queued.
@@ -12 +14 @@
 // The mode for the page is given by $request_id != 0
 
-$COMMAND_DIR = "/export/data0/bills/src/ipp/pstamp/scripts";
+// XXX This is just a prototype for testing purposes. 
+
+
+// BEGIN Local configuration
+
+$COMMAND_DIR = "/export/data0/bills/psconfig/debug.linrh64/bin";
 $dsroot = "/export/data1/datastore/dsroot";
+$dbname = "simtest";
+
+// END Local configuration 
+//      (actually there is a little bit more in $COMMAND_DIR/pstamp_runcommand.sh )
 
 // Initialize variables
@@ -213 +224 @@
     global $rvar_id, $rvar_class_id;
     global $command_line;
-
+    global $dbname;
+
+    $making_stamps = 1;
     $cmd = "pstamp_runcommand.sh pstamp_webrequest.pl";
 
-    $making_stamps = 1;
+    // NOTE: If it is used, -list_uri must be the first argument to pstamp_webrequest.pl 
     
     if ($list_checked) {
-        $cmd .= " -list";
+        $cmd .= " -list_uri";
         $making_stamps = 0;
     } else if ($get_checked) {
         $making_stamps = 0;
         $cmd .= " -get_image";
+    }
+
+    if ($dbname) {
+        $cmd .= " --dbname $dbname";
     }
 
@@ -291 +308 @@
 
     if (($rvar_img_type == "raw") || ($rvar_img_type == "chip")) {
-        if (! $rvar_class_id ) {
-            throw new Exception("must specify Class ID with Image Type $rvar_img_type.");
-        }
-        if ($rvar_class_id = "all") {
+#        if (! $rvar_class_id ) {
+#            throw new Exception("must specify Class ID with Image Type $rvar_img_type.");
+#        }
+        if ((!$rvar_class_id) || ($rvar_class_id = "all")) {
             $cmd .= " null";
         } else {
@@ -402 +419 @@
 
     $command_line = "pstamp_runcommand.sh pstamp_listjobs.pl $request_id";
+    global $dbname;
+    if ($dbname) {
+        $command_line .= " --dbname $dbname";
+    }
+
     run_command($command_line);
     if ($jobFinished) {
@@ -429 +451 @@
     global $output_array;
     global $outFileset;
+    global $dbname;
 
     $command_line = "pstamp_runcommand.sh pstamptool -listreq -req_id $request_id -simple";
+    if ($dbname) {
+        $command_line .= " -dbname $dbname";
+    }
     run_command($command_line);
     if ($command_status == 0) {