# HG changeset patch
# User robcast
# Date 1445891359 -3600
# Node ID 9d3e5b4453fda36c8fdfeb4edf31ae0557c07b63
# Parent  8a713bc0e86f4d035097672940f247cffbbe90ff
improved IIIF compliance.

diff -r 8a713bc0e86f -r 9d3e5b4453fd common/src/main/java/digilib/image/ImageJobDescription.java
--- a/common/src/main/java/digilib/image/ImageJobDescription.java	Mon Oct 26 20:22:51 2015 +0100
+++ b/common/src/main/java/digilib/image/ImageJobDescription.java	Mon Oct 26 21:29:19 2015 +0100
@@ -866,6 +866,8 @@
             imageSendable = (mimeType != null
             		// input image is browser compatible
                     && (mimeType.equals("image/jpeg") || mimeType.equals("image/png") || mimeType.equals("image/gif"))
+                    // no forced type conversion
+                    && !(hasOption("jpg") || hasOption("png"))
                     // no zooming
                     && !(getWx() > 0f || getWy() > 0f || getWw() < 1f || getWh() < 1f
                     // no other image operations
diff -r 8a713bc0e86f -r 9d3e5b4453fd servlet/pom.xml
--- a/servlet/pom.xml	Mon Oct 26 20:22:51 2015 +0100
+++ b/servlet/pom.xml	Mon Oct 26 21:29:19 2015 +0100
@@ -22,7 +22,7 @@
   	<dependency>
   		<groupId>javax.servlet</groupId>
   		<artifactId>servlet-api</artifactId>
-  		<version>2.3</version>
+  		<version>2.4</version>
   		<type>jar</type>
   		<scope>provided</scope>
   	</dependency>
diff -r 8a713bc0e86f -r 9d3e5b4453fd servlet/src/main/java/digilib/servlet/ServletOps.java
--- a/servlet/src/main/java/digilib/servlet/ServletOps.java	Mon Oct 26 20:22:51 2015 +0100
+++ b/servlet/src/main/java/digilib/servlet/ServletOps.java	Mon Oct 26 21:29:19 2015 +0100
@@ -383,7 +383,8 @@
         } else if (url.endsWith("/")) {
             url = url.substring(0, url.lastIndexOf("/"));
         }
-        response.setContentType("application/json;charset=UTF-8");
+        response.setCharacterEncoding("UTF-8");
+        response.setContentType("application/json,application/ld+json");
         PrintWriter writer;
         try {
             writer = response.getWriter();
diff -r 8a713bc0e86f -r 9d3e5b4453fd webapp/pom.xml
--- a/webapp/pom.xml	Mon Oct 26 20:22:51 2015 +0100
+++ b/webapp/pom.xml	Mon Oct 26 21:29:19 2015 +0100
@@ -63,7 +63,7 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-war-plugin</artifactId>
 						<configuration>
-							<webXml>${basedir}/src/main/webapp/WEB-INF/web-2.3.xml</webXml>
+							<webXml>${basedir}/src/main/webapp/WEB-INF/web-2.4.xml</webXml>
 							<classifier>srv2</classifier>
 						</configuration>
 					</plugin>
diff -r 8a713bc0e86f -r 9d3e5b4453fd webapp/src/main/webapp/WEB-INF/web-2.3.xml
--- a/webapp/src/main/webapp/WEB-INF/web-2.3.xml	Mon Oct 26 20:22:51 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
- 
-<web-app>
-  <!-- General description of your web application -->
-  <display-name>
-        digilib
-  </display-name>
-  <description>
-        This is the web frontend of the Digital Document Library.
-  </description>
-  <!-- The Intialisation Listener -->
-  <listener>
-        <listener-class>
-            digilib.conf.DigilibServletConfiguration
-        </listener-class>
-  </listener>
-  <!-- The Scaler servlet -->
-  <servlet>
-        <servlet-name>
-            Scaler
-        </servlet-name>
-        <servlet-class>
-            digilib.servlet.Scaler
-        </servlet-class>
-        <!-- Load this servlet at server startup time -->
-        <load-on-startup>
-            5
-        </load-on-startup>
-  </servlet>
-  <!-- The mapping for the Scaler servlet -->
-  <servlet-mapping>
-        <servlet-name>
-            Scaler
-        </servlet-name>
-        <url-pattern>
-            /servlet/Scaler/*
-        </url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-        <servlet-name>
-            Scaler
-        </servlet-name>
-        <url-pattern>
-            /Scaler/*
-        </url-pattern>
-  </servlet-mapping>
-</web-app>
diff -r 8a713bc0e86f -r 9d3e5b4453fd webapp/src/main/webapp/WEB-INF/web-2.4.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/src/main/webapp/WEB-INF/web-2.4.xml	Mon Oct 26 21:29:19 2015 +0100
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+ 
+<web-app>
+  <!-- General description of your web application -->
+  <display-name>
+        digilib
+  </display-name>
+  <description>
+        This is the web frontend of the Digital Document Library.
+  </description>
+  <!-- The Intialisation Listener -->
+  <listener>
+        <listener-class>
+            digilib.conf.DigilibServletConfiguration
+        </listener-class>
+  </listener>
+  <!-- The Scaler servlet -->
+  <servlet>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <servlet-class>
+            digilib.servlet.Scaler
+        </servlet-class>
+        <!-- Load this servlet at server startup time -->
+        <load-on-startup>
+            5
+        </load-on-startup>
+  </servlet>
+  <!-- The mapping for the Scaler servlet -->
+  <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /servlet/Scaler/*
+        </url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+        <servlet-name>
+            Scaler
+        </servlet-name>
+        <url-pattern>
+            /Scaler/*
+        </url-pattern>
+  </servlet-mapping>
+</web-app>