Changeset 16100 for greenstone3

Timestamp:

2008-06-20T19:30:30+12:00 (16 years ago)

Author:

ak19

Message:

1. Constructor test for upload-collection-file has changed (so that it can call the super class CGI() constructor to process the Multipart post data). For distinguishing the cases where cmd=upload-collection-file, it now no longer tests the line var read from STDIN, as that will only end up reading in the Multipart post data's Boundary string anyway which therefore won't ever match the expected cmd string upload-collection-file. Instead, it now tests for the upload-coll-file case by checking for the start of the Boundary string (--) instead. As the client GLI's RemoteGreenstoneServer.java file has been updated to insert a dummy first Part in the Multipart POST data for the upload-coll-file command, the server side is now able to read the command, all its cgi-args, as well as the file successfully. 2. This perl module now uses package strict which required some minor changes.

File:

• greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI4gs3.pm (modified) (3 diffs)

greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI4gs3.pm

@@ -1 +1 @@
 
 package gsdlCGI4gs3;
+
+use strict;
+no strict 'subs';
+no strict 'refs'; # allow filehandles to be variables and viceversa
 
 use CGI;
 use Cwd;
 
-@ISA = ('CGI');
+@gsdlCGI4gs3::ISA = ('CGI');
 
 sub new {
     my $class = shift @_;
+
 
     my $self;
     if ((defined $ENV{'REQUEST_METHOD'}) && ($ENV{'REQUEST_METHOD'} eq "POST")) {
     my $line = <STDIN>;
-    if ((defined $line) && ($line ne "") && ($line !~ /upload-collection-file/)) {
-        $self = new CGI($line); 
+    # Multipart POST requests' boundaries created by Java's POST method on the client-GLI side 
+    # start with --. If there are other kinds of languages and boundaries we will be dealing
+    # with, we can list those patterns alongside here in the (), separated by |:
+    my $multipartPostBoundary = q/^(--)/; 
+
+    # cmd=upload-collection-file is not read into $line from STDIN, only the boundary (a 
+    # sequence of chars preceeded by --) is encountered. Either we can match on POST requests 
+    # whose cmds contain "download" OR we can look for $line NOT being boundary, to process $line.
+    # Multipart POST messages are processed by the zero-argument CGI constructor.
+    if ((defined $line) && ($line ne "") && ($line !~ /$multipartPostBoundary/)) { 
+        $self = new CGI($line);
     }
     else {
         $self = new CGI();
     }
-    }
+    }    
     else {
     $self = new CGI();
@@ -55 +69 @@
     my $val = $self->SUPER::param($param);
     $val =~ s/[\r\n]+$// if (defined $val);
-
+    
     return $val;
 }
@@ -304 +318 @@
 
     my $prefix_dir = getcwd(); 
-
+    my $full_dir = &util::filename_cat($prefix_dir,$local_dir);
     if ($prefix_dir !~ m/collect/) {
     $self->generate_error("Trying to delete outside of Greenstone collect: $full_dir");
     }
-
-    my $full_dir = &util::filename_cat($prefix_dir,$local_dir);
 
     # Delete recursively