Mercurial > hg > digilib-old
comparison servlet/src/digilib/servlet/Scaler.java @ 185:91f28e4fee8f
Servlet version 1.18b2
- added max-image-size parameter for digilib-config
- small fixes for the removal of the digilib.Utils class
author | robcast |
---|---|
date | Tue, 25 Nov 2003 19:26:45 +0100 |
parents | afe7ff98bb71 |
children | 7bb273c51e88 |
comparison
equal
deleted
inserted
replaced
184:754c90861f95 | 185:91f28e4fee8f |
---|---|
57 */ | 57 */ |
58 //public class Scaler extends HttpServlet implements SingleThreadModel { | 58 //public class Scaler extends HttpServlet implements SingleThreadModel { |
59 public class Scaler extends HttpServlet { | 59 public class Scaler extends HttpServlet { |
60 | 60 |
61 // digilib servlet version (for all components) | 61 // digilib servlet version (for all components) |
62 public static final String dlVersion = "1.18b1"; | 62 public static final String dlVersion = "1.18b2"; |
63 | 63 |
64 // logger for accounting requests | 64 // logger for accounting requests |
65 Logger accountlog = Logger.getLogger("account.request"); | 65 Logger accountlog = Logger.getLogger("account.request"); |
66 // gengeral logger for this class | 66 // gengeral logger for this class |
67 Logger logger = Logger.getLogger("digilib.servlet"); | 67 Logger logger = Logger.getLogger("digilib.servlet"); |
68 // logger for authentication related | 68 // logger for authentication related |
69 Logger authlog = Logger.getLogger("digilib.auth"); | 69 Logger authlog = Logger.getLogger("digilib.auth"); |
70 | 70 |
71 | 71 |
72 // FileOps instance | |
73 FileOps fileOp; | |
74 // AuthOps instance | 72 // AuthOps instance |
75 AuthOps authOp; | 73 AuthOps authOp; |
76 // ServletOps instance | |
77 ServletOps servletOp; | |
78 // DocuDirCache instance | 74 // DocuDirCache instance |
79 DocuDirCache dirCache; | 75 DocuDirCache dirCache; |
80 | 76 |
81 // deny image file | 77 // deny image file |
82 File denyImgFile; | 78 File denyImgFile; |
312 scaleQual = 1; | 308 scaleQual = 1; |
313 } else if (dlRequest.hasOption("mo", "q2")) { | 309 } else if (dlRequest.hasOption("mo", "q2")) { |
314 scaleQual = 2; | 310 scaleQual = 2; |
315 } | 311 } |
316 | 312 |
313 // check with the maximum allowed size (if set) | |
314 int maxImgSize = dlConfig.getAsInt("max-image-size"); | |
315 if (maxImgSize > 0) { | |
316 paramDW = (paramDW * paramWS > maxImgSize) ? (int)(maxImgSize / paramWS) : paramDW; | |
317 paramDH = (paramDH * paramWS > maxImgSize) ? (int)(maxImgSize / paramWS) : paramDH; | |
318 } | |
319 | |
317 //"big" try for all file/image actions | 320 //"big" try for all file/image actions |
318 try { | 321 try { |
319 | 322 |
320 // ImageFileset of the image to load | 323 // ImageFileset of the image to load |
321 ImageFileset fileset = null; | 324 ImageFileset fileset = null; |