# HG changeset patch # User robcast # Date 1374231832 -7200 # Node ID ea2b8c49545fc65241739525126dad6f37f1e636 # Parent fda178f73c3f3746f9c10704612915e29833cbfa make iiif path prefix configurable. diff -r fda178f73c3f -r ea2b8c49545f common/src/main/java/digilib/conf/DigilibConfiguration.java --- 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'); } /** diff -r fda178f73c3f -r ea2b8c49545f common/src/main/java/digilib/conf/DigilibRequest.java --- 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"); + } } /* diff -r fda178f73c3f -r ea2b8c49545f webapp/src/main/webapp/WEB-INF/digilib-config.xml.template --- 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 @@ + + +