annotate servlet/src/digilib/servlet/Scaler.java @ 284:c633e97cac12

Servlet version 1.22b1 - more fast searching (hopefully all working now) - some simple synchronisation - some reshuffling of methods to eliminate cruft
author robcast
date Fri, 15 Oct 2004 16:59:47 +0200
parents fba0857fde34
children ffafe3e470fb
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 *
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
6 * Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de)
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.DocuImage;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
43 import digilib.image.ImageOpException;
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 275
diff changeset
44 import digilib.image.ImageOps;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
45 import digilib.image.ImageSize;
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
46 import digilib.io.DocuDirCache;
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
47 import digilib.io.FileOpException;
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
48 import digilib.io.FileOps;
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
49 import digilib.io.ImageFile;
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
50 import digilib.io.ImageFileset;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
51
64
5ea1999befd4 New JAI ImageLoader plugin. Currently uses first beta version of the plugin.
robcast
parents: 62
diff changeset
52 //import tilecachetool.*;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
53
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
54 /**
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
55 * @author casties
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
56 */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
57 //public class Scaler extends HttpServlet implements SingleThreadModel {
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
58 public class Scaler extends HttpServlet {
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
59
263
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
60 private static final long serialVersionUID = -325080527268912852L;
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
61
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
62 // digilib servlet version (for all components)
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 275
diff changeset
63 public static final String dlVersion = "1.22b1";
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
64
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
65 // logger for accounting requests
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
66 Logger accountlog = Logger.getLogger("account.request");
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
67 // gengeral logger for this class
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
68 Logger logger = Logger.getLogger("digilib.servlet");
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
69 // logger for authentication related
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
70 Logger authlog = Logger.getLogger("digilib.auth");
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
71
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
72
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
73 // AuthOps instance
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
74 AuthOps authOp;
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
75 // DocuDirCache instance
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
76 DocuDirCache dirCache;
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
77
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
78 // deny image file
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
79 File denyImgFile;
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
80 // error image file
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
81 File errorImgFile;
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
82 // subsampling before scaling
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
83 float minSubsample = 2f;
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
84 // send files as is?
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
85 boolean sendFileAllowed = true;
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
86 // default scaling quality
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
87 int defaultQuality = 1;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
88
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
89 // DigilibConfiguration instance
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
90 DigilibConfiguration dlConfig;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
91
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
92 // use authorization database
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
93 boolean useAuthentication = true;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
94
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
95 // EXPRIMENTAL
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
96 // try to enlarge cropping area for "oblique" angles
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
97 boolean wholeRotArea = false;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
98
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
99 /**
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
100 * Initialisation on first run.
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
101 *
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
102 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
103 */
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
104 public void init(ServletConfig config) throws ServletException {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
105 super.init(config);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
106
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
107 // Debuggin!
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
108 //TCTool tctool = new TCTool();
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
109
147
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
110 System.out.println(
189
7bb273c51e88 Servlet version 1.18b3 new Raster servlet
robcast
parents: 185
diff changeset
111 "***** Digital Image Library Image Scaler Servlet (version "
147
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
112 + dlVersion
bdd6789d21e0 Fix for sending images that need no scaling.
robcast
parents: 145
diff changeset
113 + ") *****");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
114
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
115 // get our ServletContext
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
116 ServletContext context = config.getServletContext();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
117 // see if there is a Configuration instance
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
118 dlConfig =
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
119 (DigilibConfiguration) context.getAttribute(
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
120 "digilib.servlet.configuration");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
121 if (dlConfig == null) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
122 // create new Configuration
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
123 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
124 dlConfig = new DigilibConfiguration(config);
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
125 context.setAttribute("digilib.servlet.configuration", dlConfig);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
126 } catch (Exception e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
127 throw new ServletException(e);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
128 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
129 }
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
130 // say hello in the log file
189
7bb273c51e88 Servlet version 1.18b3 new Raster servlet
robcast
parents: 185
diff changeset
131 logger.info("***** Digital Image Library Image Scaler Servlet (version "
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
132 + dlVersion
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
133 + ") *****");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
134 // set our AuthOps
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
135 useAuthentication = dlConfig.getAsBoolean("use-authorization");
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
136 // AuthOps instance
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
137 authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
138
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
139 // DocuDirCache instance
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
140 dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
141 denyImgFile = new File(dlConfig.getAsString("denied-image"));
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
142 errorImgFile = new File(dlConfig.getAsString("error-image"));
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
143 sendFileAllowed = dlConfig.getAsBoolean("sendfile-allowed");
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
144 minSubsample = dlConfig.getAsFloat("subsample-minimum");
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
145 defaultQuality = dlConfig.getAsInt("default-quality");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
146 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
147
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
148 /** Process the HTTP Get request */
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
149 public void doGet(HttpServletRequest request, HttpServletResponse response)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
150 throws ServletException, IOException {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
151 accountlog.info("GET from "+request.getRemoteAddr());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
152 // create new request with defaults
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
153 DigilibRequest dlReq = new DigilibRequest();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
154 // set with request parameters
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
155 dlReq.setWithRequest(request);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
156 // add DigilibRequest to ServletRequest
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
157 request.setAttribute("digilib.servlet.request", dlReq);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
158 // do the processing
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
159 processRequest(request, response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
160 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
161
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
162 /** Process the HTTP Post request */
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
163 public void doPost(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
164 HttpServletRequest request,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
165 HttpServletResponse response)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
166 throws ServletException, IOException {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
167 accountlog.info("POST from "+request.getRemoteAddr());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
168 // create new request with defaults
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
169 DigilibRequest dlReq = new DigilibRequest();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
170 // set with request parameters
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
171 dlReq.setWithRequest(request);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
172 // add DigilibRequest to ServletRequest
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
173 request.setAttribute("digilib.servlet.request", dlReq);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
174 // do the processing
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
175 processRequest(request, response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
176 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
177
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
178 /** main request handler. */
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
179 void processRequest(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
180 HttpServletRequest request,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
181 HttpServletResponse response)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
182 throws ServletException, IOException {
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
183
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
184 accountlog.debug("request: "+request.getQueryString());
189
7bb273c51e88 Servlet version 1.18b3 new Raster servlet
robcast
parents: 185
diff changeset
185 logger.debug("request: "+request.getQueryString());
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
186
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
187 // time for benchmarking
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
188 long startTime = System.currentTimeMillis();
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
189 // output mime/type
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
190 String mimeType = "image/png";
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
191
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
192 /* parameters for a session */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
193
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
194 // scale the image file to fit window size i.e. respect dw,dh
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
195 boolean scaleToFit = true;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
196 // scale the image by a fixed factor only
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
197 boolean absoluteScale = false;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
198 // only crop the image to fit
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
199 boolean cropToFit = false;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
200 // send the file as is
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
201 boolean sendFile = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
202 // use low resolution images only
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
203 boolean loresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
204 // use hires images only
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
205 boolean hiresOnly = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
206 // interpolation to use for scaling
153
4980c969be4c Servlet version 1.16a1
robcast
parents: 151
diff changeset
207 int scaleQual = defaultQuality;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
208 // send html error message (or image file)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
209 boolean errorMsgHtml = false;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
210 // mirror the image
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
211 boolean doMirror = false;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
212 // angle of mirror axis
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
213 double mirrorAngle = 0;
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
214 // original (hires) image resolution
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
215 double origResX = 0;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
216 double origResY = 0;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
217
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
218 /* request parameters */
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
219
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
220 DigilibRequest dlRequest =
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
221 (DigilibRequest) request.getAttribute("digilib.servlet.request");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
222
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
223 // destination image width
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
224 int paramDW = dlRequest.getAsInt("dw");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
225 // destination image height
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
226 int paramDH = dlRequest.getAsInt("dh");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
227 // relative area x_offset (0..1)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
228 double paramWX = dlRequest.getAsFloat("wx");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
229 // relative area y_offset
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
230 double paramWY = dlRequest.getAsFloat("wy");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
231 // relative area width (0..1)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
232 double paramWW = dlRequest.getAsFloat("ww");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
233 // relative area height
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
234 double paramWH = dlRequest.getAsFloat("wh");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
235 // scale factor (additional to dw/width, dh/height)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
236 double paramWS = dlRequest.getAsFloat("ws");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
237 // rotation angle
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
238 double paramROT = dlRequest.getAsFloat("rot");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
239 // contrast enhancement
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
240 float paramCONT = dlRequest.getAsFloat("cont");
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
241 // brightness enhancement
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
242 float paramBRGT = dlRequest.getAsFloat("brgt");
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
243 // color modification
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
244 float[] paramRGBM = null;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
245 Parameter p = dlRequest.get("rgbm");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
246 if (p.hasValue() && (!p.getAsString().equals("0/0/0"))) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
247 paramRGBM = p.parseAsFloatArray("/");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
248 }
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
249 float[] paramRGBA = null;
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
250 p = dlRequest.get("rgba");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
251 if (p.hasValue() && (!p.getAsString().equals("0/0/0"))) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
252 paramRGBA = p.parseAsFloatArray("/");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
253 }
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
254 // destination resolution (DPI)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
255 float paramDDPIX = dlRequest.getAsFloat("ddpix");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
256 float paramDDPIY = dlRequest.getAsFloat("ddpiy");
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
257 if ((paramDDPIX == 0) || (paramDDPIY == 0)) {
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
258 // 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
259 paramDDPIX = dlRequest.getAsFloat("ddpi");
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
260 paramDDPIY = paramDDPIX;
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
261 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
262
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
263 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
264 * operation mode: "fit": always fit to page, "clip": send original
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
265 * resolution cropped, "file": send whole file (if allowed)
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
266 */
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
267 if (dlRequest.hasOption("mo", "clip")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
268 scaleToFit = false;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
269 absoluteScale = false;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
270 cropToFit = true;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
271 sendFile = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
272 hiresOnly = true;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
273 } else if (dlRequest.hasOption("mo", "fit")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
274 scaleToFit = true;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
275 absoluteScale = false;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
276 cropToFit = false;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
277 sendFile = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
278 hiresOnly = false;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
279 } else if (dlRequest.hasOption("mo", "osize")) {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
280 scaleToFit = false;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
281 absoluteScale = true;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
282 cropToFit = false;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
283 sendFile = false;
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
284 hiresOnly = true;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
285 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
286 // operation mode: "lores": try to use scaled image, "hires": use
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
287 // unscaled image
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
288 // "autores": try best fitting resolution
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
289 if (dlRequest.hasOption("mo", "lores")) {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
290 loresOnly = true;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
291 hiresOnly = false;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
292 } else if (dlRequest.hasOption("mo", "hires")) {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
293 loresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
294 hiresOnly = true;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
295 } else if (dlRequest.hasOption("mo", "autores")) {
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
296 loresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
297 hiresOnly = false;
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
298 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
299 // operation mode: "errtxt": error message in html, "errimg": error
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
300 // image
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
301 if (dlRequest.hasOption("mo", "errtxt")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
302 errorMsgHtml = true;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
303 } else if (dlRequest.hasOption("mo", "errimg")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
304 errorMsgHtml = false;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
305 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
306 // operation mode: "q0" - "q2": interpolation quality
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
307 if (dlRequest.hasOption("mo", "q0")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
308 scaleQual = 0;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
309 } else if (dlRequest.hasOption("mo", "q1")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
310 scaleQual = 1;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
311 } else if (dlRequest.hasOption("mo", "q2")) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
312 scaleQual = 2;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
313 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
314
185
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
315 // check with the maximum allowed size (if set)
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
316 int maxImgSize = dlConfig.getAsInt("max-image-size");
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
317 if (maxImgSize > 0) {
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
318 paramDW = (paramDW * paramWS > maxImgSize) ? (int)(maxImgSize / paramWS) : paramDW;
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
319 paramDH = (paramDH * paramWS > maxImgSize) ? (int)(maxImgSize / paramWS) : paramDH;
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
320 }
91f28e4fee8f Servlet version 1.18b2
robcast
parents: 181
diff changeset
321
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
322 //"big" try for all file/image actions
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
323 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
324
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
325 // ImageFileset of the image to load
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
326 ImageFileset fileset = null;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
327
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
328 /* find the file to load/send */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
329
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
330 // get PathInfo
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
331 String loadPathName = dlRequest.getFilePath();
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
332
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
333 /* check permissions */
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
334 if (useAuthentication) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
335 // get a list of required roles (empty if no restrictions)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
336 List rolesRequired = authOp.rolesForPath(loadPathName, request);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
337 if (rolesRequired != null) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
338 authlog.info("Role required: " + rolesRequired);
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
339 authlog.info("User: " + request.getRemoteUser());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
340 // is the current request/user authorized?
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
341 if (!authOp.isRoleAuthorized(rolesRequired, request)) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
342 // send deny answer and abort
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
343 authlog.error("ERROR: access denied!");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
344 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
345 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
346 "ERROR: Unauthorized access!",
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
347 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
348 } else {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
349 ServletOps.sendFile(denyImgFile, null, response);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
350 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
351 return;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
352 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
353 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
354 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
355
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
356 // find the file(set)
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
357 ImageFile fileToLoad;
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
358 fileset =
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
359 (ImageFileset) dirCache.getFile(
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
360 loadPathName,
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
361 dlRequest.getAsInt("pn"),
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
362 FileOps.CLASS_IMAGE);
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
363 if (fileset == null) {
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
364 throw new FileOpException(
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
365 "File "
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
366 + loadPathName
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
367 + "("
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
368 + dlRequest.getAsInt("pn")
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
369 + ") not found.");
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
370 }
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
371
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
372 /* calculate expected source image size */
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
373 ImageSize expectedSourceSize = new ImageSize();
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
374 if (scaleToFit) {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
375 double scale = (1 / Math.min(paramWW, paramWH)) * paramWS;
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
376 expectedSourceSize.setSize(
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
377 (int) (paramDW * scale),
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
378 (int) (paramDH * scale));
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
379 } else {
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
380 expectedSourceSize.setSize(
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
381 (int) (paramDW * paramWS),
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
382 (int) (paramDH * paramWS));
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
383 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
384
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
385 /* select a resolution */
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
386 if (hiresOnly) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
387 // get first element (= highest resolution)
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
388 fileToLoad = fileset.getBiggest();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
389 } else if (loresOnly) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
390 // enforced lores uses next smaller resolution
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
391 fileToLoad =
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 275
diff changeset
392 fileset.getNextSmaller(expectedSourceSize);
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
393 if (fileToLoad == null) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
394 // this is the smallest we have
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
395 fileToLoad = fileset.getSmallest();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
396 }
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
397 } else {
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
398 // autores: use next higher resolution
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
399 fileToLoad =
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 275
diff changeset
400 fileset.getNextBigger(expectedSourceSize);
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
401 if (fileToLoad == null) {
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
402 // this is the highest we have
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
403 fileToLoad = fileset.getBiggest();
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
404 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
405 }
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
406 logger.info("Loading: " + fileToLoad.getFile());
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
407
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
408 /*
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
409 * send the image if its mo=(raw)file
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
410 */
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
411 if (dlRequest.hasOption("mo", "file")
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
412 || dlRequest.hasOption("mo", "rawfile")) {
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
413 if (sendFileAllowed) {
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
414 String mt = null;
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
415 if (dlRequest.hasOption("mo", "rawfile")) {
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
416 mt = "application/octet-stream";
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
417 }
263
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
418 logger.debug("Sending RAW File as is.");
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
419 ServletOps.sendFile(fileToLoad.getFile(), mt, response);
263
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
420 logger.info("Done in "
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
421 + (System.currentTimeMillis() - startTime)
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
422 + "ms");
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
423 return;
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
424 }
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
425 }
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
426
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
427 /*
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
428 * prepare resolution for original size
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
429 */
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
430 if (absoluteScale) {
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
431 // get original resolution from metadata
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
432 fileset.checkMeta();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
433 origResX = fileset.getResX();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
434 origResY = fileset.getResY();
139
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
435 if ((origResX == 0) || (origResY == 0)) {
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
436 throw new ImageOpException("Missing image DPI information!");
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
437 }
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
438
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
439 if ((paramDDPIX == 0) || (paramDDPIY == 0)) {
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
440 throw new ImageOpException("Missing display DPI information!");
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
441 }
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
442 }
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
443
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
444 // check the source image
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
445 if (!fileToLoad.isChecked()) {
284
c633e97cac12 Servlet version 1.22b1
robcast
parents: 275
diff changeset
446 ImageOps.checkFile(fileToLoad);
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
447 }
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
448 // get the source image type
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
449 mimeType = fileToLoad.getMimetype();
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
450 // get the source image size
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
451 ImageSize imgSize = fileToLoad.getSize();
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
452
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
453 // decide if the image can be sent as is
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
454 boolean mimetypeSendable =
122
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
455 mimeType.equals("image/jpeg")
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
456 || mimeType.equals("image/png")
a32e8c80e2f2 Servlet Version 1.10b1
robcast
parents: 116
diff changeset
457 || mimeType.equals("image/gif");
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
458 boolean imagoOptions =
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
459 dlRequest.hasOption("mo", "hmir")
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
460 || dlRequest.hasOption("mo", "vmir")
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
461 || (paramROT != 0)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
462 || (paramRGBM != null)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
463 || (paramRGBA != null)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
464 || (paramCONT != 0)
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
465 || (paramBRGT != 0);
139
11cfe4c89fdc Servlet version 1.11b1 with improved original-size.
robcast
parents: 130
diff changeset
466 boolean imageSendable = mimetypeSendable && !imagoOptions;
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
467
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
468 /*
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
469 * if not autoRes and image smaller than requested size then send
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
470 * as is. if autoRes and image has requested size then send as is.
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
471 * if not autoScale and not scaleToFit nor cropToFit then send as
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
472 * is (mo=file)
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
473 */
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
474 if (imageSendable
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
475 && ((loresOnly
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
476 && fileToLoad.getSize().isSmallerThan(expectedSourceSize))
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
477 || (!(loresOnly || hiresOnly)
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
478 && fileToLoad.getSize().fitsIn(expectedSourceSize)))) {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
479
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
480 logger.debug("Sending File as is.");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
481
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
482 ServletOps.sendFile(fileToLoad.getFile(), null, response);
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
483
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
484 logger.info("Done in "
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
485 + (System.currentTimeMillis() - startTime)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
486 + "ms");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
487 return;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
488 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
489
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
490 // new DocuImage instance
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
491 DocuImage docuImage = dlConfig.getDocuImageInstance();
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
492 if (docuImage == null) {
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
493 throw new ImageOpException("Unable to load DocuImage class!");
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
494 }
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
495
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
496 // set interpolation quality
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
497 docuImage.setQuality(scaleQual);
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
498
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
499 // set missing dw or dh from aspect ratio
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
500 double imgAspect = fileToLoad.getAspect();
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
501 if (paramDW == 0) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
502 paramDW = (int) Math.round(paramDH * imgAspect);
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
503 } else if (paramDH == 0) {
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
504 paramDH = (int) Math.round(paramDW / imgAspect);
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
505 }
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
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
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
509 logger.debug("IMG: " + imgSize.getWidth() + "x" + imgSize.getHeight());
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
510 logger.debug("time " + (System.currentTimeMillis() - startTime) + "ms");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
511
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
512 // coordinates and scaling
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
513 double areaXoff;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
514 double areaYoff;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
515 double areaWidth;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
516 double areaHeight;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
517 double scaleX;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
518 double scaleY;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
519 double scaleXY;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
520
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
521 // coordinates using Java2D
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
522 // image size in pixels
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
523 Rectangle2D imgBounds =
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
524 new Rectangle2D.Double(
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
525 0,
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
526 0,
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
527 imgSize.getWidth(),
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
528 imgSize.getHeight());
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
529 // user window area in [0,1] coordinates
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
530 Rectangle2D relUserArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
531 new Rectangle2D.Double(paramWX, paramWY, paramWW, paramWH);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
532 // transform from relative [0,1] to image coordinates.
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
533 AffineTransform imgTrafo =
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
534 AffineTransform.getScaleInstance(
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
535 imgSize.getWidth(),
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
536 imgSize.getHeight());
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
537 // transform user coordinate area to image coordinate area
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
538 Rectangle2D userImgArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
539 imgTrafo.createTransformedShape(relUserArea).getBounds2D();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
540
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
541 // calculate scaling factors based on inner user area
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
542 if (scaleToFit) {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
543 areaWidth = userImgArea.getWidth();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
544 areaHeight = userImgArea.getHeight();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
545 scaleX = paramDW / areaWidth * paramWS;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
546 scaleY = paramDH / areaHeight * paramWS;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
547 scaleXY = (scaleX > scaleY) ? scaleY : scaleX;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
548 } else if (absoluteScale) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
549 // absolute scale
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
550 scaleX = paramDDPIX / origResX;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
551 scaleY = paramDDPIY / origResY;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
552 // currently only same scale :-(
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
553 scaleXY = scaleX;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
554 areaWidth = paramDW / scaleXY * paramWS;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 129
diff changeset
555 areaHeight = paramDH / scaleXY * paramWS;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
556 // reset user area size
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
557 userImgArea.setRect(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
558 userImgArea.getX(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
559 userImgArea.getY(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
560 areaWidth,
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
561 areaHeight);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
562 } else {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
563 // crop to fit
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
564 areaWidth = paramDW * paramWS;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
565 areaHeight = paramDH * paramWS;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
566 // reset user area size
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
567 userImgArea.setRect(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
568 userImgArea.getX(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
569 userImgArea.getY(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
570 areaWidth,
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
571 areaHeight);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
572 scaleX = 1f;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
573 scaleY = 1f;
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
574 scaleXY = 1f;
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
575 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
576
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
577 // enlarge image area for rotations to cover additional pixels
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
578 Rectangle2D outerUserImgArea = userImgArea;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
579 Rectangle2D innerUserImgArea = userImgArea;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
580 if (wholeRotArea) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
581 if (paramROT != 0) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
582 try {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
583 // rotate user area coordinates around center of user
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
584 // area
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
585 AffineTransform rotTrafo =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
586 AffineTransform.getRotateInstance(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
587 Math.toRadians(paramROT),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
588 userImgArea.getCenterX(),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
589 userImgArea.getCenterY());
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
590 // get bounds from rotated end position
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
591 innerUserImgArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
592 rotTrafo
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
593 .createTransformedShape(userImgArea)
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
594 .getBounds2D();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
595 // get bounds from back-rotated bounds
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
596 outerUserImgArea =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
597 rotTrafo
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
598 .createInverse()
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
599 .createTransformedShape(innerUserImgArea)
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
600 .getBounds2D();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
601 } catch (NoninvertibleTransformException e1) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
602 // this shouldn't happen anyway
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
603 e1.printStackTrace();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
604 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
605 }
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
606 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
607
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
608 logger.debug("Scale "
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
609 + scaleXY
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
610 + "("
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
611 + scaleX
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
612 + ","
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
613 + scaleY
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
614 + ") on "
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
615 + outerUserImgArea);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
616
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
617 // clip area at the image border
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
618 outerUserImgArea = outerUserImgArea.createIntersection(imgBounds);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
619
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
620 areaWidth = outerUserImgArea.getWidth();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
621 areaHeight = outerUserImgArea.getHeight();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
622 areaXoff = outerUserImgArea.getX();
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
623 areaYoff = outerUserImgArea.getY();
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
624
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
625 logger.debug("crop: "
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
626 + areaXoff
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
627 + ","
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
628 + areaYoff
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
629 + " "
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
630 + areaWidth
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
631 + "x"
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
632 + areaHeight);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
633
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
634 // check image parameters sanity
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
635 if ((areaWidth < 1)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
636 || (areaHeight < 1)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
637 || (scaleXY * areaWidth < 2)
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
638 || (scaleXY * areaHeight < 2)) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
639 logger.error("ERROR: invalid scale parameter set!");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
640 throw new ImageOpException("Invalid scale parameter set!");
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
641 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
642
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
643 /* crop and scale image */
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
644
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
645 // use subimage loading if possible
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
646 if (docuImage.isSubimageSupported()) {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
647 logger.debug("Subimage: scale " + scaleXY + " = " + (1 / scaleXY));
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
648 double subf = 1d;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
649 double subsamp = 1d;
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
650 if (scaleXY < 1) {
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
651 subf = 1 / scaleXY;
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
652 // for higher quality reduce subsample factor by
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
653 // minSubsample
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
654 if (scaleQual > 0) {
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
655 subsamp = Math.max(Math.floor(subf / minSubsample), 1d);
140
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
656 } else {
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
657 subsamp = Math.floor(subf);
c878ea574c29 Servlet Version 1.12b2
robcast
parents: 139
diff changeset
658 }
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
659 scaleXY = subsamp / subf;
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
660 logger.debug("Using subsampling: " + subsamp + " rest " + scaleXY);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
661 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
662
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
663 docuImage.loadSubimage(
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
664 fileToLoad,
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
665 outerUserImgArea.getBounds(),
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
666 (int) subsamp);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
667
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
668 logger.debug("SUBSAMP: "
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
669 + subsamp
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
670 + " -> "
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
671 + docuImage.getWidth()
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
672 + "x"
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
673 + docuImage.getHeight());
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
674
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
675 docuImage.scale(scaleXY, scaleXY);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
676
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
677 } else {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
678 // else load and crop the whole file
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
679 docuImage.loadImage(fileToLoad);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
680 docuImage.crop(
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
681 (int) areaXoff,
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
682 (int) areaYoff,
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
683 (int) areaWidth,
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
684 (int) areaHeight);
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
685
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 148
diff changeset
686 docuImage.scale(scaleXY, scaleXY);
85
4e6757e8ccd4 New enhanced ImageLoader stuff.
robcast
parents: 79
diff changeset
687 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
688
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
689 // mirror image
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
690 // operation mode: "hmir": mirror horizontally, "vmir": mirror
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
691 // vertically
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
692 if (dlRequest.hasOption("mo", "hmir")) {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
693 docuImage.mirror(0);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
694 }
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
695 if (dlRequest.hasOption("mo", "vmir")) {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
696 docuImage.mirror(90);
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
697 }
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
698
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
699 // rotate image
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
700 if (paramROT != 0d) {
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
701 docuImage.rotate(paramROT);
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
702 if (wholeRotArea) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
703 // crop to the inner bounding box
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
704 double xcrop =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
705 docuImage.getWidth()
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
706 - innerUserImgArea.getWidth() * scaleXY;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
707 double ycrop =
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
708 docuImage.getHeight()
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
709 - innerUserImgArea.getHeight() * scaleXY;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
710 if ((xcrop > 0) || (ycrop > 0)) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
711 // only crop smaller
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
712 xcrop = (xcrop > 0) ? xcrop : 0;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
713 ycrop = (ycrop > 0) ? ycrop : 0;
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
714 // crop image
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
715 docuImage.crop(
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
716 (int) (xcrop / 2),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
717 (int) (ycrop / 2),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
718 (int) (docuImage.getWidth() - xcrop),
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
719 (int) (docuImage.getHeight() - ycrop));
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
720 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
721 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
722
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
723 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
724
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
725 // color modification
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
726 if ((paramRGBM != null) || (paramRGBA != null)) {
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
727 // make shure we actually have two arrays
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
728 if (paramRGBM == null) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
729 paramRGBM = new float[3];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
730 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
731 if (paramRGBA == null) {
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
732 paramRGBA = new float[3];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
733 }
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
734 // calculate "contrast" values (c=2^x)
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
735 float[] mult = new float[3];
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
736 for (int i = 0; i < 3; i++) {
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
737 mult[i] = (float) Math.pow(2, (double) paramRGBM[i]);
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
738 }
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
739 docuImage.enhanceRGB(mult, paramRGBA);
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
740 }
94
d9bfec4f046e New version 1.8b4.
robcast
parents: 86
diff changeset
741
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
742 // contrast and brightness enhancement
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
743 if ((paramCONT != 0f) || (paramBRGT != 0f)) {
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
744 double mult = Math.pow(2, paramCONT);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
745 docuImage.enhance((float) mult, (float) paramBRGT);
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
746 }
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
747
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
748 logger.debug("time " + (System.currentTimeMillis() - startTime) + "ms");
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
749
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
750 /* write the resulting image */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
751
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
752 // setup output -- if source is JPG then dest will be JPG else it's
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
753 // PNG
100
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
754 if (mimeType.equals("image/jpeg")
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
755 || mimeType.equals("image/jp2")) {
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
756 mimeType = "image/jpeg";
cc6a0b9ac78e digilib V1.9b1
robcast
parents: 94
diff changeset
757 } else {
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
758 mimeType = "image/png";
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
759 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
760 response.setContentType(mimeType);
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
761
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
762 // write the image
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
763 docuImage.writeImage(mimeType, response.getOutputStream());
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
764
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
765 logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
209
f8c82fea551a Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 197
diff changeset
766
f8c82fea551a Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 197
diff changeset
767 docuImage.dispose();
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
768
170
d40922628e4a Servlet Version 1.16b2 with new DigilibParameter code.
robcast
parents: 161
diff changeset
769 /* error handling */
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
770
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
771 } // end of "big" try
156
688ad0b8b0fa Servlet version 1.16a2
robcast
parents: 153
diff changeset
772 catch (IOException e) {
197
bb4ed821d06e Servlet version 1.18b6
robcast
parents: 196
diff changeset
773 logger.fatal("ERROR: File IO Error: "+e);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
774 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
775 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
776 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
777 "ERROR: File IO Error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
778 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
779 } else {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
780 ServletOps.sendFile(errorImgFile, null, response);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
781 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
782 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
783 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
784 } catch (AuthOpException e) {
197
bb4ed821d06e Servlet version 1.18b6
robcast
parents: 196
diff changeset
785 logger.fatal("ERROR: Authorization error: "+e);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
786 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
787 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
788 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
789 "ERROR: Authorization error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
790 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
791 } else {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
792 ServletOps.sendFile(errorImgFile, null, response);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
793 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
794 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
795 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
796 } catch (ImageOpException e) {
197
bb4ed821d06e Servlet version 1.18b6
robcast
parents: 196
diff changeset
797 logger.fatal("ERROR: Image Error: "+e);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
798 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
799 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
800 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
801 "ERROR: Image Operation Error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
802 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
803 } else {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
804 ServletOps.sendFile(errorImgFile, null, response);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
805 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
806 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
807 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
808 } catch (RuntimeException e) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
809 // JAI likes to throw RuntimeExceptions ;-(
197
bb4ed821d06e Servlet version 1.18b6
robcast
parents: 196
diff changeset
810 logger.fatal("ERROR: Other Image Error: "+e);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
811 try {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
812 if (errorMsgHtml) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
813 ServletOps.htmlMessage(
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
814 "ERROR: Other Image Operation Error: " + e,
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
815 response);
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
816 } else {
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
817 ServletOps.sendFile(errorImgFile, null, response);
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
818 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
819 } catch (FileOpException ex) {
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
820 } // so we don't get a loop
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
821 }
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
822 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
823
73
3b8797fc3e90 New servlet version 1.5b.
robcast
parents: 67
diff changeset
824 } //Scaler class