Changeset 12514

Timestamp:

2006-08-24T11:16:05+12:00 (18 years ago)

Author:

kjdon

Message:

Added Stefan's fileupload code to replace use of cgicc by depositor.

File:

• trunk/gsdl/src/recpt/cgiwrapper.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -26 +26 @@
 #include "gsdlconf.h"
 #include "cgiwrapper.h"
-#include "cgiutils.h"
 #include "recptconfig.h"
 #include "fileutil.h"
+#include "cgiutils.h"
 #include <stdlib.h>
 #include <assert.h>
@@ -42 +42 @@
 #  include <fstream>
 #endif
-
-#include "cgicc/Cgicc.h"
-
-using namespace cgicc;
-extern Cgicc* formData;
-
 
 #ifdef USE_FASTCGI
@@ -452 +446 @@
 // should equal "".
 void cgiwrapper (receptionist &recpt, text_t collection) {
-  
   int numrequests = 0;
   bool debug = false;
@@ -468 +461 @@
 #endif
 
-  // get the query string if it is not being run as a fastcgi
-  // script
-  text_t argstr = g_EmptyText;
-  cgiargsclass args;
-  char *aURIStr;
-  if (!isfastcgi) {
-    
-    // Iterate through the vector, and synthesis argstr
-    bool first = true;
-
-    for(const_form_iterator iter = formData->getElements().begin();
-    iter != formData->getElements().end();
-    ++iter) {
-      
-      const char* name_cstr = iter->getName().c_str();
-      const char* value_cstr = iter->getValue().c_str();
-      // the args have been decoded and as we are building up the argument
-      // string again, we need to re encode them
-      text_t value_textt = cgi_safe(value_cstr);
-      const char * safe_value_cstr = value_textt.getcstr();
-      if (first) {
-    argstr = name_cstr;
-    argstr.append("=");
-    argstr.append(safe_value_cstr);
-    first = false;
-      }
-      else {
-    argstr.append("&");
-    argstr.append(name_cstr);
-    argstr.append("=");
-    argstr.append(safe_value_cstr);
-      }
-      delete [] safe_value_cstr;
-    }   
-  }
-  
-  if (debug) {
-    cout << "Configuring Greenstone...\n";
-    cout << flush;
-  }
-
+  // we need gsdlhome to do fileupload stuff, so moved this configure stuff before the get argstr stuff
   // init stuff - we can't output error pages directly with
   // fastcgi so the pages are stored until we can output them
@@ -540 +493 @@
     page_errorcollect (gsdlhome, errorpage, debug);
   }
+  // get the query string if it is not being run as a fastcgi
+  // script
+  text_t argstr = g_EmptyText;
+  fileupload_tmap fileuploads;
+  cgiargsclass args;
+  char *aURIStr;
+  if (!isfastcgi) {
+    char *request_method_str = getenv("REQUEST_METHOD");
+    char *content_length_str = getenv("CONTENT_LENGTH");
+    if (request_method_str != NULL && strcmp(request_method_str, "POST") == 0 &&
+    content_length_str != NULL)  {
+      // POST form data
+      long content_length = (content_length_str ? atoi(content_length_str) : 0);
+      if (content_length > 0) {
+    long length = content_length;
+    unsigned char * buffer = new unsigned char[content_length];
+    char c;
+    int i=0;
+    do {
+      cin.get(c);
+      if (cin.eof()) break;
+      buffer[i] = c;
+      ++i;
+      --length;
+    } while (length > 0);
+    
+    argstr.setcarr((char *)buffer, content_length);     
+    text_t content_type;
+    char *content_type_str = getenv("CONTENT_TYPE");
+    if (content_type_str) content_type = content_type_str;
+    argstr = parse_post_data(content_type, argstr, fileuploads, gsdlhome);
+      }
+    } else {
+      aURIStr = getenv("QUERY_STRING");
+      if ((request_method_str != NULL && strcmp(request_method_str, "GET") == 0)
+      || aURIStr != NULL) {
+    // GET form data
+    if (aURIStr != NULL) argstr = aURIStr;
+      } else {
+    // debugging from command line
+    debug = true;
+      }
+    }
+  }
+
+  if (debug) {
+    cout << "Configuring Greenstone...\n";
+    cout << flush;
+  }
+
 
   if (errorpage.empty()) {
@@ -672 +675 @@
       // parse the cgi arguments and produce the resulting page if there
       // has been no errors so far
-      if (!recpt.parse_cgi_args (argstr, args, errout, fastcgienv)) {
+      if (!recpt.parse_cgi_args (argstr, fileuploads, args, errout, fastcgienv)) {
     errout.close ();
     page_errorparseargs(gsdlhome, debug, errorpage);
@@ -691 +694 @@
 #endif
     }
-
+    // clean up any files that were uploaded 
+    fileupload_tmap::const_iterator this_file = fileuploads.begin();
+    fileupload_tmap::const_iterator end_file = fileuploads.end();
+    while (this_file != end_file)
+      {
+    if (file_exists((*this_file).second.tmp_name)) 
+      {
+        char *thefile = (*this_file).second.tmp_name.getcstr();
+        unlink(thefile);
+        delete [] thefile;
+      }
+    ++this_file;
+      }
+    
     // there was an error, output the error page
     if (!errorpage.empty()) {