# HG changeset patch
# User robcast
# Date 1361382562 -3600
# Node ID 27e209181cbe70d65e1c762bc4cf3b0ae7a491f6
# Parent  96dfc489e9f3b79f77d0f623014a9be4a3cb2fcc
fixed bugs with missing fn-parameter.
detection of standard parameter style by "=" now.

diff -r 96dfc489e9f3 -r 27e209181cbe servlet2/src/main/java/digilib/servlet/DigilibServletRequest.java
--- a/servlet2/src/main/java/digilib/servlet/DigilibServletRequest.java	Tue Feb 19 20:38:53 2013 +0100
+++ b/servlet2/src/main/java/digilib/servlet/DigilibServletRequest.java	Wed Feb 20 18:49:22 2013 +0100
@@ -189,8 +189,7 @@
 			} else if (qs.indexOf(";") > -1) {
 				// ; separator
 				setWithParamString(qs, ";");
-			} else if (request.getParameter("fn") != null || 
-			        request.getParameter("dw") != null || request.getParameter("dh") != null) {
+            } else if (qs.indexOf('=') > -1) {
 				// standard '&' parameters
 				setWithParamRequest(request);
 			} else {
diff -r 96dfc489e9f3 -r 27e209181cbe servlet3/src/main/java/digilib/servlet/DigilibServletRequest.java
--- a/servlet3/src/main/java/digilib/servlet/DigilibServletRequest.java	Tue Feb 19 20:38:53 2013 +0100
+++ b/servlet3/src/main/java/digilib/servlet/DigilibServletRequest.java	Wed Feb 20 18:49:22 2013 +0100
@@ -192,8 +192,7 @@
             } else if (qs.indexOf(";") > -1) {
                 // ; separator
                 setWithParamString(qs, ";");
-            } else if (request.getParameter("fn") != null || request.getParameter("dw") != null
-                    || request.getParameter("dh") != null) {
+            } else if (qs.indexOf('=') > -1) {
                 // standard '&' parameters
                 setWithParamRequest(request);
             } else {
diff -r 96dfc489e9f3 -r 27e209181cbe webapp/src/main/webapp/ImgInfo-json.jsp
--- a/webapp/src/main/webapp/ImgInfo-json.jsp	Tue Feb 19 20:38:53 2013 +0100
+++ b/webapp/src/main/webapp/ImgInfo-json.jsp	Wed Feb 20 18:49:22 2013 +0100
@@ -1,6 +1,5 @@
 <%@page language="java" 
-	import="digilib.io.FileOps, digilib.io.ImageFileSet, digilib.io.ImageFile, 
-	digilib.util.ImageSize, digilib.servlet.DigilibConfiguration"
+	import="digilib.io.FileOps, digilib.io.ImageFileSet, digilib.io.ImageFile, digilib.util.ImageSize, digilib.servlet.DigilibConfiguration"
 	contentType="application/json"%><%!
 // create DocumentBean instance for all JSP requests
 digilib.servlet.DocumentBean docBean = new digilib.servlet.DocumentBean();
@@ -25,7 +24,7 @@
 FileOps.FileClass fc = FileOps.FileClass.IMAGE;
 ImageFileSet imgFile = (ImageFileSet) dirCache.getFile(dlRequest.getFilePath(), dlRequest.getAsInt("pn"), fc);
 
-%>{ <% 
+%>{<%
     if (imgFile != null) {
         imgFile.checkMeta();
 		ImageFile img = (ImageFile) imgFile.getBiggest();
diff -r 96dfc489e9f3 -r 27e209181cbe webapp/src/main/webapp/jquery/jquery.digilib.js
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Tue Feb 19 20:38:53 2013 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Wed Feb 20 18:49:22 2013 +0100
@@ -1097,7 +1097,7 @@
             var imgInfo = data.imgInfo;
             if (mode === 'pixel') {
                 // scaler mo=clip - image area size does not come from ww, wh
-                if (imgInfo != null) {
+                if (imgInfo != null && imgInfo.width != null) {
                     area.width = picrect.width / imgInfo.width;
                     area.height = picrect.height / imgInfo.height;
                 } else {
@@ -1106,7 +1106,7 @@
             }
             if (mode === 'size') {
                 // scaler mo=osize - image area size does not come from ww, wh
-                if (imgInfo != null) {
+                if (imgInfo != null && imgInfo.dpi_x != null) {
                     var ddpi = parseFloat(data.settings.ddpi);
                     area.width = (picrect.width / ddpi) / (imgInfo.width / imgInfo.dpi_x);
                     area.height = (picrect.height / ddpi) / (imgInfo.height / imgInfo.dpi_y);
diff -r 96dfc489e9f3 -r 27e209181cbe webapp/src/main/webapp/server/dlConfig.jsp
--- a/webapp/src/main/webapp/server/dlConfig.jsp	Tue Feb 19 20:38:53 2013 +0100
+++ b/webapp/src/main/webapp/server/dlConfig.jsp	Wed Feb 20 18:49:22 2013 +0100
@@ -1,6 +1,4 @@
-<%@page import="digilib.util.DigilibJobCenter"%>
-<%@ page language="java" %>
-
+<%@page language="java" import="digilib.util.DigilibJobCenter"%>
 <%!
 // authentication stuff - robert
 // -----------------------------