Mercurial > hg > digilib-old
changeset 867:987cfe401970 stream
add default error message type config.
author | robcast |
---|---|
date | Thu, 10 Mar 2011 21:21:10 +0100 |
parents | 5431156f7b9d |
children | b9f6e6e1e850 |
files | servlet/src/digilib/servlet/DigilibConfiguration.java servlet/src/digilib/servlet/Scaler.java |
diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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'); } /**
--- 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;