Changeset 12562 for trunk/gsdl

Timestamp:

2006-08-25T14:16:48+12:00 (18 years ago)

Author:

kjdon

Message:

reverted back to the previous version because it really was needed. Because we need to have dynamically named arguments multivalued, we will always assume multiplevalue = true if there is no argsinfo - remember to decode your commas whenyou get the values back

File:

• trunk/gsdl/src/recpt/cgiutils.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -338 +338 @@
       // again before use) - it should use an array instead
       const cgiarginfo *info = argsinfo.getarginfo (key);
-      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);
+      if (info==NULL) {
+    // If info is NULL, we can't tell if the arg is multiple value or not
+    // Because we need to have dynamically named arguments multivalued, we
+    // will always assume multiplevalue = true
+    // If the arg is not multi valued, then you need to decode the commas.
+    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);
+    }
       }
     }