annotate servlet/src/digilib/servlet/Scaler.java @ 335:9bce7008a514

Servlet version 1.5.3b - new getLastModified improves local caching of pages
author robcast
date Wed, 03 Nov 2004 14:22:27 +0100
parents 9db80eb0f50b
children e1c10653f143
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
1 /*
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
2 * Scaler -- Scaler servlet main class
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
3 *
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
4 * Digital Image Library servlet components
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
5 *
303
9db80eb0f50b Servlet version 1.5.1b
robcast
parents: 298
diff changeset
6 * Copyright (C) 200-2004 Robert Casties (robcast@mail.berlios.de)
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
7 *
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
8 * This program is free software; you can redistribute it and/or modify it
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
9 * under the terms of the GNU General Public License as published by the Free
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
10 * Software Foundation; either version 2 of the License, or (at your option)
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
11 * any later version.
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
12 *
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
13 * Please read license.txt for the full details. A copy of the GPL may be found
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
14 * at http://www.gnu.org/copyleft/lgpl.html
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
15 *
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
16 * You should have received a copy of the GNU General Public License along with
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
17 * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
18 * Place, Suite 330, Boston, MA 02111-1307 USA
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
19 *
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
20 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
21
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
22 package digilib.servlet;
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
23
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
24 import java.awt.geom.AffineTransform;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
25 import java.awt.geom.NoninvertibleTransformException;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
26 import java.awt.geom.Rectangle2D;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
27 import java.io.File;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
28 import java.io.IOException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
29 import java.util.List;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
30
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
31 import javax.servlet.ServletConfig;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
32 import javax.servlet.ServletContext;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
33 import javax.servlet.ServletException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
34 import javax.servlet.http.HttpServlet;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
35 import javax.servlet.http.HttpServletRequest;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
36 import javax.servlet.http.HttpServletResponse;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
37
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
38 import org.apache.log4j.Logger;
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
39
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
40 import digilib.auth.AuthOpException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
41 import digilib.auth.AuthOps;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
42 import digilib.image.ImageOpException;
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 275
diff changeset
43 import digilib.image.ImageOps;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
44 import digilib.image.ImageSize;
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
45 import digilib.io.DocuDirCache;
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
46 import digilib.io.DocuDirectory;
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
47 import digilib.io.DocuDirent;
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
48 import digilib.io.FileOpException;
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
49 import digilib.io.FileOps;
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
50 import digilib.io.ImageFile;
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
51 import digilib.io.ImageFileset;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
52
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
53 /**
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
54 * @author casties
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
55 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
56 //public class Scaler extends HttpServlet implements SingleThreadModel {
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
57 public class Scaler extends HttpServlet {
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
58
263
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
59 private static final long serialVersionUID = -325080527268912852L;
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
60
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
61 /** digilib servlet version (for all components) */
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
62 public static final String dlVersion = "1.5.3b";
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
63
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
64 /** logger for accounting requests */
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
65 private static Logger accountlog = Logger.getLogger("account.request");
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
66
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
67 /** gengeral logger for this class */
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
68 private static Logger logger = Logger.getLogger("digilib.servlet");
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
69
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
70 /** logger for authentication related */
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
71 private static Logger authlog = Logger.getLogger("digilib.auth");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
72
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
73 /** general error code */
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
74 public static final int ERROR_UNKNOWN = 0;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
75
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
76 /** error code for authentication error */
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
77 public static final int ERROR_AUTH = 1;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
78
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
79 /** error code for file operation error */
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
80 public static final int ERROR_FILE = 2;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
81
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
82 /** error code for image operation error */
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
83 public static final int ERROR_IMAGE = 3;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
84
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
85 /** DocuDirCache instance */
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
86 DocuDirCache dirCache;
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
87
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
88 /** authentication error image file */
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
89 File denyImgFile;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
90
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
91 /** image error image file */
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
92 File errorImgFile;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
93
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
94 /** subsampling before scaling */
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
95 float minSubsample = 2f;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
96
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
97 /** send files as is? */
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
98 boolean sendFileAllowed = true;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
99
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
100 /** default scaling quality */
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
101 int defaultQuality = 1;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
102
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
103 /** DigilibConfiguration instance */
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
104 DigilibConfiguration dlConfig;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
105
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
106 /** use authorization database */
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
107 boolean useAuthorization = true;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
108
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
109 /** AuthOps instance */
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
110 AuthOps authOp;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
111
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
112 // EXPRIMENTAL
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
113 /** try to enlarge cropping area for "oblique" angles */
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
114 boolean wholeRotArea = false;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
115
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
116 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
117 * Initialisation on first run.
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
118 *
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
119 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
120 */
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
121 public void init(ServletConfig config) throws ServletException {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
122 super.init(config);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
123
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
124 System.out
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
125 .println("***** Digital Image Library Image Scaler Servlet (version "
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
126 + dlVersion + ") *****");
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
127 // say hello in the log file
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
128 logger
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
129 .info("***** Digital Image Library Image Scaler Servlet (version "
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
130 + dlVersion + ") *****");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
131
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
132 // get our ServletContext
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
133 ServletContext context = config.getServletContext();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
134 // see if there is a Configuration instance
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
135 dlConfig = (DigilibConfiguration) context
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
136 .getAttribute("digilib.servlet.configuration");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
137 if (dlConfig == null) {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
138 // no Configuration
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
139 throw new ServletException("No Configuration!");
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
140 }
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
141 // set our AuthOps
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
142 useAuthorization = dlConfig.getAsBoolean("use-authorization");
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
143 authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
144
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
145 // DocuDirCache instance
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
146 dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
147 denyImgFile = (File) dlConfig.getValue("denied-image");
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
148 errorImgFile = (File) dlConfig.getValue("error-image");
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
149 sendFileAllowed = dlConfig.getAsBoolean("sendfile-allowed");
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
150 minSubsample = dlConfig.getAsFloat("subsample-minimum");
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
151 defaultQuality = dlConfig.getAsInt("default-quality");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
152 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
153
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
154 /** Process the HTTP Get request */
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
155 public void doGet(HttpServletRequest request, HttpServletResponse response)
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
156 throws ServletException, IOException {
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
157 accountlog.info("GET from " + request.getRemoteAddr());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
158 // create new request with defaults
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
159 DigilibRequest dlReq = new DigilibRequest();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
160 // set with request parameters
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
161 dlReq.setWithRequest(request);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
162 // add DigilibRequest to ServletRequest
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
163 request.setAttribute("digilib.servlet.request", dlReq);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
164 // do the processing
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
165 processRequest(request, response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
166 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
167
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
168 /** Process the HTTP Post request */
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
169 public void doPost(HttpServletRequest request, HttpServletResponse response)
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
170 throws ServletException, IOException {
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
171 accountlog.info("POST from " + request.getRemoteAddr());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
172 // create new request with defaults
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
173 DigilibRequest dlReq = new DigilibRequest();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
174 // set with request parameters
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
175 dlReq.setWithRequest(request);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
176 // add DigilibRequest to ServletRequest
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
177 request.setAttribute("digilib.servlet.request", dlReq);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
178 // do the processing
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
179 processRequest(request, response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
180 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
181
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
182 /*
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
183 * (non-Javadoc)
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
184 *
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
185 * @see javax.servlet.http.HttpServlet#getLastModified(javax.servlet.http.HttpServletRequest)
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
186 */
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
187 protected long getLastModified(HttpServletRequest request) {
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
188 accountlog.debug("GetLastModified from " + request.getRemoteAddr());
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
189 long mtime = -1;
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
190 // create new request with defaults
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
191 DigilibRequest dlReq = new DigilibRequest();
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
192 // set with request parameters
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
193 dlReq.setWithRequest(request);
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
194 // find the requested file
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
195 DocuDirent f = findFile(dlReq);
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
196 if (f != null) {
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
197 DocuDirectory dd = (DocuDirectory) f.getParent();
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
198 mtime = dd.getDirMTime() / 1000 * 1000;
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
199 }
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
200 logger.debug("last modified: "+mtime);
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
201 return mtime;
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
202 }
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
203
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
204 /** main request handler. */
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
205 void processRequest(HttpServletRequest request, HttpServletResponse response)
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
206 throws ServletException {
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
207
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
208 if (dlConfig == null) {
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
209 throw new ServletException("ERROR: No Configuration!");
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
210 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
211
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
212 accountlog.debug("request: " + request.getQueryString());
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
213 logger.debug("request: " + request.getQueryString());
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
214
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
215 // time for benchmarking
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
216 long startTime = System.currentTimeMillis();
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
217 // output mime-type
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
218 String mimeType = "image/png";
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
219
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
220 /* parameters for a session */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
221
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
222 // scale the image file to fit window size i.e. respect dw,dh
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
223 boolean scaleToFit = true;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
224 // scale the image by a fixed factor only
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
225 boolean absoluteScale = false;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
226 // only crop the image to fit
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
227 boolean cropToFit = false;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
228 // send the file as is
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
229 boolean sendFile = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
230 // use low resolution images only
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
231 boolean loresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
232 // use hires images only
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
233 boolean hiresOnly = false;
303
9db80eb0f50b Servlet version 1.5.1b
robcast
parents: 298
diff changeset
234 // send the image always as JPEG
9db80eb0f50b Servlet version 1.5.1b
robcast
parents: 298
diff changeset
235 boolean forceJPEG = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
236 // interpolation to use for scaling
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
237 int scaleQual = defaultQuality;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
238 // send html error message (or image file)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
239 boolean errorMsgHtml = false;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
240 // mirror the image
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
241 boolean doMirror = false;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
242 // angle of mirror axis
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
243 float mirrorAngle = 0;
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
244 // original (hires) image resolution
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
245 float origResX = 0;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
246 float origResY = 0;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
247
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
248 /* request parameters */
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
249
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
250 DigilibRequest dlRequest = (DigilibRequest) request
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
251 .getAttribute("digilib.servlet.request");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
252
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
253 // destination image width
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
254 int paramDW = dlRequest.getAsInt("dw");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
255 // destination image height
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
256 int paramDH = dlRequest.getAsInt("dh");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
257 // relative area x_offset (0..1)
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
258 float paramWX = dlRequest.getAsFloat("wx");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
259 // relative area y_offset
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
260 float paramWY = dlRequest.getAsFloat("wy");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
261 // relative area width (0..1)
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
262 float paramWW = dlRequest.getAsFloat("ww");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
263 // relative area height
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
264 float paramWH = dlRequest.getAsFloat("wh");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
265 // scale factor (additional to dw/width, dh/height)
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
266 float paramWS = dlRequest.getAsFloat("ws");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
267 // rotation angle
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
268 float paramROT = dlRequest.getAsFloat("rot");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
269 // contrast enhancement
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
270 float paramCONT = dlRequest.getAsFloat("cont");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
271 // brightness enhancement
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
272 float paramBRGT = dlRequest.getAsFloat("brgt");
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
273 // color modification
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
274 float[] paramRGBM = null;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
275 Parameter p = dlRequest.get("rgbm");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
276 if (p.hasValue() && (!p.getAsString().equals("0/0/0"))) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
277 paramRGBM = p.parseAsFloatArray("/");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
278 }
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
279 float[] paramRGBA = null;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
280 p = dlRequest.get("rgba");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
281 if (p.hasValue() && (!p.getAsString().equals("0/0/0"))) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
282 paramRGBA = p.parseAsFloatArray("/");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
283 }
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
284 // destination resolution (DPI)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
285 float paramDDPIX = dlRequest.getAsFloat("ddpix");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
286 float paramDDPIY = dlRequest.getAsFloat("ddpiy");
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
287 if ((paramDDPIX == 0) || (paramDDPIY == 0)) {
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
288 // if X or Y resolution isn't set, use DDPI
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
289 paramDDPIX = dlRequest.getAsFloat("ddpi");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
290 paramDDPIY = paramDDPIX;
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
291 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
292
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
293 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
294 * operation mode: "fit": always fit to page, "clip": send original
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
295 * resolution cropped, "file": send whole file (if allowed)
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
296 */
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
297 if (dlRequest.hasOption("mo", "clip")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
298 scaleToFit = false;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
299 absoluteScale = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
300 cropToFit = true;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
301 sendFile = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
302 hiresOnly = true;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
303 } else if (dlRequest.hasOption("mo", "fit")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
304 scaleToFit = true;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
305 absoluteScale = false;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
306 cropToFit = false;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
307 sendFile = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
308 hiresOnly = false;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
309 } else if (dlRequest.hasOption("mo", "osize")) {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
310 scaleToFit = false;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
311 absoluteScale = true;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
312 cropToFit = false;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
313 sendFile = false;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
314 hiresOnly = true;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
315 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
316 // operation mode: "lores": try to use scaled image, "hires": use
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
317 // unscaled image
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
318 // "autores": try best fitting resolution
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
319 if (dlRequest.hasOption("mo", "lores")) {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
320 loresOnly = true;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
321 hiresOnly = false;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
322 } else if (dlRequest.hasOption("mo", "hires")) {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
323 loresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
324 hiresOnly = true;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
325 } else if (dlRequest.hasOption("mo", "autores")) {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
326 loresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
327 hiresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
328 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
329 // operation mode: "errtxt": error message in html, "errimg": error
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
330 // image
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
331 if (dlRequest.hasOption("mo", "errtxt")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
332 errorMsgHtml = true;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
333 } else if (dlRequest.hasOption("mo", "errimg")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
334 errorMsgHtml = false;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
335 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
336 // operation mode: "q0" - "q2": interpolation quality
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
337 if (dlRequest.hasOption("mo", "q0")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
338 scaleQual = 0;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
339 } else if (dlRequest.hasOption("mo", "q1")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
340 scaleQual = 1;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
341 } else if (dlRequest.hasOption("mo", "q2")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
342 scaleQual = 2;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
343 }
303
9db80eb0f50b Servlet version 1.5.1b
robcast
parents: 298
diff changeset
344 // operation mode: "jpg": always use JPEG
9db80eb0f50b Servlet version 1.5.1b
robcast
parents: 298
diff changeset
345 if (dlRequest.hasOption("mo", "jpg")) {
9db80eb0f50b Servlet version 1.5.1b
robcast
parents: 298
diff changeset
346 forceJPEG = true;
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
347 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
348
185
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
349 // check with the maximum allowed size (if set)
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
350 int maxImgSize = dlConfig.getAsInt("max-image-size");
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
351 if (maxImgSize > 0) {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
352 paramDW = (paramDW * paramWS > maxImgSize) ? (int) (maxImgSize / paramWS)
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
353 : paramDW;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
354 paramDH = (paramDH * paramWS > maxImgSize) ? (int) (maxImgSize / paramWS)
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
355 : paramDH;
185
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
356 }
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
357
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
358 //"big" try for all file/image actions
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
359 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
360
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
361 // ImageFileset of the image to load
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
362 ImageFileset fileset = null;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
363
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
364 /* find the file to load/send */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
365
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
366 // get PathInfo
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
367 String loadPathName = dlRequest.getFilePath();
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
368
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
369 /* check permissions */
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
370 if (useAuthorization) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
371 // get a list of required roles (empty if no restrictions)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
372 List rolesRequired = authOp.rolesForPath(loadPathName, request);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
373 if (rolesRequired != null) {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
374 authlog.debug("Role required: " + rolesRequired);
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
375 authlog.debug("User: " + request.getRemoteUser());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
376 // is the current request/user authorized?
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
377 if (!authOp.isRoleAuthorized(rolesRequired, request)) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
378 // send deny answer and abort
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
379 throw new AuthOpException();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
380 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
381 }
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
382 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
383
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
384 // find the file
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
385 fileset = (ImageFileset) findFile(dlRequest);
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
386 if (fileset == null) {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
387 throw new FileOpException("File " + loadPathName + "("
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
388 + dlRequest.getAsInt("pn") + ") not found.");
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
389 }
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
390
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
391 /* calculate expected source image size */
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
392 ImageSize expectedSourceSize = new ImageSize();
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
393 if (scaleToFit) {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
394 float scale = (1 / Math.min(paramWW, paramWH)) * paramWS;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
395 expectedSourceSize.setSize((int) (paramDW * scale),
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
396 (int) (paramDH * scale));
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
397 } else {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
398 expectedSourceSize.setSize((int) (paramDW * paramWS),
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
399 (int) (paramDH * paramWS));
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
400 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
401
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
402 ImageFile fileToLoad;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
403 /* select a resolution */
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
404 if (hiresOnly) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
405 // get first element (= highest resolution)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
406 fileToLoad = fileset.getBiggest();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
407 } else if (loresOnly) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
408 // enforced lores uses next smaller resolution
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
409 fileToLoad = fileset.getNextSmaller(expectedSourceSize);
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
410 if (fileToLoad == null) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
411 // this is the smallest we have
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
412 fileToLoad = fileset.getSmallest();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
413 }
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
414 } else {
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
415 // autores: use next higher resolution
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
416 fileToLoad = fileset.getNextBigger(expectedSourceSize);
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
417 if (fileToLoad == null) {
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
418 // this is the highest we have
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
419 fileToLoad = fileset.getBiggest();
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
420 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
421 }
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
422 logger.info("Planning to load: " + fileToLoad.getFile());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
423
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
424 /*
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
425 * send the image if its mo=(raw)file
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
426 */
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
427 if (dlRequest.hasOption("mo", "file")
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
428 || dlRequest.hasOption("mo", "rawfile")) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
429 if (sendFileAllowed) {
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
430 String mt = null;
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
431 if (dlRequest.hasOption("mo", "rawfile")) {
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
432 mt = "application/octet-stream";
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
433 }
263
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
434 logger.debug("Sending RAW File as is.");
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
435 ServletOps.sendFile(fileToLoad.getFile(), mt, response);
263
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
436 logger.info("Done in "
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
437 + (System.currentTimeMillis() - startTime) + "ms");
263
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
438 return;
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
439 }
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
440 }
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
441
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
442 // check the source image
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
443 if (!fileToLoad.isChecked()) {
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 275
diff changeset
444 ImageOps.checkFile(fileToLoad);
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
445 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
446 // get the source image type
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
447 mimeType = fileToLoad.getMimetype();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
448 // get the source image size
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
449 ImageSize imgSize = fileToLoad.getSize();
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
450
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
451 // decide if the image can be sent as is
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
452 boolean mimetypeSendable = mimeType.equals("image/jpeg")
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
453 || mimeType.equals("image/png")
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
454 || mimeType.equals("image/gif");
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
455 boolean imagoOptions = dlRequest.hasOption("mo", "hmir")
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
456 || dlRequest.hasOption("mo", "vmir") || (paramROT != 0)
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
457 || (paramRGBM != null) || (paramRGBA != null)
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
458 || (paramCONT != 0) || (paramBRGT != 0);
139
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
459 boolean imageSendable = mimetypeSendable && !imagoOptions;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
460
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
461 /*
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
462 * if not autoRes and image smaller than requested size then send as
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
463 * is. if autoRes and image has requested size then send as is. if
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
464 * not autoScale and not scaleToFit nor cropToFit then send as is
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
465 * (mo=file)
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
466 */
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
467 if (imageSendable
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
468 && ((loresOnly && fileToLoad.getSize().isSmallerThan(
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
469 expectedSourceSize)) || (!(loresOnly || hiresOnly) && fileToLoad
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
470 .getSize().fitsIn(expectedSourceSize)))) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
471
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
472 logger.debug("Sending File as is.");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
473
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
474 ServletOps.sendFile(fileToLoad.getFile(), null, response);
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
475
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
476 logger.info("Done in "
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
477 + (System.currentTimeMillis() - startTime) + "ms");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
478 return;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
479 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
480
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
481 // set missing dw or dh from aspect ratio
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
482 float imgAspect = fileToLoad.getAspect();
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
483 if (paramDW == 0) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
484 paramDW = (int) Math.round(paramDH * imgAspect);
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
485 } else if (paramDH == 0) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
486 paramDH = (int) Math.round(paramDW / imgAspect);
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
487 }
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
488
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
489 /*
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
490 * prepare resolution for original size
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
491 */
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
492 if (absoluteScale) {
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
493 // get original resolution from metadata
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
494 fileset.checkMeta();
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
495 origResX = fileset.getResX();
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
496 origResY = fileset.getResY();
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
497 if ((origResX == 0) || (origResY == 0)) {
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
498 throw new ImageOpException("Missing image DPI information!");
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
499 }
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
500
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
501 if ((paramDDPIX == 0) || (paramDDPIY == 0)) {
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
502 throw new ImageOpException(
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
503 "Missing display DPI information!");
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
504 }
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
505 }
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
506
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
507 /* crop and scale the image */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
508
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
509 logger.debug("IMG: " + imgSize.getWidth() + "x"
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
510 + imgSize.getHeight());
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
511 logger.debug("time " + (System.currentTimeMillis() - startTime)
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
512 + "ms");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
513
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
514 // coordinates and scaling
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
515 float areaXoff;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
516 float areaYoff;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
517 float areaWidth;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
518 float areaHeight;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
519 float scaleX;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
520 float scaleY;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
521 float scaleXY;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
522
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
523 // coordinates using Java2D
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
524 // image size in pixels
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
525 Rectangle2D imgBounds = new Rectangle2D.Float(0, 0, imgSize
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
526 .getWidth(), imgSize.getHeight());
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
527 // user window area in [0,1] coordinates
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
528 Rectangle2D relUserArea = new Rectangle2D.Float(paramWX, paramWY,
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
529 paramWW, paramWH);
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
530 // transform from relative [0,1] to image coordinates.
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
531 AffineTransform imgTrafo = AffineTransform.getScaleInstance(imgSize
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
532 .getWidth(), imgSize.getHeight());
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
533 // transform user coordinate area to image coordinate area
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
534 Rectangle2D userImgArea = imgTrafo.createTransformedShape(
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
535 relUserArea).getBounds2D();
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
536
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
537 // calculate scaling factors based on inner user area
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
538 if (scaleToFit) {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
539 areaWidth = (float) userImgArea.getWidth();
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
540 areaHeight = (float) userImgArea.getHeight();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
541 scaleX = paramDW / areaWidth * paramWS;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
542 scaleY = paramDH / areaHeight * paramWS;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
543 scaleXY = (scaleX > scaleY) ? scaleY : scaleX;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
544 } else if (absoluteScale) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
545 // absolute scale
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
546 scaleX = paramDDPIX / origResX;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
547 scaleY = paramDDPIY / origResY;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
548 // currently only same scale :-(
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
549 scaleXY = scaleX;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
550 areaWidth = paramDW / scaleXY * paramWS;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
551 areaHeight = paramDH / scaleXY * paramWS;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
552 // reset user area size
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
553 userImgArea.setRect(userImgArea.getX(), userImgArea.getY(),
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
554 areaWidth, areaHeight);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
555 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
556 // crop to fit
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
557 areaWidth = paramDW * paramWS;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
558 areaHeight = paramDH * paramWS;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
559 // reset user area size
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
560 userImgArea.setRect(userImgArea.getX(), userImgArea.getY(),
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
561 areaWidth, areaHeight);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
562 scaleX = 1f;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
563 scaleY = 1f;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
564 scaleXY = 1f;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
565 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
566
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
567 // enlarge image area for rotations to cover additional pixels
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
568 Rectangle2D outerUserImgArea = userImgArea;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
569 Rectangle2D innerUserImgArea = userImgArea;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
570 if (wholeRotArea) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
571 if (paramROT != 0) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
572 try {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
573 // rotate user area coordinates around center of user
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
574 // area
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
575 AffineTransform rotTrafo = AffineTransform
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
576 .getRotateInstance(Math.toRadians(paramROT),
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
577 userImgArea.getCenterX(), userImgArea
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
578 .getCenterY());
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
579 // get bounds from rotated end position
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
580 innerUserImgArea = rotTrafo.createTransformedShape(
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
581 userImgArea).getBounds2D();
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
582 // get bounds from back-rotated bounds
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
583 outerUserImgArea = rotTrafo.createInverse()
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
584 .createTransformedShape(innerUserImgArea)
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
585 .getBounds2D();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
586 } catch (NoninvertibleTransformException e1) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
587 // this shouldn't happen anyway
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
588 logger.error(e1);
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
589 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
590 }
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
591 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
592
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
593 logger.debug("Scale " + scaleXY + "(" + scaleX + "," + scaleY
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
594 + ") on " + outerUserImgArea);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
595
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
596 // clip area at the image border
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
597 outerUserImgArea = outerUserImgArea.createIntersection(imgBounds);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
598
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
599 // check image parameters sanity
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
600 if ((outerUserImgArea.getWidth() < 1)
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
601 || (outerUserImgArea.getHeight() < 1)
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
602 || (scaleXY * outerUserImgArea.getWidth() < 2)
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
603 || (scaleXY * outerUserImgArea.getHeight() < 2)) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
604 logger.error("ERROR: invalid scale parameter set!");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
605 throw new ImageOpException("Invalid scale parameter set!");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
606 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
607
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
608 /*
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
609 * submit the image worker job
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
610 */
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
611
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
612 DigilibWorker job = new DigilibImageWorker(dlConfig, response,
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
613 mimeType, scaleQual, dlRequest, paramROT, paramCONT,
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
614 paramBRGT, paramRGBM, paramRGBA, fileToLoad, scaleXY,
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
615 outerUserImgArea, innerUserImgArea, minSubsample,
303
9db80eb0f50b Servlet version 1.5.1b
robcast
parents: 298
diff changeset
616 wholeRotArea, forceJPEG);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
617
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
618 job.run();
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
619 if (job.hasError()) {
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
620 throw new ImageOpException(job.getError().toString());
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
621 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
622
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
623 logger.debug("servlet done in "
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
624 + (System.currentTimeMillis() - startTime));
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
625
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
626 /* error handling */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
627
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
628 } // end of "big" try
156
688ad0b8b0fa Servlet version 1.16a2
robcast
parents: 153
diff changeset
629 catch (IOException e) {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
630 logger.error("ERROR: File IO Error: " + e);
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
631 digilibError(errorMsgHtml, ERROR_FILE,
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
632 "ERROR: File IO Error: " + e, response);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
633 } catch (AuthOpException e) {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
634 logger.error("ERROR: Authorization error: " + e);
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
635 digilibError(errorMsgHtml, ERROR_AUTH,
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
636 "ERROR: Authorization error: " + e, response);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
637 } catch (ImageOpException e) {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
638 logger.error("ERROR: Image Error: " + e);
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
639 digilibError(errorMsgHtml, ERROR_IMAGE,
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
640 "ERROR: Image Operation Error: " + e, response);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
641 } catch (RuntimeException e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
642 // JAI likes to throw RuntimeExceptions ;-(
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
643 logger.error("ERROR: Other Image Error: " + e);
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
644 digilibError(errorMsgHtml, ERROR_IMAGE,
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
645 "ERROR: Other Image Operation Error: " + e, response);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
646 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
647 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
648
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
649 /**
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
650 * Returns the DocuDirent corresponding to the DigilibRequest.
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
651 *
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
652 * @param dlRequest
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
653 * @return
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
654 */
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
655 public DocuDirent findFile(DigilibRequest dlRequest) {
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
656 // find the file(set)
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
657 DocuDirent f = dirCache.getFile(dlRequest.getFilePath(), dlRequest
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
658 .getAsInt("pn"), FileOps.CLASS_IMAGE);
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
659 return f;
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
660 }
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
661
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
662 /**
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
663 * Sends an error to the client as text or image.
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
664 *
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
665 * @param asHTML
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
666 * @param type
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
667 * @param msg
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
668 * @param response
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
669 */
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
670 public void digilibError(boolean asHTML, int type, String msg,
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
671 HttpServletResponse response) {
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
672 try {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
673 File img = null;
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
674 if (type == ERROR_AUTH) {
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
675 if (msg == null) {
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
676 msg = "ERROR: Unauthorized access!";
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
677 }
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
678 img = denyImgFile;
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
679 } else {
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
680 if (msg == null) {
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
681 msg = "ERROR: Other image error!";
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
682 }
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
683 img = this.errorImgFile;
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
684 }
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
685 if (asHTML && (img != null)) {
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
686 ServletOps.htmlMessage(msg, response);
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
687 } else {
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
688 ServletOps.sendFile(img, null, response);
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
689 }
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
690 } catch (IOException e) {
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
691 logger.error("Error sending error!", e);
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
692 }
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
693
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
694 }
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
695
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
696 } //Scaler class