Changeset 30659 for main/trunk/greenstone3/web/interfaces/default/js/javascript-global-functions.js

Timestamp:

2016-08-02T16:24:56+12:00 (8 years ago)

Author:

ak19

Message:

Forgot to only do set- and remove-metadata operations synchronously since the results need to come back in sequence internally, while get-metadata operations can be asynchronous.

File:

• main/trunk/greenstone3/web/interfaces/default/js/javascript-global-functions.js (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/js/javascript-global-functions.js

@@ -424 +424 @@
 function callMetadataServer(callingFunction, url, responseFunction)
 {
+    var async_setting = true; // Internal processing of 'read' operations (get meta) is not order dependent
+
     // If doing set- or remove- (not get-) metadata, then rewrite URLs to call GS2Construct's ModfiyMetadata service instead (which will ensure this only works when authenticated). 
     // From:
@@ -436 +438 @@
     url = url.replace(/(&|\?)([^=]*=)/g, "$1"+"s1.$2"); // prefix param names with "s1."
     url = url.replace("cgi-bin/metadata-server.pl?",  gs.xsltParams.library_name + "?a=g&rt=r&ro=1&s=ModifyMetadata&");
-    console.log("@@@@@ URL is " + url);
+    
+    //console.log("@@@@@ URL is " + url);
+
+    async_setting = false; // for 'write' operations (set/remove meta), we force sequential processing of the internal operation.
+
     } // otherwise, such as for get- metadata operation, we proceed as before, which will not require authentication
-    
-    $.ajax(url, {async: false})
+
+
+    $.ajax(url, {async: async_setting})
     .success(function(response)
     {