Mercurial > hg > digilib

changeset 1199:22b8e36fcb89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
IIIF api mostly works now.
author robcast
date Wed, 17 Jul 2013 19:12:01 +0200
parents 569b6a1ab1a6
children 80f9d685c890
files common/src/main/java/digilib/conf/DigilibConfiguration.java servlet/src/main/java/digilib/servlet/ServletOps.java servlet3/src/main/java/digilib/servlet/Scaler.java
diffstat 3 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/common/src/main/java/digilib/conf/DigilibConfiguration.java	Wed Jul 17 18:14:31 2013 +0200
+++ b/common/src/main/java/digilib/conf/DigilibConfiguration.java	Wed Jul 17 19:12:01 2013 +0200
@@ -56,7 +56,7 @@
          */
         
         // digilib version
-        newParameter("digilib.version", "2.2.0", null, 's');
+        newParameter("digilib.version", "2.2.1", null, 's');
         // sending image files as-is allowed
         newParameter("sendfile-allowed", Boolean.TRUE, null, 'f');
         // Type of DocuImage instance
--- a/servlet/src/main/java/digilib/servlet/ServletOps.java	Wed Jul 17 18:14:31 2013 +0200
+++ b/servlet/src/main/java/digilib/servlet/ServletOps.java	Wed Jul 17 19:12:01 2013 +0200
@@ -38,7 +38,6 @@
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpUtils;
 
 import org.apache.log4j.Logger;
 
@@ -47,7 +46,6 @@
 import digilib.image.ImageOpException;
 import digilib.io.FileOps;
 import digilib.io.ImageInput;
-import digilib.io.ImageSet;
 import digilib.util.ImageSize;
 
 public class ServletOps {
@@ -349,8 +347,7 @@
     }
 
 
-    public static void sendInfo(DigilibServletRequest dlReq, HttpServletResponse response, Logger logger) throws ImageOpException,
-            ServletException {
+    public static void sendInfo(DigilibServletRequest dlReq, HttpServletResponse response, Logger logger) throws ServletException {
         if (response == null) {
             logger.error("No response!");
             return;
@@ -372,7 +369,7 @@
             writer.println("\"profile\" : \"http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level2\",");
             writer.println("}");
         } catch (IOException e) {
-            throw new ServletException("Error sending image:", e);
+            throw new ServletException("Error sending info:", e);
         }
         // TODO: should we: finally { img.dispose(); }
     }
--- a/servlet3/src/main/java/digilib/servlet/Scaler.java	Wed Jul 17 18:14:31 2013 +0200
+++ b/servlet3/src/main/java/digilib/servlet/Scaler.java	Wed Jul 17 19:12:01 2013 +0200
@@ -58,7 +58,7 @@
     private static final long serialVersionUID = 5289386646192471549L;
 
     /** digilib servlet version (for all components) */
-    public static final String version = "2.2.0 async";
+    public static final String version = "2.2.1 async";
 
     /** servlet error codes */
     public static enum Error {
@@ -236,6 +236,12 @@
         DigilibServletRequest dlRequest = new DigilibServletRequest(request);
         // extract the job information
         final ImageJobDescription jobTicket = ImageJobDescription.getInstance(dlRequest, dlConfig);
+        
+        // handle the info-request
+        if (dlRequest.hasOption("info")) {
+            ServletOps.sendInfo(dlRequest, response, logger);
+            return;
+        }
 
         // type of error reporting
         ErrMsg errMsgType = defaultErrMsgType;