Changeset 30373

Timestamp:

2016-02-10T14:53:51+13:00 (8 years ago)

Author:

kjdon

Message:

first stab at fixing diego's bug where you can't add accented values from a select in the depositor. the problem seems to be that argsstr form a get is not unicode, but from a post it is??

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• cgiutils.cpp (modified) (5 diffs)
• cgiwrapper.cpp (modified) (1 diff)
• depositoraction.cpp (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/cgiutils.cpp

@@ -412 +412 @@
   text_t::const_iterator here = argstr.begin();
   text_t::const_iterator end = argstr.end();
+  // get seems to be not unicode, while post is, so don't want to just assume encoding is 1 (not unicode)
+  unsigned short args_encoding = argstr.getencoding();
+  cerr << "args enc = "<< args_encoding<<endl;
   text_t key, value;
  
@@ -425 +428 @@
     safe_cgi_arg(key, value); // mitigate obvious cross-site scripting hacks in URL cgi-params
 
-    value.setencoding(1); // other encoding
+    value.setencoding(args_encoding); //1 // other encoding
     // store this key=value pair
     if (!key.empty()) {
@@ -441 +444 @@
     // 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);
+      // encode_commas returns a text_t without encoding bit set
+      text_t newvalue = encode_commas(value);
+      newvalue.setencoding(args_encoding);
+      args.setarg (key, newvalue, cgiarg_t::cgi_arg);
     }
     else {
@@ -447 +453 @@
 
       newvalue += "," + encode_commas(value);
-      newvalue.setencoding(1); // other encoding
+      newvalue.setencoding(args_encoding); // other encoding
       args.setarg (key, newvalue, cgiarg_t::cgi_arg);
     }
@@ -457 +463 @@
       if (args.lookupcgiarg(key).source == cgiarg_t::cgi_arg) newvalue += ",";
       newvalue += encode_commas(value);
-      newvalue.setencoding(1); // other encoding
+      newvalue.setencoding(args_encoding); // other encoding
       args.setarg (key, newvalue, cgiarg_t::cgi_arg);
 

main/trunk/greenstone2/runtime-src/src/recpt/cgiwrapper.cpp

@@ -783 +783 @@
     // GET form data
     if (aURIStr != NULL) argstr = aURIStr;
+    //kjdon a get form is not unicode
+    argstr.setencoding(1); 
       } else {
     // debugging from command line

main/trunk/greenstone2/runtime-src/src/recpt/depositoraction.cpp

@@ -365 +365 @@
           if (args_prefix == (macro_prefix+"md.")) {     
             text_t args_val = args[args_name];
+            cerr << "caching md arg "<<args_val<<endl;
+            decode_cgi_arg(args_val);
             text_t args_suffix = substr(args_name.begin()+prefix_len+3,args_name.end()); 
 
@@ -374 +376 @@
               if (!mdvalues[i].empty()) {
                 
-                decode_cgi_arg(mdvalues[i]);
+                //decode_cgi_arg(mdvalues[i]);
                 
                 if (cached_metadata_values == "") {
@@ -805 +807 @@
           if (args_prefix == (macro_prefix+"md.")) {     
             text_t args_val = args[args_name];
-
+            cerr << "args val = "<<args_val<<endl;
+            decode_cgi_arg(args_val);
+            cerr << "decoded" << args_val<<endl;
             text_t args_suffix = substr(args_name.begin()+prefix_len+3,args_name.end()); 
 
@@ -811 +815 @@
             splitchar (args_val.begin(), args_val.end(), ',', mdvalues);
             int numvalues = mdvalues.size();
-
+            cerr << "numvals = "<<numvalues<<endl;
             for (int i = 0; i < numvalues; ++i) {
               if (!mdvalues[i].empty()) {
-                decode_cgi_arg(mdvalues[i]);
+                //decode_cgi_arg(mdvalues[i]);
                 metadata_file += "            <Metadata mode=\"accumulate\" name=\"";       
                 metadata_file += args_suffix;