annotate servlet/src/digilib/servlet/Scaler.java @ 263:e16d132aa6f6

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