Changeset 12512 for trunk/gsdl/src/recpt/cgiargs.h

Timestamp:

2006-08-24T11:06:42+12:00 (18 years ago)

Author:

kjdon

Message:

Added Stefan's fileupload code to replace use of cgicc by depositor. Changed the signature of some methods; added fileupload_t; cgiargsclass now has fileupload_t variable; cgiargsinfoclass now has 'bool fileupload' variable; added some more debug print methods; in addarginfo, if logout is null I write the error message to stderr

File:

• trunk/gsdl/src/recpt/cgiargs.h (modified) (6 diffs)

trunk/gsdl/src/recpt/cgiargs.h

@@ -53 +53 @@
 enum response_t {location, content, fullcontent, undecided_location};
 
+struct fileupload_t {
+  void clear();
+  fileupload_t() {clear();}
+  
+  text_t name;
+  text_t type;
+  int size;
+  text_t tmp_name;
+};
+
+typedef map<text_t, fileupload_t, lttext_t> fileupload_tmap;
 
 struct cgiarg_t {
@@ -63 +74 @@
   text_t value;
   source_t source;
-};
+  fileupload_t fileupload;
+};
+
+ostream &operator<<(ostream &outs, const fileupload_t &fu);
 
 bool operator==(const cgiarg_t &x, const cgiarg_t &y);
@@ -126 +140 @@
   void setdefaultcarg (const text_t &key, unsigned short c,
                cgiarg_t::source_t source=cgiarg_t::default_arg);
+  void setargfile (const text_t &key, const fileupload_t &fileupload);
   text_t *getarg (const text_t &key);
   int getintarg (const text_t &key);
+  fileupload_t *getargfile (const text_t &key);
   text_t &operator[] (const text_t &key) {return args[key].value;}
   cgiarg_t &lookupcgiarg (const text_t &key) {return args[key];}
@@ -157 +173 @@
   // use the same name)
   bool multiplevalue;
+
+  // fileupload should be set if the argument is to be used to upload files
+  bool fileupload;
 
   // defaultstatus_t indicates how good the default is when different
@@ -224 +243 @@
   // processing with the arguments should be done if this happens
   // as the results will be meaningless.
-  bool addarginfo (ostream *logout, const cgiarginfo &info);
-  bool addarginfo (ostream *logout, const cgiargsinfoclass &info);
+  bool addarginfo (ostream *logout, cgiarginfo &info);
+  bool addarginfo (ostream *logout, cgiargsinfoclass &info);
 
   // addarginfo will override args info with info loaded from config files
   // if the args do not exists will be created
   bool addarginfo (ostream *logout, const text_t& argshortname, const text_tmap& mapinfo);
-  bool addarginfo (ostream *logout, const confcgiarg_tmap& info);
+  bool addarginfo (ostream *logout, confcgiarg_tmap& info);
 
   cgiarginfo *getarginfo (const text_t &key);
@@ -237 +256 @@
 };
 
+ostream &operator<<(ostream &outs, const cgiargsinfoclass &argsinfo);
 
 #endif