Mercurial > hg > digilib-old

annotate servlet/src/digilib/servlet/Scaler.java @ 803:225054177f67 jquery

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove all ServletOutputStream.flush(). (stupid me ;-)
author robcast
date Sat, 19 Feb 2011 13:03:31 +0100
parents fce27a005445
children e6d0cdaa7923
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
1 package digilib.servlet;
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
2
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
3 import java.io.File;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
4 import java.io.IOException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
5 import java.util.List;
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
6 import java.util.concurrent.ExecutionException;
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
7 import java.util.concurrent.Future;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
8
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
9 import javax.servlet.ServletConfig;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
10 import javax.servlet.ServletContext;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
11 import javax.servlet.ServletException;
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
12 import javax.servlet.http.HttpServlet;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
13 import javax.servlet.http.HttpServletRequest;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
14 import javax.servlet.http.HttpServletResponse;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
15
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
16 import org.apache.log4j.Logger;
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
17
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
18 import digilib.auth.AuthOpException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
19 import digilib.auth.AuthOps;
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
20 import digilib.image.DocuImage;
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
21 import digilib.image.ImageJobDescription;
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 563
diff changeset
22 import digilib.image.ImageOpException;
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
23 import digilib.image.ImageWorker;
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
24 import digilib.io.DocuDirCache;
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
25 import digilib.io.DocuDirectory;
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
26 import digilib.io.ImageFile;
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
27 import digilib.util.DigilibJobCenter;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
28
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
29 @SuppressWarnings("serial")
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
30 public class Scaler extends HttpServlet {
263
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
31
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
32 /** digilib servlet version (for all components) */
803
225054177f67 remove all ServletOutputStream.flush(). (stupid me ;-)
robcast
parents: 752
diff changeset
33 public static final String version = "1.8.4a2";
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
34
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
35 /** servlet error codes */
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
36 public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
37
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
38 /** type of error message */
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
39 public static enum ErrMsg {IMAGE, TEXT, CODE};
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
40
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
41 /** logger for accounting requests */
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
42 protected static Logger accountlog = Logger.getLogger("account.request");
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
43
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
44 /** gengeral logger for this class */
572
800f2bb57f1f slightly better logging
robcast
parents: 571
diff changeset
45 protected static Logger logger = Logger.getLogger("digilib.scaler");
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
46
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
47 /** logger for authentication related */
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
48 protected static Logger authlog = Logger.getLogger("digilib.auth");
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
49
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
50 /** DocuDirCache instance */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
51 DocuDirCache dirCache;
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
52
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
53 /** Image executor */
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
54 DigilibJobCenter<DocuImage> imageJobCenter;
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
55
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
56 /** authentication error image file */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
57 File denyImgFile;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
58
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
59 /** image error image file */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
60 File errorImgFile;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
61
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
62 /** not found error image file */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
63 File notfoundImgFile;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
64
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
65 /** send files as is? */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
66 boolean sendFileAllowed = true;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
67
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
68 /** DigilibConfiguration instance */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
69 DigilibConfiguration dlConfig;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
70
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
71 /** use authorization database */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
72 boolean useAuthorization = true;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
73
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
74 /** AuthOps instance */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
75 AuthOps authOp;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
76
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
77 /**
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
78 * Initialisation on first run.
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
79 *
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
80 * @throws ServletException
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
81 *
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
82 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
83 */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
84 public void init(ServletConfig config) throws ServletException {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
85 super.init(config);
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
86
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
87 System.out
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
88 .println("***** Digital Image Library Image Scaler Servlet (version "
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 558
diff changeset
89 + version + ") *****");
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
90 // say hello in the log file
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
91 logger.info("***** Digital Image Library Image Scaler Servlet (version "
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 558
diff changeset
92 + version + ") *****");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
93
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
94 // get our ServletContext
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
95 ServletContext context = config.getServletContext();
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
96 // see if there is a Configuration instance
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
97 dlConfig = (DigilibConfiguration) context
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
98 .getAttribute("digilib.servlet.configuration");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
99 if (dlConfig == null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
100 // no Configuration
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
101 throw new ServletException("No Configuration!");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
102 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
103 // set our AuthOps
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
104 useAuthorization = dlConfig.getAsBoolean("use-authorization");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
105 authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
106
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
107 // DocuDirCache instance
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
108 dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
109
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
110 // Executor
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
111 imageJobCenter = (DigilibJobCenter<DocuImage>) dlConfig
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
112 .getValue("servlet.worker.imageexecutor");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
113
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
114 denyImgFile = ServletOps.getFile(
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
115 (File) dlConfig.getValue("denied-image"), config);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
116 errorImgFile = ServletOps.getFile(
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
117 (File) dlConfig.getValue("error-image"), config);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
118 notfoundImgFile = ServletOps.getFile(
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
119 (File) dlConfig.getValue("notfound-image"), config);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
120 sendFileAllowed = dlConfig.getAsBoolean("sendfile-allowed");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
121 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
122
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
123 /** Returns modification time relevant to the request for caching.
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
124 *
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
125 * @see javax.servlet.http.HttpServlet#getLastModified(javax.servlet.http.HttpServletRequest)
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
126 */
750
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
127 public long getLastModified(HttpServletRequest request) {
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
128 accountlog.debug("GetLastModified from " + request.getRemoteAddr()
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
129 + " for " + request.getQueryString());
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
130 long mtime = -1;
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
131 // create new request
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
132 DigilibRequest dlReq = new DigilibRequest(request);
752
fce27a005445 clean up imports
robcast
parents: 750
diff changeset
133 DocuDirectory dd = dirCache.getDirectory(dlReq.getFilePath());
fce27a005445 clean up imports
robcast
parents: 750
diff changeset
134 if (dd != null) {
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
135 mtime = dd.getDirMTime() / 1000 * 1000;
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
136 }
750
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
137 logger.debug(" returns "+mtime);
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
138 return mtime;
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
139 }
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
140
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
141 /* (non-Javadoc)
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
142 * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
143 */
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
144 public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
145 accountlog.info("GET from " + request.getRemoteAddr());
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
146 this.processRequest(request, response);
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
147 }
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
148
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
149
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
150 /* (non-Javadoc)
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
151 * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
152 */
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
153 public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
154 accountlog.info("POST from " + request.getRemoteAddr());
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
155 this.processRequest(request, response);
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
156 }
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
157
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
158
750
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
159 protected void doHead(HttpServletRequest req, HttpServletResponse resp)
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
160 throws ServletException, IOException {
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
161 logger.debug("HEAD from "+req.getRemoteAddr());
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
162 super.doHead(req, resp);
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
163 }
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
164
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
165 protected void doOptions(HttpServletRequest req, HttpServletResponse resp)
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
166 throws ServletException, IOException {
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
167 logger.debug("OPTIONS from "+req.getRemoteAddr());
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
168 super.doOptions(req, resp);
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
169 }
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
170
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 594
diff changeset
171 /** Service this request using the response.
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
172 * @param request
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
173 * @param response
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
174 * @throws ServletException
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
175 */
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
176 public void processRequest(HttpServletRequest request,
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
177 HttpServletResponse response) throws ServletException {
487
6c01d283e90e Servlet version 1.16.1
robcast
parents: 478
diff changeset
178
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
179 if (dlConfig == null) {
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
180 logger.error("ERROR: No Configuration!");
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
181 throw new ServletException("NO VALID digilib CONFIGURATION!");
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
182 }
502
157d4c7d2343 readded support for direct sending of image files
cmielack
parents: 501
diff changeset
183
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
184 accountlog.debug("request: " + request.getQueryString());
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
185 logger.debug("request: " + request.getQueryString());
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
186 long startTime = System.currentTimeMillis();
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
187
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
188 // parse request
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
189 DigilibRequest dlRequest = new DigilibRequest(request);
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
190 // extract the job information
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
191 ImageJobDescription jobTicket = ImageJobDescription.getInstance(dlRequest, dlConfig);
502
157d4c7d2343 readded support for direct sending of image files
cmielack
parents: 501
diff changeset
192
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
193 // type of error reporting
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
194 ErrMsg errMsgType = ErrMsg.IMAGE;
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
195 if (dlRequest.hasOption("errtxt")) {
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
196 errMsgType = ErrMsg.TEXT;
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
197 } else if (dlRequest.hasOption("errcode")) {
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
198 errMsgType = ErrMsg.CODE;
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
199 }
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
200
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
201 try {
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
202 /*
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
203 * check if we can fast-track without scaling
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
204 */
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
205 ImageFile fileToLoad = jobTicket.getFileToLoad();
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
206
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
207 // check permissions
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
208 if (useAuthorization) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
209 // get a list of required roles (empty if no restrictions)
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
210 List<String> rolesRequired = authOp.rolesForPath(
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
211 jobTicket.getFilePath(), request);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
212 if (rolesRequired != null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
213 authlog.debug("Role required: " + rolesRequired);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
214 authlog.debug("User: " + request.getRemoteUser());
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
215 // is the current request/user authorized?
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
216 if (!authOp.isRoleAuthorized(rolesRequired, request)) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
217 // send deny answer and abort
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
218 throw new AuthOpException();
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
219 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
220 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
221 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
222
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
223 // if requested, send image as a file
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
224 if (sendFileAllowed && jobTicket.getSendAsFile()) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
225 String mt = null;
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
226 if (jobTicket.hasOption("rawfile")) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
227 mt = "application/octet-stream";
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
228 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
229 logger.debug("Sending RAW File as is.");
572
800f2bb57f1f slightly better logging
robcast
parents: 571
diff changeset
230 ServletOps.sendFile(fileToLoad.getFile(), mt, null, response, logger);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
231 logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
232 return;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
233 }
487
6c01d283e90e Servlet version 1.16.1
robcast
parents: 478
diff changeset
234
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
235 // if possible, send the image without actually having to transform it
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
236 if (! jobTicket.isTransformRequired()) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
237 logger.debug("Sending File as is.");
572
800f2bb57f1f slightly better logging
robcast
parents: 571
diff changeset
238 ServletOps.sendFile(fileToLoad.getFile(), null, null, response, logger);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
239 logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
240 return;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
241 }
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
242
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
243 // check load of workers
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
244 if (imageJobCenter.isBusy()) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
245 logger.error("Servlet overloaded!");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
246 response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
247 return;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
248 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
249 // create job
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
250 ImageWorker job = new ImageWorker(dlConfig, jobTicket);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
251 // submit job
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
252 Future<DocuImage> jobResult = imageJobCenter.submit(job);
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
253 // wait for result
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
254 DocuImage img = jobResult.get();
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
255 // send image
572
800f2bb57f1f slightly better logging
robcast
parents: 571
diff changeset
256 ServletOps.sendImage(img, null, response, logger);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
257 logger.debug("Job Processing Time: "
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
258 + (System.currentTimeMillis() - startTime) + "ms");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
259
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 563
diff changeset
260 } catch (ImageOpException e) {
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 563
diff changeset
261 logger.error(e.getClass() + ": " + e.getMessage());
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 563
diff changeset
262 digilibError(errMsgType, Error.IMAGE, null, response);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
263 } catch (IOException e) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
264 logger.error(e.getClass() + ": " + e.getMessage());
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
265 digilibError(errMsgType, Error.FILE, null, response);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
266 } catch (AuthOpException e) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
267 logger.error(e.getClass() + ": " + e.getMessage());
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
268 digilibError(errMsgType, Error.AUTH, null, response);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
269 } catch (InterruptedException e) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
270 logger.error(e.getClass() + ": " + e.getMessage());
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
271 } catch (ExecutionException e) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
272 logger.error(e.getClass() + ": " + e.getMessage());
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
273 String causeMsg = e.getCause().getMessage();
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
274 logger.error("caused by: " + causeMsg);
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
275 digilibError(errMsgType, Error.IMAGE, causeMsg, response);
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
276 }
405
ffb2036da205 first stab at PDF printer servlet. DOES NOT WORK YET!
robcast
parents: 394
diff changeset
277
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
278 }
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
279
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
280 /**
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
281 * Sends an error to the client as text or image.
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
282 *
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
283 * @param type
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
284 * @param error
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
285 * @param msg
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
286 * @param response
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
287 */
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
288 public void digilibError(ErrMsg type, Error error, String msg,
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
289 HttpServletResponse response) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
290 try {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
291 File img = null;
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
292 int status = 0;
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
293 if (error == Error.AUTH) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
294 if (msg == null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
295 msg = "ERROR: Unauthorized access!";
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
296 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
297 img = denyImgFile;
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
298 status = HttpServletResponse.SC_FORBIDDEN;
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
299 } else if (error == Error.FILE) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
300 if (msg == null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
301 msg = "ERROR: Image file not found!";
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
302 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
303 img = notfoundImgFile;
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
304 status = HttpServletResponse.SC_NOT_FOUND;
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
305 } else {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
306 if (msg == null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
307 msg = "ERROR: Other image error!";
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
308 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
309 img = this.errorImgFile;
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
310 status = HttpServletResponse.SC_BAD_REQUEST;
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
311 }
803
225054177f67 remove all ServletOutputStream.flush(). (stupid me ;-)
robcast
parents: 752
diff changeset
312 if (response.isCommitted()) {
225054177f67 remove all ServletOutputStream.flush(). (stupid me ;-)
robcast
parents: 752
diff changeset
313 // response already committed
225054177f67 remove all ServletOutputStream.flush(). (stupid me ;-)
robcast
parents: 752
diff changeset
314 logger.error("Unable to send error: " + msg);
225054177f67 remove all ServletOutputStream.flush(). (stupid me ;-)
robcast
parents: 752
diff changeset
315 return;
225054177f67 remove all ServletOutputStream.flush(). (stupid me ;-)
robcast
parents: 752
diff changeset
316 }
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
317 if (type == ErrMsg.TEXT) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
318 ServletOps.htmlMessage(msg, response);
558
2e971b9f3022 added some enums
robcast
parents: 557
diff changeset
319 } else if (type == ErrMsg.CODE) {
557
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
320 response.sendError(status, msg);
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
321 } else if (img != null) {
0885f5ca5b24 more refactoring and rearranging
robcast
parents: 552
diff changeset
322 // default: image
572
800f2bb57f1f slightly better logging
robcast
parents: 571
diff changeset
323 ServletOps.sendFile(img, null, null, response, logger);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
324 }
570
fd2ef7e46119 more cleanup, set version to 1.8.2
robcast
parents: 563
diff changeset
325 } catch (Exception e) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
326 logger.error("Error sending error!", e);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
327 }
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
328
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
329 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
330
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
331 public static String getVersion() {
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 558
diff changeset
332 return version;
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
333 }
489
882ee6a055bd try to fix small problem with version number display
robcast
parents: 487
diff changeset
334
500
b2325b33b77b completely restructured the scaler
cmielack
parents: 1
diff changeset
335 }