Changeset 32860 for gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/collection/IIIFCollection.java

Timestamp:

2019-03-05T15:30:27+13:00 (5 years ago)

Author:

davidb

Message:

Mostly code tidy-up. In IIIFServerBridge.java, edit to remove hard-wired path

File:

• gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/collection/IIIFCollection.java (modified) (6 diffs)

gs3-extensions/iiif-servlet/trunk/src/gsdl-src/java/org/greenstone/gsdl3/collection/IIIFCollection.java

@@ -55 +55 @@
 public class IIIFCollection extends Collection
 {
-
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.collection.IIIFCollection.class.getName());
 
     /** does this collection provide the IIIF service */
     protected boolean has_iiif = false;
-
-    /** earliest datestamp of an OAI collection. Also used to work out the earliest datetimestamp of the entire OAI repository */
-    /*
-    protected long earliestOAIDatestamp = 0;
-    */
     
     /** a reference to the IIIFPMH service rack */
@@ -116 +110 @@
     }
 
-    // NOTE:
-    // Calling cleanUp() on IIIFPMH object iiif_service_rack will
-    // close any open dbs handles on module deactivation by
-    // MESSAGEROUTER (no deactivate yet called by
-    // IIIFMessageRouter)
-
-    // But the IIIFPMH object's cleanUp() is already called by
-    // superclass ServiceCluster, which goes around calling
-    // cleanUp() on all services/ServiceRacks.
-
     /**
      * whether this collection has IIIFPMH services
@@ -134 +118 @@
     }
 
-    /**
-     * The earliesttimestamp entry in the oai-inf.db representing when the collection was created.
-     * Used by the OAIReceptionist
-    */
-    /*
-    public long getEarliestOAIDatestamp()
-    {
-        return earliestOAIDatestamp;
-    }
-    */
     
   /** add any extra info for collection from IIIFConfig.xml */
@@ -154 +128 @@
     protected boolean configureServiceRackList(Element service_rack_list, Element extra_info)
     {
-
+        //logger.info("*** Away to call getNamedElement() for service_rack_list = " + XMLConverter.getPrettyString(service_rack_list));
+        
       // find the IIIFPMH service
       Element iiif_service_xml = GSXML.getNamedElement(service_rack_list, GSXML.SERVICE_CLASS_ELEM, GSXML.NAME_ATT, "IIIFPMH");
@@ -181 +156 @@
       
       if (this.iiif_service_rack.configure(iiif_service_xml, extra_info)) {
-
-          /*
-          // once we've configured the IIIFPMH service, we can use the OAIPMH service to
-          // retrieve the earliest timestamp of this OAI collection from the oai-inf db
-          long earliestTimestamp = this.oai_service_rack.getEarliestTimestamp();
-          if(earliestTimestamp == -1) {
-          this.earliestOAIDatestamp = -1;
-          logger.warn("No OAI timestamp for collection " + this.cluster_name);
-          } else {
-          this.earliestOAIDatestamp = earliestTimestamp; // milliseconds
-          }
-          */
-        
+    
         // find out the supported service types for this service module
         Node types = this.iiif_service_rack.process(message);
@@ -224 +187 @@
       }
       
-
       return false;
     }
-
 }