Changeset 23196 for main/trunk/greenstone2/cgi-bin/gsdlCGI.pm

Timestamp:

2010-10-21T17:56:01+13:00 (14 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed the recent problem to do with how the CGI object was being instantiated, based on whether it was a GET or POST and what type of POST message it was.

File:

• main/trunk/greenstone2/cgi-bin/gsdlCGI.pm (modified) (2 diffs)

main/trunk/greenstone2/cgi-bin/gsdlCGI.pm

@@ -45 +45 @@
     my $class = shift @_;
     
-#    my $self;
+    my $self;
    
     # We'll determine the correct config file in this constructor itself 
@@ -58 +58 @@
     }
 
-#    if ((defined $ENV{'REQUEST_METHOD'}) && ($ENV{'REQUEST_METHOD'} eq "POST")) {
-#
-#   # 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'} =~ m/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() 
-#    if (!defined $self) { 
-#   $self = new CGI();
-#    }
-
-    my $self = new CGI(@_);
+    # POST that is URL-encoded (like a GET) is a line that needs to be read from STDIN
+    if ((defined $ENV{'CONTENT_TYPE'}) && ($ENV{'CONTENT_TYPE'} =~ m/form-urlencoded/)) {
+    my $line = <STDIN>;
+    if ((defined $line) && ($line ne "")) { 
+        $self = new CGI($line);
+    }
+    }
+    
+    # If the conditions above did not hold, then self=new CGI(@_) 
+    if (!defined $self) { 
+    # It's a GET, or else a POST with Multi-part body
+    $self = new CGI(@_);
+    }
+
 
     if ($version == 2) {