Changeset 2426

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

Location:

trunk/gsdl/src/recpt

Files:

• cgiutils.cpp (modified) (2 diffs)
• cgiutils.h (modified) (1 diff)
• collectoraction.cpp (modified) (8 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;
 }
 

trunk/gsdl/src/recpt/cgiutils.h

@@ -39 +39 @@
 void split_cgi_args (const cgiargsinfoclass &argsinfo, text_t argstr, 
              cgiargsclass &args);
+
+text_t encode_commas (const text_t &intext);
+text_t decode_commas (const text_t &intext);
 
 // turns any '-' in a cgi argument into "(-)"

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -41 +41 @@
 #include "nullproto.h"
 #include "argdb.h"
+#include "cgiutils.h"
 
 #if !defined (__WIN32__)
@@ -856 +857 @@
 
   text_tarray inputvalues;
-  // this relies on filenames/URLs not being able to contain
-  // commas
   splitchar (inputarglist.begin(), inputarglist.end(), ',', inputvalues);
   // remove any empty values from the end of the array
@@ -906 +905 @@
     rv += "<input type=text name=\"bc1input\" value=\"";
     if (i < numvalues) {
-      rv += dm_safe(inputvalues[i]);
+      rv += dm_safe(decode_commas(inputvalues[i]));
     }
     rv += "\" size=50>";
     if (badsources) {
       if ((i < numvalues) && (!inputvalues[i].empty())) {
-    if (failedsources[inputvalues[i]] == "1") {
+    if (failedsources[decode_commas(inputvalues[i])] == "1") {
       rv += "_iconcross_";
     } else {
@@ -1642 +1641 @@
 
   text_tarray inputvalues, inputtypes;
-  // this relies on filenames/URLs not being able to contain commas
   splitchar (args["bc1input"].begin(), args["bc1input"].end(), ',', inputvalues);
   splitchar (args["bc1inputtype"].begin(), args["bc1inputtype"].end(), ',', inputtypes);
@@ -1651 +1649 @@
       text_t type = "file://"; // default
       if (i < numtypes) type = inputtypes[i];
-      options += " -download \"" + type + format_url(inputvalues[i]) + "\"";
+      options += " -download \"" + type + format_url(decode_commas(inputvalues[i])) + "\"";
     }
   }
@@ -1852 +1850 @@
 
   text_tarray inputvalues;
-  // this relies on filenames/URLs not being able to contain
-  // commas
-  char *tmp = args["bc1input"].getcstr();
   splitchar (args["bc1input"].begin(), args["bc1input"].end(), ',', inputvalues);
 
@@ -1864 +1859 @@
 
   for (int i = 0; i < numvalues; i++) {
-    text_t value = format_url(inputvalues[i]);
+    text_t value = format_url(decode_commas(inputvalues[i]));
     text_t type = "file://"; // default
     if (!value.empty()) {
@@ -1875 +1870 @@
       if (type == "file://") {
     if (!file_exists(value) && !directory_exists(value)) {
-      failedsources[inputvalues[i]] = "1";
+      failedsources[decode_commas(inputvalues[i])] = "1";
       badsources = true;
     }
       } else if (type == "http://") {
     if (gsdl_system ("perl -S ping.pl -quiet http://" + value, true, logout)) {
-      failedsources[inputvalues[i]] = "1";
+      failedsources[decode_commas(inputvalues[i])] = "1";
       badsources = true;
     }
       } else if (type == "ftp://") {
     if (gsdl_system ("perl -S ping.pl -quiet ftp://" + value, true, logout)) {
-      failedsources[inputvalues[i]] = "1";
+      failedsources[decode_commas(inputvalues[i])] = "1";
       badsources = true;
     }