allow dspace canvas and image manifest be generated with empty subpath

TAMULib · May 25, 2018 · aa433ca · aa433ca
1 parent 0170cab
commit aa433ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/edu/tamu/iiif/service/dspace/DSpaceCanvasManifestService.java b/src/main/java/edu/tamu/iiif/service/dspace/DSpaceCanvasManifestService.java
@@ -18,7 +18,7 @@ public String generateManifest(String path) throws IOException, URISyntaxExcepti
         String handle = extractHandle(path);
         RdfResource rdfResource = getDSpaceRdfModel(handle);
         String url = rdfResource.getResource().getURI();
-        Canvas canvas = generateCanvas(new RdfResource(rdfResource, url.replace("rdf/handle", dspaceWebapp + "/bitstream").replaceAll(handle, path)));
+        Canvas canvas = generateCanvas(new RdfResource(rdfResource, url.replace("rdf/handle", dspaceWebapp != null && dspaceWebapp.length() > 0 ? dspaceWebapp + "/bitstream" : "bitstream").replaceAll(handle, path)));
         return mapper.writeValueAsString(canvas);
     }
 

diff --git a/src/main/java/edu/tamu/iiif/service/dspace/DSpaceImageManifestService.java b/src/main/java/edu/tamu/iiif/service/dspace/DSpaceImageManifestService.java
@@ -15,7 +15,7 @@
 public class DSpaceImageManifestService extends AbstractDSpaceManifestService {
 
     public String generateManifest(String path) throws IOException, URISyntaxException {
-        String dspacePath = joinPath(dspaceUrl, dspaceWebapp, "bitstream", path);
+        String dspacePath = dspaceWebapp != null && dspaceWebapp.length() > 0 ? joinPath(dspaceUrl, dspaceWebapp, "bitstream", path) : joinPath(dspaceUrl, "bitstream", path);
         URI uri = getImageUri(dspacePath);
         return fetchImageInfo(uri.toString());
     }