Changeset 31126 for main/trunk

Timestamp:

2016-11-18T14:28:11+13:00 (7 years ago)

Author:

kjdon

Message:

to allow metadata values to contain & and ; when doing online editing, we need to doubly encode them. unencoded & will cause an error later when doing unXMlEncode on the string, and ; is used as a delimiter by perl CGI, so the value gets split at that point if it is not encoded

File:

• main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js

@@ -7 +7 @@
 var HALTED = 12;
 
+function encodeDelimiters(meta_value) {
+
+    var new_value = meta_value.replace(/;/g, "%253B");
+    return new_value.replace(/&/g, "%2526");
+}    
 
 function getElementsByClassName(cl, parent) 
@@ -364 +369 @@
         }
         if (change.type == "delete") {
-          gs.functions.removeArchivesMetadata(collection, gs.xsltParams.site_name, change.docID, change.name, null, change.value, function(){callbackFunction();});
+            gs.functions.removeArchivesMetadata(collection, gs.xsltParams.site_name, change.docID, change.name, null, encodeDelimiters(change.value), function(){callbackFunction();});
         } else {
           if(change.orig)
             {
-              gs.functions.setArchivesMetadata(change.collection, gs.xsltParams.site_name, change.docID, change.name, null, change.value, change.orig, "override", function(){callbackFunction();});
+            gs.functions.setArchivesMetadata(change.collection, gs.xsltParams.site_name, change.docID, change.name, null, encodeDelimiters(change.value), encodeDelimiters(change.orig), "override", function(){callbackFunction();});
             }
           else
             {
-              gs.functions.setArchivesMetadata(change.collection, gs.xsltParams.site_name, change.docID, change.name, null, change.value, null, "accumulate", function(){callbackFunction();});
+            gs.functions.setArchivesMetadata(change.collection, gs.xsltParams.site_name, change.docID, change.name, null, encodeDelimiters(change.value), null, "accumulate", function(){callbackFunction();});
             }
         }