Changeset 2426 for trunk/gsdl/src/recpt/cgiutils.cpp

Timestamp:

2001-05-16T15:38:12+12:00 (23 years ago)

Author:

sjboddie

Message:

added an ugly hack to prevent problems when multiple value arguments
contain commas - this should be fixed properly some day but for now
it'll do the trick

File:

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

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -109 +109 @@
     // store this key=value pair
     if (!key.empty()) {
-      // if arg occurs multiple times (as is the case with
-      // multiple checkboxes using the same name) we'll 
-      // create a comma separated list of all the values
-      // (we should probably use some kind of array here to 
-      // avoid problems when values already contain commas)
+
+      // if arg occurs multiple times (as is the case with multiple
+      // checkboxes using the same name) we'll create a comma separated
+      // list of all the values (this uses a hack that encodes naturally
+      // occurring commas as %2C - values will therefore need to be decoded
+      // 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 += value;
+    newvalue += encode_commas(value);
     args.setarg (key, newvalue, cgiarg_t::cgi_arg);
 
@@ -126 +127 @@
     }
   }
+}
+
+text_t encode_commas (const text_t &intext) {
+
+  text_t outtext;
+
+  text_t::const_iterator here = intext.begin ();
+  text_t::const_iterator end = intext.end ();
+
+  while (here != end) {
+    if (*here == ',') outtext += "%2C";
+    else outtext.push_back (*here);
+    here ++;
+  }
+  return outtext;
+}
+
+text_t decode_commas (const text_t &intext) {
+
+  text_t outtext;
+  
+  text_t::const_iterator here = intext.begin ();
+  text_t::const_iterator end = intext.end ();
+  
+  while (here != end) {
+    if ((here+2<end) && *here == '%' && *(here+1) == '2' &&
+    (*(here+2) == 'C' || *(here+2) == 'c')) {
+      here += 2;
+      outtext.push_back(',');
+      
+    }else outtext.push_back (*here);
+    here ++;
+  }
+  return outtext;
 }