# HG changeset patch
# User robcast
# Date 1299788470 -3600
# Node ID 987cfe40197098890f0da0403c89d8916ce8d5b7
# Parent  5431156f7b9df49e0c6a404680779da329d5d923
add default error message type config.

diff -r 5431156f7b9d -r 987cfe401970 servlet/src/digilib/servlet/DigilibConfiguration.java
--- a/servlet/src/digilib/servlet/DigilibConfiguration.java	Thu Mar 10 10:57:08 2011 +0100
+++ b/servlet/src/digilib/servlet/DigilibConfiguration.java	Thu Mar 10 21:21:10 2011 +0100
@@ -174,6 +174,8 @@
         newParameter("pdf-cache-dir", "pdf_cache", null, 'f');
 		// allow image toolkit to use disk cache
 		newParameter("img-diskcache-allowed", Boolean.TRUE, null, 'f');
+		// default type of error message (image, text, code)
+        newParameter("default-errmsg-type", "image", null, 'f');
 	}
 
 	/**
diff -r 5431156f7b9d -r 987cfe401970 servlet/src/digilib/servlet/Scaler.java
--- a/servlet/src/digilib/servlet/Scaler.java	Thu Mar 10 10:57:08 2011 +0100
+++ b/servlet/src/digilib/servlet/Scaler.java	Thu Mar 10 21:21:10 2011 +0100
@@ -31,7 +31,7 @@
     private static final long serialVersionUID = 5289386646192471549L;
 
     /** digilib servlet version (for all components) */
-    public static final String version = "1.9.1a24";
+    public static final String version = "1.9.1a26";
 
     /** servlet error codes */
     public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};
@@ -39,6 +39,9 @@
     /** type of error message */
     public static enum ErrMsg {IMAGE, TEXT, CODE};
     
+    /** default error message type */
+    public static ErrMsg defaultErrMsgType = ErrMsg.IMAGE;
+    
     /** logger for accounting requests */
     protected static Logger accountlog = Logger.getLogger("account.request");
 
@@ -118,6 +121,11 @@
         notfoundImgFile = ServletOps.getFile(
                 (File) dlConfig.getValue("notfound-image"), context);
         sendFileAllowed = dlConfig.getAsBoolean("sendfile-allowed");
+        try {
+            defaultErrMsgType = ErrMsg.valueOf(dlConfig.getAsString("default-errmsg-type"));
+        } catch (Exception e) {
+            // nothing to do
+        }
     }
 
     /**
@@ -198,8 +206,10 @@
         final ImageJobDescription jobTicket = ImageJobDescription.getInstance(dlRequest, dlConfig);
 
         // type of error reporting
-        ErrMsg errMsgType = ErrMsg.IMAGE;
-        if (dlRequest.hasOption("errtxt")) {
+        ErrMsg errMsgType = defaultErrMsgType;
+        if (dlRequest.hasOption("errimg")) {
+            errMsgType = ErrMsg.IMAGE;
+        } else if (dlRequest.hasOption("errtxt")) {
         	errMsgType = ErrMsg.TEXT;
         } else if (dlRequest.hasOption("errcode")) {
         	errMsgType = ErrMsg.CODE;