Mercurial > hg > digilib

changeset 1202:ea2b8c49545f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make iiif path prefix configurable.
author robcast
date Fri, 19 Jul 2013 13:03:52 +0200
parents fda178f73c3f
children 5d0eeccca1d9
files common/src/main/java/digilib/conf/DigilibConfiguration.java common/src/main/java/digilib/conf/DigilibRequest.java webapp/src/main/webapp/WEB-INF/digilib-config.xml.template
diffstat 3 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common/src/main/java/digilib/conf/DigilibConfiguration.java	Thu Jul 18 19:23:00 2013 +0200
+++ b/common/src/main/java/digilib/conf/DigilibConfiguration.java	Fri Jul 19 13:03:52 2013 +0200
@@ -75,7 +75,8 @@
         newParameter("img-diskcache-allowed", Boolean.TRUE, null, 'f');
         // default type of error message (image, text, code)
         newParameter("default-errmsg-type", "image", null, 'f');
-
+        // prefix for IIIF image API paths
+        newParameter("iiif-prefix", "IIIF", null, 'f');
     }
 
     /**
--- a/common/src/main/java/digilib/conf/DigilibRequest.java	Thu Jul 18 19:23:00 2013 +0200
+++ b/common/src/main/java/digilib/conf/DigilibRequest.java	Fri Jul 19 13:03:52 2013 +0200
@@ -64,8 +64,8 @@
 
     private static Logger logger = Logger.getLogger("digilib.request");
 
-    // TODO: make prefix configurable
-    public static final String iiifPrefix = "iiif";
+    /** IIIF path prefix (taken from config) */
+    protected String iiifPrefix = "IIIF";
 
     /** ImageJobDescription for this request */
     protected ImageJobDescription ticket;
@@ -161,6 +161,13 @@
         newParameter("img.pix_x", new Integer(0), null, 'c');
         // hires image size y
         newParameter("img.pix_y", new Integer(0), null, 'c');
+        
+        /*
+         * set local variables from config
+         */
+        if (config != null) {
+            iiifPrefix = config.getAsString("iiif-prefix");
+        }
     }
 
     /*
--- a/webapp/src/main/webapp/WEB-INF/digilib-config.xml.template	Thu Jul 18 19:23:00 2013 +0200
+++ b/webapp/src/main/webapp/WEB-INF/digilib-config.xml.template	Fri Jul 19 13:03:52 2013 +0200
@@ -75,4 +75,7 @@
   <!-- is the image toolkit allowed to use a disk cache -->
   <parameter name="img-diskcache-allowed" value="false"/>
   
+  <!-- IIIF image API path prefix -->
+  <parameter name="iiif-prefix" value="IIIF"/>
+  
 </digilib-config>