Mercurial > hg > digilib-old

annotate servlet/src/digilib/servlet/Scaler.java @ 552:785fc58b68b1 digilibPDF

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more cleanup and refactoring
author robcast
date Wed, 15 Dec 2010 08:58:01 +0100
parents e1094c5ec032
children 0885f5ca5b24
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;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
12 import javax.servlet.http.HttpServletRequest;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
13 import javax.servlet.http.HttpServletResponse;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
14
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
15 import digilib.auth.AuthOpException;
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
16 import digilib.auth.AuthOps;
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
17 import digilib.image.DocuImage;
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
18 import digilib.image.ImageOpException;
86
997ba69afb81 New version 1.8b1.
robcast
parents: 85
diff changeset
19 import digilib.io.DocuDirCache;
335
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
20 import digilib.io.DocuDirectory;
9bce7008a514 Servlet version 1.5.3b
robcast
parents: 303
diff changeset
21 import digilib.io.DocuDirent;
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
22 import digilib.io.FileOps;
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
23 import digilib.io.ImageFile;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
24
511
e706a777798b documentation and comments added/cleaned up
cmielack
parents: 503
diff changeset
25 // TODO digilibError is not used anymore and may need to get reintegrated
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
26
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
27 @SuppressWarnings("serial")
500
b2325b33b77b completely restructured the scaler
cmielack
parents: 1
diff changeset
28 public class Scaler extends RequestHandler {
263
e16d132aa6f6 Servlet version 1.21b1
robcast
parents: 253
diff changeset
29
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
30 /** digilib servlet version (for all components) */
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
31 public static final String dlVersion = "1.9.0a";
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
32
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
33 /** general error code */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
34 public static final int ERROR_UNKNOWN = 0;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
35
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
36 /** error code for authentication error */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
37 public static final int ERROR_AUTH = 1;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
38
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
39 /** error code for file operation error */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
40 public static final int ERROR_FILE = 2;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
41
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
42 /** error code for image operation error */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
43 public static final int ERROR_IMAGE = 3;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
44
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
45 /** DocuDirCache instance */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
46 DocuDirCache dirCache;
161
ace2a4a0ba74 servlet version 1.16a4
robcast
parents: 156
diff changeset
47
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
48 /** Image executor */
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
49 DigilibJobCenter<DocuImage> imageJobCenter;
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
50
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
51 /** authentication error image file */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
52 File denyImgFile;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
53
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
54 /** image error image file */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
55 File errorImgFile;
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
56
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
57 /** not found error image file */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
58 File notfoundImgFile;
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 /** send files as is? */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
61 boolean sendFileAllowed = true;
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 /** DigilibConfiguration instance */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
64 DigilibConfiguration dlConfig;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
65
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
66 /** use authorization database */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
67 boolean useAuthorization = 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 /** AuthOps instance */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
70 AuthOps authOp;
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
71
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
72 /**
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
73 * Initialisation on first run.
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
74 *
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
75 * @throws ServletException
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
76 *
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
77 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
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 public void init(ServletConfig config) throws ServletException {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
80 super.init(config);
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
81
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
82 System.out
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
83 .println("***** Digital Image Library Image Scaler Servlet (version "
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
84 + dlVersion + ") *****");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
85 // say hello in the log file
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
86 logger.info("***** Digital Image Library Image Scaler Servlet (version "
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
87 + dlVersion + ") *****");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
88
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
89 // get our ServletContext
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
90 ServletContext context = config.getServletContext();
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
91 // see if there is a Configuration instance
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
92 dlConfig = (DigilibConfiguration) context
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
93 .getAttribute("digilib.servlet.configuration");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
94 if (dlConfig == null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
95 // no Configuration
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
96 throw new ServletException("No Configuration!");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
97 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
98 // set our AuthOps
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
99 useAuthorization = dlConfig.getAsBoolean("use-authorization");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
100 authOp = (AuthOps) dlConfig.getValue("servlet.auth.op");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
101
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
102 // DocuDirCache instance
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
103 dirCache = (DocuDirCache) dlConfig.getValue("servlet.dir.cache");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
104
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
105 // Executor
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
106 imageJobCenter = (DigilibJobCenter<DocuImage>) dlConfig
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
107 .getValue("servlet.worker.imageexecutor");
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
108
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
109 denyImgFile = ServletOps.getFile(
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
110 (File) dlConfig.getValue("denied-image"), config);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
111 errorImgFile = ServletOps.getFile(
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
112 (File) dlConfig.getValue("error-image"), config);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
113 notfoundImgFile = ServletOps.getFile(
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
114 (File) dlConfig.getValue("notfound-image"), config);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
115 sendFileAllowed = dlConfig.getAsBoolean("sendfile-allowed");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
116 }
1
0ff3ede32060 Initial revision
robcast
parents:
diff changeset
117
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
118 /** Returns modification time relevant to the request.
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
119 *
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
120 * @see javax.servlet.http.HttpServlet#getLastModified(javax.servlet.http.HttpServletRequest)
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
121 */
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
122 protected long getLastModified(HttpServletRequest request) {
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
123 accountlog.debug("GetLastModified from " + request.getRemoteAddr()
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
124 + " for " + request.getQueryString());
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
125 long mtime = -1;
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
126 // create new request
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
127 DigilibRequest dlReq = new DigilibRequest(request);
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
128 // find the file(set)
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
129 DocuDirent f = dirCache.getFile(dlReq.getFilePath(),
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
130 dlReq.getAsInt("pn"), FileOps.CLASS_IMAGE);
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
131 // find the requested file
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
132 if (f != null) {
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
133 DocuDirectory dd = (DocuDirectory) f.getParent();
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
134 mtime = dd.getDirMTime() / 1000 * 1000;
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
135 }
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
136 return mtime;
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
137 }
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
138
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
139
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
140 public void processRequest(HttpServletRequest request,
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
141 HttpServletResponse response) throws ServletException,
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
142 ImageOpException {
487
6c01d283e90e Servlet version 1.16.1
robcast
parents: 478
diff changeset
143
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
144 if (dlConfig == null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
145 throw new ServletException("ERROR: No Configuration!");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
146 }
502
157d4c7d2343 readded support for direct sending of image files
cmielack
parents: 501
diff changeset
147
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
148 accountlog.debug("request: " + request.getQueryString());
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
149 logger.debug("request: " + request.getQueryString());
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
150 long startTime = System.currentTimeMillis();
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
151
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
152 // parse request
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
153 DigilibRequest dlRequest = new DigilibRequest(request);
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
154 // extract the job information
552
785fc58b68b1 more cleanup and refactoring
robcast
parents: 547
diff changeset
155 ImageJobDescription jobTicket = ImageJobDescription.setFrom(dlRequest, dlConfig);
502
157d4c7d2343 readded support for direct sending of image files
cmielack
parents: 501
diff changeset
156
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
157 ImageWorker job = null;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
158 try {
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
159 /*
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
160 * check if we can fast-track without scaling
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
161 */
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
162 ImageFile fileToLoad = jobTicket.getFileToLoad();
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
163
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
164 // check permissions
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
165 if (useAuthorization) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
166 // 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
167 List<String> rolesRequired = authOp.rolesForPath(
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
168 jobTicket.getFilePath(), request);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
169 if (rolesRequired != null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
170 authlog.debug("Role required: " + rolesRequired);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
171 authlog.debug("User: " + request.getRemoteUser());
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
172 // is the current request/user authorized?
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
173 if (!authOp.isRoleAuthorized(rolesRequired, request)) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
174 // send deny answer and abort
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
175 throw new AuthOpException();
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
176 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
177 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
178 }
79
63c8186455c1 Servlet version 1.6b. Further cleanup and new functionality:
robcast
parents: 73
diff changeset
179
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
180 // if requested, send image as a file
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
181 if (sendFileAllowed && jobTicket.getSendAsFile()) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
182 String mt = null;
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
183 if (jobTicket.hasOption("rawfile")) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
184 mt = "application/octet-stream";
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
185 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
186 logger.debug("Sending RAW File as is.");
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
187 ServletOps.sendFile(fileToLoad.getFile(), mt, response);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
188 logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
189 return;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
190 }
487
6c01d283e90e Servlet version 1.16.1
robcast
parents: 478
diff changeset
191
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
192 // if possible, send the image without actually having to transform it
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
193 if (! jobTicket.isTransformRequired()) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
194 logger.debug("Sending File as is.");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
195 ServletOps.sendFile(fileToLoad.getFile(), null, response);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
196 logger.info("Done in " + (System.currentTimeMillis() - startTime) + "ms");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
197 return;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
198 }
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 177
diff changeset
199
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
200 // check load of workers
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
201 if (imageJobCenter.isBusy()) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
202 logger.error("Servlet overloaded!");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
203 response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
204 return;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
205 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
206 // create job
547
e1094c5ec032 more cleanup and refactoring
robcast
parents: 544
diff changeset
207 job = new ImageWorker(dlConfig, jobTicket);
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
208 // submit job
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
209 Future<DocuImage> jobResult = imageJobCenter.submit(job);
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
210 // wait for result
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
211 DocuImage img = jobResult.get();
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
212 // send image
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
213 ServletOps.sendImage(img, null, response);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
214 logger.debug("Job Processing Time: "
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
215 + (System.currentTimeMillis() - startTime) + "ms");
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
216
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
217 } catch (IOException e) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
218 logger.error(e.getClass() + ": " + e.getMessage());
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
219 // response.sendError(1);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
220 } catch (AuthOpException e) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
221 logger.error(e.getClass() + ": " + e.getMessage());
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
222 // response.sendError(1);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
223 } catch (InterruptedException e) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
224 logger.error(e.getClass() + ": " + e.getMessage());
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
225 } catch (ExecutionException e) {
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
226 logger.error(e.getClass() + ": " + e.getMessage());
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
227 logger.error("caused by: " + e.getCause().getMessage());
543
919e008ab1fb more steps towards more standard java.util.concurrent design
robcast
parents: 542
diff changeset
228 }
405
ffb2036da205 first stab at PDF printer servlet. DOES NOT WORK YET!
robcast
parents: 394
diff changeset
229
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
230 }
298
1ecaf9c1fd8a Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
231
544
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
232 /**
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
233 * 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
234 *
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
235 * @param asHTML
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
236 * @param type
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
237 * @param msg
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
238 * @param response
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
239 */
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
240 public void digilibError(boolean asHTML, int type, String msg,
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
241 HttpServletResponse response) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
242 try {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
243 File img = null;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
244 if (type == ERROR_AUTH) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
245 if (msg == null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
246 msg = "ERROR: Unauthorized access!";
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
247 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
248 img = denyImgFile;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
249 } else if (type == ERROR_FILE) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
250 if (msg == null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
251 msg = "ERROR: Image file not found!";
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
252 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
253 img = notfoundImgFile;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
254 } else {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
255 if (msg == null) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
256 msg = "ERROR: Other image error!";
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
257 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
258 img = this.errorImgFile;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
259 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
260 if (asHTML && (img != null)) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
261 ServletOps.htmlMessage(msg, response);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
262 } else {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
263 ServletOps.sendFile(img, null, response);
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
264 }
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
265 } catch (IOException e) {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
266 logger.error("Error sending error!", e);
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
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
271 public static String getVersion() {
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
272 return dlVersion;
5ff500d6812a more steps towards more standard java.util.concurrent design
robcast
parents: 543
diff changeset
273 }
489
882ee6a055bd try to fix small problem with version number display
robcast
parents: 487
diff changeset
274
500
b2325b33b77b completely restructured the scaler
cmielack
parents: 1
diff changeset
275 }