annotate servlet/src/digilib/servlet/Scaler.java @ 253:2adfb8bea870

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