Changeset 13463 for trunk

Timestamp:

2006-12-08T12:09:35+13:00 (17 years ago)

Author:

kjdon

Message:

decode_cgi_arg returns utf-8 if the original encoding was utf-8. need to use to_uni on the output in this case. If the encoding isn't utf-8, then 8 bit encodings may be fine but others will be screwed up. Need to fix this properly...

Location:

trunk/gsdl/src/recpt

Files:

• queryaction.cpp (modified) (1 diff)
• receptionist.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -1649 +1649 @@
     // as browsers encode values from forms before sending to server
     // (e.g. %25 becomes %2525)
-    decode_cgi_arg (compressedoptions);
+    decode_cgi_arg (compressedoptions); 
+    if (args["w"] == "utf-8") { // if the encoding was utf-8, then compressed options was utf-8, and we need unicode.
+    // if encoding wasn't utf-8, then compressed opotions may be screwed up, but seems to work for 8 bit encodings?
+      compressedoptions = to_uni(compressedoptions);
+    }
+
     disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions));
       }

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1414 +1414 @@
   // as browsers encode values from forms before sending to server
   // (e.g. %25 becomes %2525)
-  decode_cgi_arg (compressedoptions);
-  disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions));
+  decode_cgi_arg (compressedoptions); 
+  if (args["w"] == "utf-8") { // if the encoding was utf-8, then compressed options was utf-8, and we need unicode.
+    // if encoding wasn't utf-8, then compressed opotions may be screwed up, but seems to work for 8 bit encodings?
+    compressedoptions = to_uni(compressedoptions);
+  }
+  disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions)); 
 
 #if defined (__WIN32__)