Mercurial > hg > digilib-old

comparison servlet/src/digilib/servlet/Scaler.java @ 570:fd2ef7e46119

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more cleanup, set version to 1.8.2
author robcast
date Tue, 21 Dec 2010 20:24:09 +0100
parents 686086d6e6d6
children 6e8488acb499 beeedf90cb81
comparison
equal deleted inserted replaced
569:1f666c2b4578 570:fd2ef7e46119
17 17
18 import digilib.auth.AuthOpException; 18 import digilib.auth.AuthOpException;
19 import digilib.auth.AuthOps; 19 import digilib.auth.AuthOps;
20 import digilib.image.DocuImage; 20 import digilib.image.DocuImage;
21 import digilib.image.ImageJobDescription; 21 import digilib.image.ImageJobDescription;
22 import digilib.image.ImageOpException;
22 import digilib.image.ImageWorker; 23 import digilib.image.ImageWorker;
23 import digilib.io.DocuDirCache; 24 import digilib.io.DocuDirCache;
24 import digilib.io.DocuDirectory; 25 import digilib.io.DocuDirectory;
25 import digilib.io.DocuDirent; 26 import digilib.io.DocuDirent;
26 import digilib.io.FileOps.FileClass; 27 import digilib.io.FileOps.FileClass;
29 30
30 @SuppressWarnings("serial") 31 @SuppressWarnings("serial")
31 public class Scaler extends HttpServlet { 32 public class Scaler extends HttpServlet {
32 33
33 /** digilib servlet version (for all components) */ 34 /** digilib servlet version (for all components) */
34 public static final String version = "1.9.0a"; 35 public static final String version = "1.8.2a";
35 36
36 /** servlet error codes */ 37 /** servlet error codes */
37 public static enum Error {UNKNOWN, AUTH, FILE, IMAGE}; 38 public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};
38 39
39 /** type of error message */ 40 /** type of error message */
247 // send image 248 // send image
248 ServletOps.sendImage(img, null, response); 249 ServletOps.sendImage(img, null, response);
249 logger.debug("Job Processing Time: " 250 logger.debug("Job Processing Time: "
250 + (System.currentTimeMillis() - startTime) + "ms"); 251 + (System.currentTimeMillis() - startTime) + "ms");
251 252
253 } catch (ImageOpException e) {
254 logger.error(e.getClass() + ": " + e.getMessage());
255 digilibError(errMsgType, Error.IMAGE, null, response);
252 } catch (IOException e) { 256 } catch (IOException e) {
253 logger.error(e.getClass() + ": " + e.getMessage()); 257 logger.error(e.getClass() + ": " + e.getMessage());
254 digilibError(errMsgType, Error.FILE, null, response); 258 digilibError(errMsgType, Error.FILE, null, response);
255 } catch (AuthOpException e) { 259 } catch (AuthOpException e) {
256 logger.error(e.getClass() + ": " + e.getMessage()); 260 logger.error(e.getClass() + ": " + e.getMessage());
304 response.sendError(status, msg); 308 response.sendError(status, msg);
305 } else if (img != null) { 309 } else if (img != null) {
306 // default: image 310 // default: image
307 ServletOps.sendFile(img, null, null, response); 311 ServletOps.sendFile(img, null, null, response);
308 } 312 }
309 } catch (IOException e) { 313 } catch (Exception e) {
310 logger.error("Error sending error!", e); 314 logger.error("Error sending error!", e);
311 } 315 }
312 316
313 } 317 }
314 318