Changeset 12555

Timestamp:

2006-08-25T11:35:14+12:00 (18 years ago)

Author:

kjdon

Message:

reverted split_cgi_args back to 1.25 version, pre davids depositor work. The depositor seems to work still, and the newer version was stuffing up other things. So hopefully it wasn't essential

File:

• trunk/gsdl/src/recpt/cgiutils.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -318 +318 @@
   text_t::const_iterator end = argstr.end();
   text_t key, value;
-
-  text_tset multivalue;
-
  
   // extract out the key=value pairs
@@ -341 +338 @@
       // again before use) - it should use an array instead
       const cgiarginfo *info = argsinfo.getarginfo (key);
-
-      if (info==NULL) {
-    if (args.getarg(key)==NULL) {
-      args.setarg (key, encode_commas(value), cgiarg_t::cgi_arg);
-    }
-    else {
-      text_t newvalue = args[key];
-
-      newvalue += "," + encode_commas(value);
-      args.setarg (key, newvalue, cgiarg_t::cgi_arg);
-    }
-      }
-      else {
-    if (info->multiplevalue) {
-
-      text_t newvalue = args[key];
-      if (args.lookupcgiarg(key).source == cgiarg_t::cgi_arg) newvalue += ",";
-      newvalue += encode_commas(value);
-      args.setarg (key, newvalue, cgiarg_t::cgi_arg);
-
-    } else {
-      args.setarg (key, value, cgiarg_t::cgi_arg);
-    }
+      if (info != NULL && info->multiplevalue) {
+    text_t newvalue = args[key];
+    if (args.lookupcgiarg(key).source == cgiarg_t::cgi_arg) newvalue += ",";
+    newvalue += encode_commas(value);
+    args.setarg (key, newvalue, cgiarg_t::cgi_arg);
+
+      } else {
+    args.setarg (key, value, cgiarg_t::cgi_arg);
       }
     }