Changeset 32842 for gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/core/IIIFMessageRouter.java

Timestamp:

2019-03-03T22:50:56+13:00 (5 years ago)

Author:

davidb

Message:

Shift from OAI as a template, to separate IIIF based classes

File:

• gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/core/IIIFMessageRouter.java (modified) (11 diffs)

gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/core/IIIFMessageRouter.java

@@ -28 +28 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
-import org.greenstone.gsdl3.collection.OAICollection;
+import org.greenstone.gsdl3.collection.IIIFCollection;
 import org.greenstone.gsdl3.collection.ServiceCluster;
 import org.greenstone.gsdl3.comms.Communicator;
@@ -36 +36 @@
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
-import org.greenstone.gsdl3.util.OAIXML;
+import org.greenstone.gsdl3.util.IIIFXML;
 import org.greenstone.gsdl3.util.UserContext;
 import org.greenstone.gsdl3.util.XMLConverter;
@@ -48 +48 @@
  * The hub of a Greenstone IIIF image server/bridge.
  * 
- * A simplified version of MessageRouter for OAIServer. Only loads up collections that have OAI services.
+ * A simplified version of MessageRouter for IIIFServerBridge. Only loads up collections that have IIIF services.
  */
 public class IIIFMessageRouter extends MessageRouter
@@ -55 +55 @@
   static Logger logger = Logger.getLogger(org.greenstone.gsdl3.core.IIIFMessageRouter.class.getName());
 
-  public Element oai_config = null;
+  public Element iiif_config = null;
     //***************************************************************
     // public methods
@@ -74 +74 @@
         cleanUpModuleMapEntire();
 
-        // for oai, we don't do anything with the site config file. But we'll read it in and keep it in case need it later, eg for replace elements when retrieving metadata - which I don't think has been implemented
+        // ****
+        // for oai, we don't do anything with the site config
+        // file. But we'll read it in and keep it in case need
+        // it later, e.g. for replace elements when retrieving
+        // metadata - which I don't think has been implemented
         File configFile = new File(GSFile.siteConfigFile(this.site_home));
 
@@ -92 +96 @@
         this.config_info = config_doc.getDocumentElement();
 
-        // this is the receptionists OAIConfig.xml. Need to rethink how the MR gets this this if we ever talk to remote site, and whether it should be using it anyway
-        this.oai_config = OAIXML.getOAIConfigXML();
-        if (this.oai_config == null)
+        // this is the receptionist's IFFFConfig.xml.
+        // Need to rethink how the MR gets this this if we
+        // ever talk to remote site, and whether it should be
+        // using it anyway
+        this.iiif_config = IIIFXML.getIIIFConfigXML();
+        if (this.iiif_config == null)
         {
-          logger.error("Couldn't load in OAIConfig.xml");
+          logger.error("Couldn't load in IIIFConfig.xml");
           return false;
         }
@@ -122 +129 @@
         logger.info("Activating collection: " + col_name + ".");
         Document doc = this.collection_list.getOwnerDocument();
-        // use our special OAICollection - this will only load in oai services
-        OAICollection c = new OAICollection();
+        // use our special IIIFCollection - this will only load in IIIF services
+        IIIFCollection c = new IIIFCollection();
 
         c.setCollectionName(col_name);
@@ -135 +142 @@
 
         logger.info("have just configured collection " + col_name);
-        if (!c.hasOAI()) {
-          logger.info ("collection "+col_name+" has no OAI services. Not keeping it loaded");
+        if (!c.hasIIIF()) {
+          logger.info ("collection "+col_name+" has no IIIF services. Not keeping it loaded");
           return false;
         }
-        if (!c.configureOAI(this.oai_config)) {
-          logger.info("couldn't configure the collection : "+col_name +" with the oai config info");
+        if (!c.configureIIIF(this.iiif_config)) {
+          logger.info("couldn't configure the collection : "+col_name +" with the iiif config info");
           return false;
         }
@@ -147 +154 @@
         Element e = doc.createElement(GSXML.COLLECTION_ELEM);
         e.setAttribute(GSXML.NAME_ATT, col_name);
+        /*
         e.setAttribute(OAIXML.LASTMODIFIED, "" + c.getLastmodified());
         e.setAttribute(OAIXML.EARLIEST_DATESTAMP, "" + c.getEarliestDatestamp());
         e.setAttribute(OAIXML.EARLIEST_OAI_DATESTAMP, "" + c.getEarliestOAIDatestamp());
+        */
         this.collection_list.appendChild(e);
         return true;
@@ -168 +177 @@
      * @return the result Element - should be <response>
      */
+    /*
   protected Element processMessage(Element req) {
     Document doc = XMLConverter.newDOM();
@@ -185 +195 @@
   }
 
-
+    */
 }