Changeset 29515 for branches/eam_branches/ipp-20100823/pstamp/scripts/pstamp_webrequest.pl

Timestamp:

Oct 21, 2010, 2:45:13 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100823/pstamp/scripts/pstamp_webrequest.pl (modified) (3 diffs)

branches/eam_branches/ipp-20100823/pstamp/scripts/pstamp_webrequest.pl

@@ -26 +26 @@
 my $dbname;
 my $dbserver;
-my $project;
-my $job_type;
 
 GetOptions(
-    'job_type=s'    =>  \$job_type,
     'dbname=s'      =>  \$dbname,
     'dbserver=s'    =>  \$dbserver,
-    'project=s'     => \$project,
     'verbose'       => \$verbose,
 );
@@ -42 +38 @@
     print "\n\n";
     print "Starting script $0 on $host\n\n";
-}
-
-my $listMode;
-if ($job_type and ($job_type eq 'list_uri')) {
-    $listMode=1;
-} else  {
-    $listMode=0;
 }
 
@@ -105 +94 @@
 }
 
-# ok at this point we have a request file add it to the database (unless we're in listMode)
-if ($listMode == 1 ) {
-    ###
-    ### In list mode just parse the file print the output and we're done
-    ###
-    my $command = "$pstampparse --mode list_uri --file $request_file";
-    $command .= " --dbname $dbname" if $dbname;
-    $command .= " --dbserver $dbserver" if $dbserver;
-    $command .= " --verbose" if $verbose;
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-
-    if ($success) {
-        ### print "Matching Images:\n";
-        print @$stdout_buf;
-        exit 0;
-    } else {
-        # we send the output to STDOUT because that's where PHP finds it
-        print @$stdout_buf;
-        print @$stderr_buf;
-        exit 1;
-    }
-}
-
 # Queue the request
 my $req_id = 0;