Changeset 30617 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

Timestamp:

2016-07-22T19:41:17+12:00 (8 years ago)

Author:

ak19

Message:

Bugfix to oversight: web document editor didn't reindex on removing metadata, only on setting it. This is because there wasn't corresponding Service on Java side to handle removing metadata. Now the Java code has a ModifyMetdata service and this is connected to both the set- and remove-metadata functions in the javascript. For now, the javascript metadataserver calls have been made synchronous by setting the async ajax-jquery property to false. Need to test whether the code still works asynchronous as before.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (modified) (8 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -67 +67 @@
     private static final String DELETE_SERVICE = "DeleteCollection";
     private static final String RELOAD_SERVICE = "ReloadCollection";
-    private static final String SET_METADATA_SERVICE = "SetMetadata";
+    private static final String MODIFY_METADATA_SERVICE = "ModifyMetadata"; // set or remove metadata
+
 
     // params used
@@ -128 +129 @@
                 param_list.appendChild(param);
             }
-            else if (service.equals(ACTIVATE_SERVICE) || service.equals(IMPORT_SERVICE) || service.equals(BUILD_SERVICE) || service.equals(RELOAD_SERVICE) || service.equals(DELETE_SERVICE) || service.equals(SET_METADATA_SERVICE))
+            else if (service.equals(ACTIVATE_SERVICE) || service.equals(IMPORT_SERVICE) || service.equals(BUILD_SERVICE) || service.equals(RELOAD_SERVICE) || service.equals(DELETE_SERVICE) || service.equals(MODIFY_METADATA_SERVICE))
             {
 
@@ -185 +186 @@
     {
         // check permissions
-        if (!userHasCollectionEditPermissions(request)) {
+        if (!userHasCollectionEditPermissions(request)) {
             Document result_doc = XMLConverter.newDOM();
             Element result = GSXML.createBasicResponse(result_doc, "processBuildAndActivateCollection");
             GSXML.addError(result, "This user does not have the required permissions to perform this action.");
             return result;
-        }
-
+        }
+
+            
         waitUntilReady(request);
         Element buildResponse = processBuildCollection(request);
@@ -305 +307 @@
     }
 
-    protected Element processSetMetadata(Element request)
+    protected Element processModifyMetadata(Element request)
     {
         if (!userHasCollectionEditPermissions(request)) {
         Document result_doc = XMLConverter.newDOM();
-        Element result = GSXML.createBasicResponse(result_doc, "processSetMetadata");
+        Element result = GSXML.createBasicResponse(result_doc, "processModifyMetadata");
         GSXML.addError(result, "This user does not have the required permissions to perform this action.");
         return result;
         }
 
-        return runCommand(request, GS2PerlConstructor.SET_METADATA_SERVER);
+        return runCommand(request, GS2PerlConstructor.MODIFY_METADATA_SERVER);
     }
 
@@ -619 +621 @@
         e = this.desc_doc.createElement(GSXML.SERVICE_ELEM);
         e.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_PROCESS);
-        e.setAttribute(GSXML.NAME_ATT, SET_METADATA_SERVICE);
+        e.setAttribute(GSXML.NAME_ATT, MODIFY_METADATA_SERVICE);
         this.short_service_info.appendChild(e);
 
@@ -708 +710 @@
             constructor.setManifestFile(this.site_home + File.separator + "collect" + File.separator + params.get(COL_PARAM) + File.separator + "manifests" + File.separator + "tempManifest.xml");
         }
-        else if (type == GS2PerlConstructor.SET_METADATA_SERVER) {
+        else if (type == GS2PerlConstructor.MODIFY_METADATA_SERVER) {
             StringBuffer querystring = new StringBuffer();
             
@@ -977 +979 @@
         if (!coll_db.openDatabase(coll_db_file, SimpleCollectionDatabase.READ))
         {
-            logger.error("Could not open collection archives database. Database doesn't exist or else somebody is already using it?");
+            logger.error("Could not open collection archives database. Database doesn't exist or else somebody's already using it?");
             return;
         }
@@ -988 +990 @@
         {
             logger.error("Could not open collection archives database. Somebody already using this database!");
+            return;
         }
         coll_db.setValue(oid, new_value);