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

Timestamp:

2016-11-17T11:58:08+13:00 (7 years ago)

Author:

kjdon

Message:

if metavalue is at the end of the list of arguments, and it has a trailing whitespace, then this whitespace doesn't get picked up, then the meta value wont match. So putting metavalue before metaname so that its not at the end of the string

File:

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

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

@@ -573 +573 @@
 gs.functions.removeImportMetadata = function(collection, site, documentID, metadataName, metadataValue, responseFunction)
 {
-    callMetadataServer("removeImportMetadata", "cgi-bin/metadata-server.pl?a=remove-import-metadata&c=" + collection + "&site=" + site + "&d=" + documentID + "&metaname=" + metadataName + "&metavalue=" + metadataValue, responseFunction);
+    callMetadataServer("removeImportMetadata", "cgi-bin/metadata-server.pl?a=remove-import-metadata&c=" + collection + "&site=" + site + "&d=" + documentID + "&metavalue=" + metadataValue + "&metaname=" + metadataName, responseFunction);
 }
 
@@ -584 +584 @@
     else if(metadataValue != null)
     {
-        callMetadataServer("removeArchiveMetadata", "cgi-bin/metadata-server.pl?a=remove-archives-metadata&c=" + collection + "&site=" + site + "&d=" + documentID + "&metaname=" + metadataName + "&metavalue=" + metadataValue, responseFunction);
+        callMetadataServer("removeArchiveMetadata", "cgi-bin/metadata-server.pl?a=remove-archives-metadata&c=" + collection + "&site=" + site + "&d=" + documentID  + "&metavalue=" + metadataValue + "&metaname=" + metadataName, responseFunction);
     }
 }
@@ -596 +596 @@
     else if(metadataValue != null)
     {
-        callMetadataServer("removeIndexMetadata", "cgi-bin/metadata-server.pl?a=remove-metadata&c=" + collection + "&site=" + site + "&d=" + documentID + "&metaname=" + metadataName + "&metavalue=" + metadataValue, responseFunction);
+        callMetadataServer("removeIndexMetadata", "cgi-bin/metadata-server.pl?a=remove-metadata&c=" + collection + "&site=" + site + "&d=" + documentID  + "&metavalue=" + metadataValue + "&metaname=" + metadataName, responseFunction);
     }
 }
@@ -607 +607 @@
     for(var i = 0; i < nameArray.length; i++)
     {
-        callMetadataServer(nameArray[i], "cgi-bin/metadata-server.pl?a=" + functionArray[i] + "&c=" + collection + "&site=" + site + "&d=" + documentID + "&metaname=" + metadataName + "&metavalue=" + metadataValue, responseFunction);
-    }
-}
+        callMetadataServer(nameArray[i], "cgi-bin/metadata-server.pl?a=" + functionArray[i] + "&c=" + collection + "&site=" + site + "&d=" + documentID + "&metavalue=" + metadataValue + "&metaname=" + metadataName, responseFunction);
+    }
+}