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

Timestamp:

2017-09-07T17:57:31+12:00 (7 years ago)

Author:

ak19

Message:

Bugfix to depositor: commas in metadata entered through the depositor were not being preserved, as commas were used to split the many fields (of form cgi params) on in depositoraction.cpp. Now depositor.dm escapes the commas with URL encoding in the metadatafields section of the depositor step1 form, while depositoraction.cpp decodes the URL-encoded commas again.

File:

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

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

@@ -833 +833 @@
             cerr << "args val = "<<args_val<<endl;
             decode_cgi_arg(args_val);
-            cerr << "decoded" << args_val<<endl;
+            cerr << "decoded = " << args_val<<endl;
             text_t args_suffix = substr(args_name.begin()+prefix_len+3,args_name.end()); 
 
@@ -846 +846 @@
                 metadata_file += args_suffix;
                 metadata_file += "\">";
-                metadata_file += xml_safe(mdvalues[i]);
+                // originally literal commas entered for metadata like dc.Subject
+                // come in (extra) URL encoded, as %2C at this point in the code
+                // Decode any commas now before writing them into metadata.xml
+                metadata_file += xml_safe(decode_commas(mdvalues[i]));
                 metadata_file += "</Metadata>\n";