Changeset 16109

Timestamp:

2008-06-23T17:11:02+12:00 (15 years ago)

Author:

ak19

Message:

Avoids use of dummy first Part in Multipart POST message by going back to testing ENV{QUERY_STRING} for containing upload-collection-file command, but this time we read only if this test has failed.

File:

• greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm (modified) (2 diffs)

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

@@ -10 +10 @@
 use Cwd;
 
-@gsdlCGI::ISA = ( 'CGI' ); #@gsdlCGI::ISA = qw( CGI );
-#@ISA = ('CGI'); # syntax error of some kind when using strict
+@gsdlCGI::ISA = ( 'CGI' ); 
 
 sub new {
     my $class = shift @_;
-
+    
     my $self;
    
@@ -30 +29 @@
 
     if ((defined $ENV{'REQUEST_METHOD'}) && ($ENV{'REQUEST_METHOD'} eq "POST")) {
-    my $line = <STDIN>;
-    # 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/)) { #&& ($line =~ /download/)) {
-        $self = new CGI($line);
-    }
+
+    # Check if we're dealing with the upload-coll-file cmd. Because it will be a 
+    # multipart POST message and must be dealt with by the default CGI() constructor
+    if((defined $ENV{'QUERY_STRING'}) && ($ENV{'QUERY_STRING'} =~ /upload-collection-file/)) {
+        $self = new CGI(); 
+    } 
+
+    else { # all other POST commands processed using CGI($line)
+        my $line = <STDIN>;
+        if ((defined $line) && ($line ne "")) { 
+        $self = new CGI($line);
+        }
+    }
+    
     }    
-
-    # If one of the conditions above did not hold, then self=new CGI. 
-    # This includes multipart post boundaries as are sent for cmd=upload-collection-file,
-    # which should also be processed by the zero-argument CGI constructor.
+    
+    # If one of the conditions above did not hold, then self=new CGI() 
     if (!defined $self) { 
     $self = new CGI();