Changeset 12509

Timestamp:

2006-08-24T10:53:47+12:00 (18 years ago)

Author:

kjdon

Message:

Added Stefan's fileupload code to replace use of cgicc by depositor. action.getargsinfo changed, parse_cgi_args now has a fileuploads argument

Location:

trunk/gsdl/src/recpt

Files:

• receptionist.cpp (modified) (3 diffs)
• receptionist.h (modified) (1 diff)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -187 +187 @@
   
   // add the cgi arguments from this action
-  argsinfo.addarginfo (NULL, theaction->getargsinfo());
+  argsinfo.addarginfo (NULL, *(theaction->getargsinfo()));
 }
 
@@ -546 +546 @@
 // This function should be called for each page request. It returns false
 // if there was a major problem with the cgi arguments.
-bool receptionist::parse_cgi_args (const text_t &argstr, cgiargsclass &args, 
+bool receptionist::parse_cgi_args (const text_t &argstr, 
+                   fileupload_tmap &fileuploads, 
+                   cgiargsclass &args, 
                    ostream &logout, text_tmap &fcgienv) {
 
@@ -558 +560 @@
   // add the defaults
   add_default_args (argsinfo, args, logout);
+
+  // add any file upload arguments
+  add_fileupload_args(argsinfo, args, fileuploads, logout);
 
   // get the cookie

trunk/gsdl/src/recpt/receptionist.h

@@ -220 +220 @@
   // This function should be called for each page request. It returns false
   // if there was a major problem with the cgi arguments.
-  virtual bool parse_cgi_args (const text_t &argstr, cgiargsclass &args, 
+  virtual bool parse_cgi_args (const text_t &argstr, 
+                   fileupload_tmap &fileuploads,
+                   cgiargsclass &args, 
                    ostream &logout, text_tmap &fcgienv);