Changeset 31951

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.

Location:

main/trunk/greenstone2

Files:

• macros/deposit.dm (modified) (2 diffs)
• runtime-src/src/recpt/depositoraction.cpp (modified) (2 diffs)

main/trunk/greenstone2/macros/deposit.dm

@@ -194 +194 @@
         \}
         
-        var inputObj; 
+        var inputObj;
         if (metadataField.type=="text") \{
             inputObj = document.createElement("input");
@@ -221 +221 @@
 
 function check\_submit (gotopage) \{
+
+  // escape any commas in the metadata fields in order to preserve them
+  // preserve any commas in the metadata fields by escaping them here
+  // so that meta values containing commas don't end up split at comma by depositoraction.cpp
+
+  // Get just the part of form containing metadata input elements
+  // as we don't want to modify any other part of the form
+  var formContainer = document.getElementById('formcontainer'); 
+  // https://stackoverflow.com/questions/25302684/getting-all-child-input-elements-within-a-div
+  var inputNodes = formContainer.getElementsByTagName('input');
+  for(var i = 0; i < inputNodes.length; i++) \{
+    var inputNode = inputNodes[i];
+    if(inputNode.type == 'text') \{
+      if(inputNode.value) \{
+        var val = inputNode.value;
+    // To replace all occurrences in a string, and not just the 1st, need to do a global
+    // substitution. See https://www.w3schools.com/jsref/jsref_replace.asp
+        inputNode.value = val.replace(/,/g, "%2C");
+      \}
+    \}
+  \}
+
+  // Proceed as usual from here on to submit the modified form
+
   var form = document.depositorform;
   form.p.value = gotopage;

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";