Changeset 32830 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java

Timestamp:

2019-02-28T22:00:57+13:00 (5 years ago)

Author:

ak19

Message:

Second and final part of fixing up OAI stuff so that there's no lock on the index db by OAI servlet side when a collection is being rebuilt. The bug was that the OAI servlet side would still keep a filelock on the db (index col db and etc oai-inf db, to be precise) when a collection was deactivated before moving build to index during the activate.pl stage. That's because the OAIMessageRouter does not responde to (de)activate messages sent to the regular library servlet's MessageRouter. This commit: Getting servercontrol.pm of activate.pl to send a request to (de)activate a collection to the OAIMessageRouter was far more involved: although OAIMessageRouter inherits from MessageRouter, it did not recognise the (de)activate query params because it specifically only recognises OAI verbs like Identify and the special case of 'reset' sent to the OAIMessageRouter. So added in pathways for activate and deactivate to be recognised and processed. Now servercontrol.pm will send (de)activate requests to both the MessageRouter and the OAIMessageRouter. And there's further support for if a collection is not an OAICollection (not part of the list of collections maintained by OAIReceptionist). What I don't have working, is that the collection is still enumerated by ListSets of the OAI servlet whereas attempting to view records and identifiers of the deactivated set fails. This misbehaviour doesn't impact rebuilding with activate.pl since it both deactivates then activates a collection, so a collection is not meant to remain in the deactivated state. The fix may be more complicated than removing the collection from OAIReceptionist's list of sets, since the OAI side deals with supercollections etc when it first loads OAICollections. So any fix has to take that into account.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java

@@ -297 +297 @@
     logger.info("*** configure response = "+XMLConverter.getPrettyString(response));
   }
+  
+  protected boolean activateOrDeactivateCollection(String collName, int activationState) {
+    // Send a request like: a=s&sa=<a|d>&st=collection&sn=<collName>
+    Document doc = XMLConverter.newDOM();
+    Element mr_request_message = doc.createElement(GSXML.MESSAGE_ELEM);
+    Element mr_request = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_SYSTEM, "", null);
+    mr_request_message.appendChild(mr_request);
+    
+    Element system = doc.createElement(GSXML.SYSTEM_ELEM);
+    mr_request.appendChild(system);
+    if(activationState == OAIXML.ACTIVATION) {
+        system.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_ACTIVATE);
+    } else {
+        system.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_DEACTIVATE);
+    }
+    system.setAttribute(GSXML.SYSTEM_MODULE_TYPE_ATT, GSXML.COLLECTION_ELEM);
+    system.setAttribute(GSXML.SYSTEM_MODULE_NAME_ATT, collName);
+
+    Element response = (Element) this.mr.process(mr_request_message);
+    logger.info("*** (de)activate response = "+XMLConverter.getPrettyString(response));
+    
+    boolean success = false;
+    NodeList elements = response.getElementsByTagName(GSXML.STATUS_ELEM);
+    if(elements.getLength() <= 0) {
+        logger.error("***** No result status");
+        return false;
+    }
+    
+    String result = GSXML.getNodeText((Element)elements.item(0));
+    if(result.contains("could not be")) { // could not be (de)activated
+        return false;
+    } else {
+        return true;
+    }
+  }
+  
   /** process using strings - just calls process using Elements */
   public String process(String xml_in) {
@@ -337 +373 @@
     }
 
+    // Special cases: certain non-OAI commands/non-verbs are recognised
     // special case, reset=true for reloading the MR and recept data
     String reset = request.getAttribute("reset");
@@ -344 +381 @@
       return OAIXML.createResetResponse(true);
     }
-
+    
+    // special case 2: activate=<collname> or deactivate=<collname> can be passed to oaiserver servlet too
+    if (request.hasAttribute(GSXML.SYSTEM_TYPE_ACTIVATE)) {     
+        String collname = request.getAttribute(GSXML.SYSTEM_TYPE_ACTIVATE);
+        // don't bother activating if it's not an OAI collection
+        if (!this.set_set.contains(collname)) {
+            return OAIXML.createDeActivationOfNonOAICollResponse(OAIXML.ACTIVATION, collname);
+        }
+        boolean success = activateOrDeactivateCollection(collname, OAIXML.ACTIVATION);
+        return OAIXML.createActivationStateResponse(success, OAIXML.ACTIVATION, collname);
+    } else if (request.hasAttribute(GSXML.SYSTEM_TYPE_DEACTIVATE)) {
+        String collname = request.getAttribute(GSXML.SYSTEM_TYPE_DEACTIVATE);
+        // don't bother deactivating if it's not an OAI collection
+        if (!this.set_set.contains(collname)) {
+            return OAIXML.createDeActivationOfNonOAICollResponse(OAIXML.DEACTIVATION, collname);
+        }
+        boolean success = activateOrDeactivateCollection(collname, OAIXML.DEACTIVATION);
+        return OAIXML.createActivationStateResponse(success, OAIXML.DEACTIVATION, collname);
+    }
     
     //At this stage, the value of 'to' attribute of the request must be the 'verb'