Changeset 30373 for main/trunk/greenstone2/runtime-src/src/recpt/depositoraction.cpp

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??

File:

• main/trunk/greenstone2/runtime-src/src/recpt/depositoraction.cpp (modified) (4 diffs)

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;