Mercurial > hg > digilib-old
annotate servlet/src/digilib/servlet/Scaler.java @ 563:686086d6e6d6 digilibPDF
more refactoring and rearranging
more enums
pdf and image generation still works
author | robcast |
---|---|
date | Fri, 17 Dec 2010 20:42:25 +0100 |
parents | 2e971b9f3022 |
children | fd2ef7e46119 |
rev | line source |
---|---|
1 | 1 package digilib.servlet; |
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 | 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 | 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 | 16 import org.apache.log4j.Logger; |
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 | 21 import digilib.image.ImageJobDescription; |
22 import digilib.image.ImageWorker; | |
86 | 23 import digilib.io.DocuDirCache; |
335 | 24 import digilib.io.DocuDirectory; |
25 import digilib.io.DocuDirent; | |
563 | 26 import digilib.io.FileOps.FileClass; |
161 | 27 import digilib.io.ImageFile; |
557 | 28 import digilib.util.DigilibJobCenter; |
1 | 29 |
547 | 30 @SuppressWarnings("serial") |
557 | 31 public class Scaler extends HttpServlet { |
263 | 32 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
33 /** digilib servlet version (for all components) */ |
563 | 34 public static final String version = "1.9.0a"; |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
35 |
558 | 36 /** servlet error codes */ |
37 public static enum Error {UNKNOWN, AUTH, FILE, IMAGE}; | |
38 | |
39 /** type of error message */ | |
40 public static enum ErrMsg {IMAGE, TEXT, CODE}; | |
41 | |
557 | 42 /** logger for accounting requests */ |
43 protected static Logger accountlog = Logger.getLogger("account.request"); | |
44 | |
45 /** gengeral logger for this class */ | |
46 protected static Logger logger = Logger.getLogger("digilib.servlet"); | |
47 | |
48 /** logger for authentication related */ | |
49 protected static Logger authlog = Logger.getLogger("digilib.auth"); | |
50 | |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
51 /** DocuDirCache instance */ |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
52 DocuDirCache dirCache; |
161 | 53 |
543
919e008ab1fb
more steps towards more standard java.util.concurrent design
robcast
parents:
542
diff
changeset
|
54 /** Image executor */ |
547 | 55 DigilibJobCenter<DocuImage> imageJobCenter; |
543
919e008ab1fb
more steps towards more standard java.util.concurrent design
robcast
parents:
542
diff
changeset
|
56 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
57 /** authentication error image file */ |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
58 File denyImgFile; |
298
1ecaf9c1fd8a
Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents:
288
diff
changeset
|
59 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
60 /** image error image file */ |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
61 File errorImgFile; |
298
1ecaf9c1fd8a
Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents:
288
diff
changeset
|
62 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
63 /** not found error image file */ |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
64 File notfoundImgFile; |
298
1ecaf9c1fd8a
Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents:
288
diff
changeset
|
65 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
66 /** send files as is? */ |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
67 boolean sendFileAllowed = true; |
298
1ecaf9c1fd8a
Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents:
288
diff
changeset
|
68 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
69 /** DigilibConfiguration instance */ |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
70 DigilibConfiguration dlConfig; |
1 | 71 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
72 /** use authorization database */ |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
73 boolean useAuthorization = true; |
298
1ecaf9c1fd8a
Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents:
288
diff
changeset
|
74 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
75 /** AuthOps instance */ |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
76 AuthOps authOp; |
1 | 77 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
78 /** |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
79 * Initialisation on first run. |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
80 * |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
81 * @throws ServletException |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
82 * |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
83 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig) |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
84 */ |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
85 public void init(ServletConfig config) throws ServletException { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
86 super.init(config); |
181 | 87 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
88 System.out |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
89 .println("***** Digital Image Library Image Scaler Servlet (version " |
563 | 90 + version + ") *****"); |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
91 // say hello in the log file |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
92 logger.info("***** Digital Image Library Image Scaler Servlet (version " |
563 | 93 + version + ") *****"); |
1 | 94 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
95 // get our ServletContext |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
96 ServletContext context = config.getServletContext(); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
97 // see if there is a Configuration instance |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
98 dlConfig = (DigilibConfiguration) context |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
99 .getAttribute("digilib.servlet.configuration"); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
100 if (dlConfig == null) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
101 // no Configuration |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
102 throw new ServletException("No Configuration!"); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
103 } |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
104 // set our AuthOps |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
105 useAuthorization = dlConfig.getAsBoolean("use-authorization"); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
106 authOp = (AuthOps) dlConfig.getValue("servlet.auth.op"); |
1 | 107 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
108 // DocuDirCache instance |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
109 dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache"); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
110 |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
111 // Executor |
547 | 112 imageJobCenter = (DigilibJobCenter<DocuImage>) dlConfig |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
113 .getValue("servlet.worker.imageexecutor"); |
1 | 114 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
115 denyImgFile = ServletOps.getFile( |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
116 (File) dlConfig.getValue("denied-image"), config); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
117 errorImgFile = ServletOps.getFile( |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
118 (File) dlConfig.getValue("error-image"), config); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
119 notfoundImgFile = ServletOps.getFile( |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
120 (File) dlConfig.getValue("notfound-image"), config); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
121 sendFileAllowed = dlConfig.getAsBoolean("sendfile-allowed"); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
122 } |
1 | 123 |
557 | 124 /** Returns modification time relevant to the request for caching. |
547 | 125 * |
126 * @see javax.servlet.http.HttpServlet#getLastModified(javax.servlet.http.HttpServletRequest) | |
127 */ | |
128 protected long getLastModified(HttpServletRequest request) { | |
129 accountlog.debug("GetLastModified from " + request.getRemoteAddr() | |
130 + " for " + request.getQueryString()); | |
131 long mtime = -1; | |
132 // create new request | |
133 DigilibRequest dlReq = new DigilibRequest(request); | |
134 // find the file(set) | |
135 DocuDirent f = dirCache.getFile(dlReq.getFilePath(), | |
563 | 136 dlReq.getAsInt("pn"), FileClass.IMAGE); |
547 | 137 // find the requested file |
138 if (f != null) { | |
139 DocuDirectory dd = (DocuDirectory) f.getParent(); | |
140 mtime = dd.getDirMTime() / 1000 * 1000; | |
141 } | |
142 return mtime; | |
143 } | |
144 | |
557 | 145 /* (non-Javadoc) |
146 * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) | |
147 */ | |
148 public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException { | |
149 accountlog.info("GET from " + request.getRemoteAddr()); | |
150 this.processRequest(request, response); | |
151 } | |
547 | 152 |
557 | 153 |
154 /* (non-Javadoc) | |
155 * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) | |
156 */ | |
157 public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException { | |
158 accountlog.info("POST from " + request.getRemoteAddr()); | |
159 this.processRequest(request, response); | |
160 } | |
161 | |
162 | |
163 /** Service this request using the response. | |
164 * @param request | |
165 * @param response | |
166 * @throws ServletException | |
167 */ | |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
168 public void processRequest(HttpServletRequest request, |
557 | 169 HttpServletResponse response) throws ServletException { |
487 | 170 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
171 if (dlConfig == null) { |
557 | 172 logger.error("ERROR: No Configuration!"); |
173 throw new ServletException("NO VALID digilib CONFIGURATION!"); | |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
174 } |
502 | 175 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
176 accountlog.debug("request: " + request.getQueryString()); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
177 logger.debug("request: " + request.getQueryString()); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
178 long startTime = System.currentTimeMillis(); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
179 |
547 | 180 // parse request |
181 DigilibRequest dlRequest = new DigilibRequest(request); | |
182 // extract the job information | |
557 | 183 ImageJobDescription jobTicket = ImageJobDescription.getInstance(dlRequest, dlConfig); |
502 | 184 |
558 | 185 // type of error reporting |
186 ErrMsg errMsgType = ErrMsg.IMAGE; | |
187 if (dlRequest.hasOption("errtxt")) { | |
188 errMsgType = ErrMsg.TEXT; | |
189 } else if (dlRequest.hasOption("errcode")) { | |
190 errMsgType = ErrMsg.CODE; | |
191 } | |
192 | |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
193 try { |
547 | 194 /* |
195 * check if we can fast-track without scaling | |
196 */ | |
197 ImageFile fileToLoad = jobTicket.getFileToLoad(); | |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
198 |
547 | 199 // check permissions |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
200 if (useAuthorization) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
201 // 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
|
202 List<String> rolesRequired = authOp.rolesForPath( |
547 | 203 jobTicket.getFilePath(), request); |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
204 if (rolesRequired != null) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
205 authlog.debug("Role required: " + rolesRequired); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
206 authlog.debug("User: " + request.getRemoteUser()); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
207 // is the current request/user authorized? |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
208 if (!authOp.isRoleAuthorized(rolesRequired, request)) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
209 // send deny answer and abort |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
210 throw new AuthOpException(); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
211 } |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
212 } |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
213 } |
79
63c8186455c1
Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents:
73
diff
changeset
|
214 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
215 // if requested, send image as a file |
547 | 216 if (sendFileAllowed && jobTicket.getSendAsFile()) { |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
217 String mt = null; |
547 | 218 if (jobTicket.hasOption("rawfile")) { |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
219 mt = "application/octet-stream"; |
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 logger.debug("Sending RAW File as is."); |
557 | 222 ServletOps.sendFile(fileToLoad.getFile(), mt, null, response); |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
223 logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms"); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
224 return; |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
225 } |
487 | 226 |
547 | 227 // if possible, send the image without actually having to transform it |
228 if (! jobTicket.isTransformRequired()) { | |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
229 logger.debug("Sending File as is."); |
557 | 230 ServletOps.sendFile(fileToLoad.getFile(), null, null, response); |
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 } |
181 | 234 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
235 // check load of workers |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
236 if (imageJobCenter.isBusy()) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
237 logger.error("Servlet overloaded!"); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
238 response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
239 return; |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
240 } |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
241 // create job |
557 | 242 ImageWorker job = new ImageWorker(dlConfig, jobTicket); |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
243 // submit job |
543
919e008ab1fb
more steps towards more standard java.util.concurrent design
robcast
parents:
542
diff
changeset
|
244 Future<DocuImage> jobResult = imageJobCenter.submit(job); |
919e008ab1fb
more steps towards more standard java.util.concurrent design
robcast
parents:
542
diff
changeset
|
245 // wait for result |
919e008ab1fb
more steps towards more standard java.util.concurrent design
robcast
parents:
542
diff
changeset
|
246 DocuImage img = jobResult.get(); |
919e008ab1fb
more steps towards more standard java.util.concurrent design
robcast
parents:
542
diff
changeset
|
247 // send image |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
248 ServletOps.sendImage(img, null, response); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
249 logger.debug("Job Processing Time: " |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
250 + (System.currentTimeMillis() - startTime) + "ms"); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
251 |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
252 } catch (IOException e) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
253 logger.error(e.getClass() + ": " + e.getMessage()); |
558 | 254 digilibError(errMsgType, Error.FILE, null, response); |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
255 } catch (AuthOpException e) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
256 logger.error(e.getClass() + ": " + e.getMessage()); |
558 | 257 digilibError(errMsgType, Error.AUTH, null, response); |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
258 } catch (InterruptedException e) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
259 logger.error(e.getClass() + ": " + e.getMessage()); |
543
919e008ab1fb
more steps towards more standard java.util.concurrent design
robcast
parents:
542
diff
changeset
|
260 } catch (ExecutionException e) { |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
261 logger.error(e.getClass() + ": " + e.getMessage()); |
557 | 262 String causeMsg = e.getCause().getMessage(); |
263 logger.error("caused by: " + causeMsg); | |
558 | 264 digilibError(errMsgType, Error.IMAGE, causeMsg, response); |
543
919e008ab1fb
more steps towards more standard java.util.concurrent design
robcast
parents:
542
diff
changeset
|
265 } |
405
ffb2036da205
first stab at PDF printer servlet. DOES NOT WORK YET!
robcast
parents:
394
diff
changeset
|
266 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
267 } |
298
1ecaf9c1fd8a
Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents:
288
diff
changeset
|
268 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
269 /** |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
270 * 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
|
271 * |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
272 * @param type |
558 | 273 * @param error |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
274 * @param msg |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
275 * @param response |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
276 */ |
558 | 277 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
|
278 HttpServletResponse response) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
279 try { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
280 File img = null; |
557 | 281 int status = 0; |
558 | 282 if (error == Error.AUTH) { |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
283 if (msg == null) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
284 msg = "ERROR: Unauthorized access!"; |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
285 } |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
286 img = denyImgFile; |
557 | 287 status = HttpServletResponse.SC_FORBIDDEN; |
558 | 288 } else if (error == Error.FILE) { |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
289 if (msg == null) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
290 msg = "ERROR: Image file not found!"; |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
291 } |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
292 img = notfoundImgFile; |
557 | 293 status = HttpServletResponse.SC_NOT_FOUND; |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
294 } else { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
295 if (msg == null) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
296 msg = "ERROR: Other image error!"; |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
297 } |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
298 img = this.errorImgFile; |
557 | 299 status = HttpServletResponse.SC_BAD_REQUEST; |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
300 } |
558 | 301 if (type == ErrMsg.TEXT) { |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
302 ServletOps.htmlMessage(msg, response); |
558 | 303 } else if (type == ErrMsg.CODE) { |
557 | 304 response.sendError(status, msg); |
305 } else if (img != null) { | |
306 // default: image | |
307 ServletOps.sendFile(img, null, null, response); | |
544
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 } catch (IOException e) { |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
310 logger.error("Error sending error!", e); |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
311 } |
298
1ecaf9c1fd8a
Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents:
288
diff
changeset
|
312 |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
313 } |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
314 |
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
315 public static String getVersion() { |
563 | 316 return version; |
544
5ff500d6812a
more steps towards more standard java.util.concurrent design
robcast
parents:
543
diff
changeset
|
317 } |
489
882ee6a055bd
try to fix small problem with version number display
robcast
parents:
487
diff
changeset
|
318 |
500 | 319 } |