Changeset 33218 for main

Timestamp:

2019-06-24T17:46:14+12:00 (5 years ago)

Author:

wy59

Message:

1. Added Javascript versions of new erase-metadata functions, to work with their recently introduced perl counterparts. Because this feature is now unused but still potentially useful, having been created for a scenario we no longer need, these functions are untested. Other than that they produced no obvious javascript syntax errors when the modified javascript-global-functions.js file got included. 2. Minor, improved a comment.

Location:

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

Files:

• javascript-global-functions.js (modified) (2 diffs)
• map-scripts.js (modified) (1 diff)

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

@@ -965 +965 @@
 
     gs.functions._callMetadataServer(
-    "removeArchiveMetadata", 
+    "removeArchivesMetadata", 
     gs.functions.getBasicDataForMetadataServer("remove-archives-metadata", collection, site, documentID, metadataName, null /*metamode*/, metadataValue, null /*prevmetavalue*/, metadataPosition), 
     successResponseFunction,
@@ -1003 +1003 @@
 }
 
+
+/***********************************************************
+* ERASE METADATA FUNCTIONS                                 *
+* Erase all meta in docID (sectionID) that match metaname. *
+***********************************************************/
+
+gs.functions.eraseImportMetadata = function(collection, site, documentID, metadataName, successResponseFunction, errorResponseFunction)
+{
+    if( typeof errorResponseFunction === 'undefined' ) { errorResponseFunction = null; } // force error callback to be defined: either null or has value
+    
+    gs.functions._callMetadataServer(
+    "eraseImportMetadata", 
+    gs.functions.getBasicDataForMetadataServer("erase-import-metadata", collection, site, documentID, metadataName, "override" /*metamode*/, null /*metadataValue*/, null /*prevmetavalue*/, null /*metadataPosition*/), 
+    successResponseFunction,
+    errorResponseFunction);
+}
+
+gs.functions.eraseArchivesMetadata = function(collection, site, documentID, metadataName, successResponseFunction, errorResponseFunction)
+{
+    if( typeof errorResponseFunction === 'undefined' ) { errorResponseFunction = null; } // force error callback to be defined: either null or has value
+    
+    gs.functions._callMetadataServer(
+    "eraseArchivesMetadata", 
+    gs.functions.getBasicDataForMetadataServer("erase-archives-metadata", collection, site, documentID, metadataName, "override" /*metamode*/, null /*metadataValue*/, null /*prevmetavalue*/, null /*metadataPosition*/), 
+    successResponseFunction,
+    errorResponseFunction);
+}
+
+gs.functions.eraseIndexMetadata = function(collection, site, documentID, metadataName, successResponseFunction, errorResponseFunction)
+{
+    if( typeof errorResponseFunction === 'undefined' ) { errorResponseFunction = null; } // force error callback to be defined: either null or has value
+    
+    gs.functions._callMetadataServer(
+    "eraseIndexMetadata", 
+    gs.functions.getBasicDataForMetadataServer("erase-metadata", collection, site, documentID, metadataName, "override" /*metamode*/, null /*metadataValue*/, null /*prevmetavalue*/, null /*metadataPosition*/), 
+    successResponseFunction,
+    errorResponseFunction);
+}
+
+gs.functions.eraseMetadata = function(collection, site, documentID, metadataName, successResponseFunction, errorResponseFunction)
+{
+    if( typeof errorResponseFunction === 'undefined' ) { errorResponseFunction = null; } // force error callback to be defined: either null or has value
+    
+    var nameArray = ["eraseImportMetadata", "eraseArchivesMetadata", "eraseIndexMetadata"];
+    var functionArray = ["erase-import-metadata", "erase-archives-metadata", "erase-metadata"];
+    
+    for(var i = 0; i < nameArray.length; i++)
+    {
+        gs.functions._callMetadataServer(
+        nameArray[i],
+        gs.functions.getBasicDataForMetadataServer(functionArray[i], collection, site, documentID, metadataName, "override" /*metamode*/, null /*metadataValue*/, null /*prevmetavalue*/, null /*metadataPosition*/),
+        successResponseFunction,
+        errorResponseFunction);
+    }
+}

main/trunk/greenstone3/web/interfaces/default/js/map-scripts.js

@@ -1 @@
-var mapEnabled = false; // variable to detect when map-scripts have been included into document_scripts.js and classifier_scripts.js
-                        // Will be set to true iff we have gps map data that the map can display
+var mapEnabled = false; // variable to detect when map-scripts have been included into document_scripts.js and classifier_scripts.js,
+                        // in which case this variable will be defined.
+                        // It will be furthermore be set to true iff we have gps map data that the map can display, false if map-scripts imported but no map data.
 
 //var newLat, newLng = 0;