Changeset 32886 for gs3-extensions

Timestamp:

2019-03-08T13:59:41+13:00 (5 years ago)

Author:

davidb

Message:

Copy refactoring

Location:

gs3-extensions/iiif-servlet/trunk/src/src/main/java/edu/illinois/library/cantaloupe/resource/iiif/v2

Files:

• GSImageResource.java (modified) (3 diffs)
• GSInformationResource.java (modified) (3 diffs)
• IdentifierToGSAssocfile.java (added)

gs3-extensions/iiif-servlet/trunk/src/src/main/java/edu/illinois/library/cantaloupe/resource/iiif/v2/GSImageResource.java

@@ -36 +36 @@
 import java.util.Set;
 
-import org.greenstone.gsdl3.IIIFServerBridge;
-
 /**
  * Handles IIIF Image API 2.x image requests.
@@ -46 +44 @@
 public class GSImageResource extends IIIF2Resource {
 
-    protected Source createSource(Identifier identifier) throws Exception
-    {
-    String identifier_str = identifier.toString();
-    String[] strs = identifier_str.split(":", 3);
-    if(strs == null || strs.length < 3) {
-        System.err.println("identifier is not in the form site:coll:id" + identifier_str);
-        return null;
-    }    
-    String site_name = strs[0];
-    String coll_name = strs[1];
-    String doc_id = strs[2];
-
-    // Move into Constructor ??? 
-    IIIFServerBridge gs_iiif_bridge = new IIIFServerBridge();
-    // and keep cache of of bridges in hashmap, keyed on sitename??     
-    gs_iiif_bridge.init(site_name);
-    
-    String collect_image_filename = gs_iiif_bridge.doGetDocumentMessage(coll_name + ":" + doc_id);
-    String site_image_filename = site_name + "/collect/" + coll_name + "/index/assoc/" + collect_image_filename;
-    
-    System.err.println("**** Greenstone site image filename = " + site_image_filename);
-
-    final Identifier identifier_image = new Identifier(site_image_filename);
-    System.err.println("***** identifier_image = " + identifier_image);
-
-    final Source source = new SourceFactory().newSource(identifier_image, getDelegateProxy());
-        
-    System.err.println("***** source path = " + ((edu.illinois.library.cantaloupe.source.FileSource)source).getPath());
-
-    return source;
-    }
     
     /**
@@ -143 +110 @@
         }
 
-    final Source source = createSource(identifier);
-        //final Source source = new SourceFactory().newSource(
-        //        identifier, getDelegateProxy());
+    final Identifier identifier_image = IdentifierToGSAssocfile.createIdentifierImage(identifier);
+    final Source source = new SourceFactory().newSource(identifier_image, getDelegateProxy());
+        
+    //System.err.println("***** source path = " + ((edu.illinois.library.cantaloupe.source.FileSource)source).getPath());
 
         // If we are resolving first, or if the source image is not present in

gs3-extensions/iiif-servlet/trunk/src/src/main/java/edu/illinois/library/cantaloupe/resource/iiif/v2/GSInformationResource.java

@@ -27 +27 @@
 import org.restlet.resource.Get;
 
-import org.greenstone.gsdl3.IIIFServerBridge;
+//import org.greenstone.gsdl3.IIIFServerBridge; // ****
 
 /**
@@ -88 +88 @@
             }
         }
-
+    
+    final Identifier identifier_image = IdentifierToGSAssocfile.createIdentifierImage(identifier);
+    final Source source = new SourceFactory().newSource(identifier_image, getDelegateProxy());
+    /*
     String identifier_str = identifier.toString();
     String[] strs = identifier_str.split(":", 3);
@@ -115 +118 @@
     System.err.println("***** identifier_image = " + identifier_image);
     System.err.println("***** source path = " + ((edu.illinois.library.cantaloupe.source.FileSource)source).getPath());
+    */
     
         // If we are resolving first, or if the source image is not present in