Changeset 32830 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.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/OAIServer.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.java

@@ -140 +140 @@
         this.recept = new OAIReceptionist();
 
-        // the receptionist uses a OAIMessageRouter or Communicator to send its requests to. We either create a OAIMessageRouter here for the designated site (if site_name set), or we create a Communicator for a remote site. The is given to teh Receptionist, and the servlet never talks to it again.directly.
+        // the receptionist uses a OAIMessageRouter or Communicator to send its requests to. We either create a OAIMessageRouter here for the designated site (if site_name set), or we create a Communicator for a remote site. The is given to the Receptionist, and the servlet never talks to it again directly.
         if (site_name != null)
         {
@@ -342 +342 @@
 
         if (query!=null && query.equals("reset")) {
-          logger.error("reset was called*******************");
+          logger.info("reset was called*******************");
           out.println("<?xml version='1.0' encoding='UTF-8' ?>");
           out.println(this.recept.process("<message><request reset='true'/></message>"));
@@ -348 +348 @@
         }
         String[] pairs = (query == null) ? null : query.split("&");//split into key/value pairs
+        
+        // besides "reset", the only other non-verb (non-OAI) requests allowed would be: (de)activate="collName"
+        if(pairs.length == 1) {
+            String command = pairs[0];
+            int index = command.indexOf('=');
+            if(index != -1) {
+                String collName = command.substring(index+1);
+                command = command.substring(0, index);
+                if(command.equals(GSXML.SYSTEM_TYPE_ACTIVATE)) {
+                    logger.info("activating OAI collection " + collName + " was called*******************");
+                    out.println("<?xml version='1.0' encoding='UTF-8' ?>");
+                    out.println(this.recept.process("<message><request " + GSXML.SYSTEM_TYPE_ACTIVATE+"='"+collName+"'/></message>"));
+                    return;
+                    
+                } else if(command.equals(GSXML.SYSTEM_TYPE_DEACTIVATE)) {
+                    logger.info("deactivating OAI collection " + collName + " was called*******************");
+                    out.println("<?xml version='1.0' encoding='UTF-8' ?>");
+                    out.println(this.recept.process("<message><request " + GSXML.SYSTEM_TYPE_DEACTIVATE+"='"+collName+"'/></message>"));
+                    return;
+                }
+            }
+            // any other format for activate/deactivate command in query is wrong, continue processing and fail with "badVerb" message:
+        }
+        
         
         String verb = getVerb(query);