Index: trunk/pstamp/scripts/pstamp_listjobs.pl
===================================================================
--- trunk/pstamp/scripts/pstamp_listjobs.pl	(revision 18243)
+++ trunk/pstamp/scripts/pstamp_listjobs.pl	(revision 18247)
@@ -8,4 +8,13 @@
 use warnings;
 use strict;
+use Getopt::Long qw( GetOptions );
+
+my $verbose;
+my $dbname;
+
+GetOptions(
+    'verbose'   =>  \$verbose,
+    'dbname=s'  =>  \$dbname,
+);
 
 if (@ARGV != 1) {
@@ -15,5 +24,4 @@
 my $request_id = $ARGV[0];
 
-my $verbosity = 0;
 
 use Sys::Hostname;
@@ -21,5 +29,5 @@
 
 ## 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,6 +67,7 @@
 {
     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");
Index: trunk/pstamp/scripts/pstamp_queue_requests.pl
===================================================================
--- trunk/pstamp/scripts/pstamp_queue_requests.pl	(revision 18243)
+++ trunk/pstamp/scripts/pstamp_queue_requests.pl	(revision 18247)
@@ -17,8 +17,10 @@
 my $verbose;
 my $dbname;
+my $limit;
 
 GetOptions(
     'verbose'       =>  \$verbose,
     'dbname=s'      =>  \$dbname,
+    'limit=s'       =>  \$limit,
 );
 
Index: trunk/pstamp/scripts/pstamp_webrequest.pl
===================================================================
--- trunk/pstamp/scripts/pstamp_webrequest.pl	(revision 18243)
+++ trunk/pstamp/scripts/pstamp_webrequest.pl	(revision 18247)
@@ -68,5 +68,5 @@
 # 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,5 +92,6 @@
     ### 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 ) =