Changeset 30014 for main/trunk

Timestamp:

2015-07-10T21:58:49+12:00 (9 years ago)

Author:

ak19

Message:

Forgot to commit. Only if we're doing a set operation with the onine editor do we rewrite the URL, which makes it go through authentication.

File:

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

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

@@ -428 +428 @@
     // <gs3server>/cgi-bin/metadata-server.pl?a=set-archives-metadata&c=smallcol&site=localsite&d=HASH01454f31011f6b6b26eaf8d7&metaname=Title&metavalue=Moo&prevmetavalue=Blabla&metamode=override
     // To:
-    // <gs3server>/library?a=g&rt=r&ro=1&s=SetMetadata&s1.collection=smallcol&s1.site=localsite&s1.d=HASH01454f31011f6b6b26eaf8d7&s1.metaname=Title&s1.metavalue=Moo&s1.prevmetavalue=Blabla&s1.metamode=override
-
-    url = url.replace("&c=",  "&collection="); // c is a special param name for GS2Construct
-    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=SetMetadata&");
+    // <gs3server>/library?a=g&rt=r&ro=1&s=SetMetadata&s1.a=set-archives-metadata&s1.collection=smallcol&s1.site=localsite&s1.d=HASH01454f31011f6b6b26eaf8d7&s1.metaname=Title&s1.metavalue=Moo&s1.prevmetavalue=Blabla&s1.metamode=override
+
+    // if we're doing a set- metdata operation, then we'll be changing the URL to make sure we go through GS3's authentication
+    if(url.indexOf("set-") != -1) {
+    url = url.replace("&c=",  "&collection="); // c is a special param name for GS2Construct
+    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=SetMetadata&");
+
+    console.log("@@@@@ URL is " + url);
+    } // otherwise, such as for get- metadata operation, we proceed as before, which will not require authentication
 
     $.ajax(url)