package com.google.zxing.web;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
import com.google.zxing.DecodeHintType;
+import com.google.zxing.LuminanceSource;
import com.google.zxing.MultiFormatReader;
import com.google.zxing.Reader;
import com.google.zxing.ReaderException;
import com.google.zxing.Result;
-import com.google.zxing.client.j2se.BufferedImageMonochromeBitmapSource;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
import com.google.zxing.client.result.ParsedResult;
import com.google.zxing.client.result.ResultParser;
+import com.google.zxing.common.GlobalHistogramBinarizer;
+
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.http.Header;
-import org.apache.http.HttpException;
import org.apache.http.HttpMessage;
import org.apache.http.HttpResponse;
import org.apache.http.HttpVersion;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.params.HttpClientParams;
import org.apache.http.conn.scheme.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import javax.imageio.ImageIO;
-import javax.mail.Authenticator;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.net.SocketException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.util.Hashtable;
import java.util.List;
-import java.util.Timer;
+import java.util.Vector;
import java.util.logging.Logger;
+import javax.imageio.ImageIO;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
/**
* {@link HttpServlet} which decodes images containing barcodes. Given a URL, it will
* retrieve the image and decode it. It can also process image files uploaded via POST.
*
- * @author Sean Owen (srowen@google.com)
+ * @author Sean Owen
*/
public final class DecodeServlet extends HttpServlet {
private static final long MAX_IMAGE_SIZE = 500000L;
- private static final long EMAIL_CHECK_INTERVAL = 2L * 60 * 1000;
private static final Logger log = Logger.getLogger(DecodeServlet.class.getName());
static final Hashtable<DecodeHintType, Object> HINTS;
static {
- HINTS = new Hashtable<DecodeHintType, Object>(3);
+ HINTS = new Hashtable<DecodeHintType, Object>(5);
HINTS.put(DecodeHintType.TRY_HARDER, Boolean.TRUE);
+ Vector<BarcodeFormat> possibleFormats = new Vector<BarcodeFormat>();
+ possibleFormats.add(BarcodeFormat.UPC_A);
+ possibleFormats.add(BarcodeFormat.UPC_E);
+ possibleFormats.add(BarcodeFormat.EAN_8);
+ possibleFormats.add(BarcodeFormat.EAN_13);
+ possibleFormats.add(BarcodeFormat.CODE_39);
+ possibleFormats.add(BarcodeFormat.CODE_128);
+ possibleFormats.add(BarcodeFormat.ITF);
+ possibleFormats.add(BarcodeFormat.QR_CODE);
+ possibleFormats.add(BarcodeFormat.DATAMATRIX);
+ HINTS.put(DecodeHintType.POSSIBLE_FORMATS, possibleFormats);
}
private HttpClient client;
private DiskFileItemFactory diskFileItemFactory;
- private Timer emailTimer;
@Override
- public void init(ServletConfig servletConfig) throws ServletException {
+ public void init(ServletConfig servletConfig) {
Logger logger = Logger.getLogger("com.google.zxing");
logger.addHandler(new ServletContextLogHandler(servletConfig.getServletContext()));
- String emailAddress = servletConfig.getInitParameter("emailAddress");
- String emailPassword = servletConfig.getInitParameter("emailPassword");
- if (emailAddress == null || emailPassword == null) {
- throw new ServletException("emailAddress or emailPassword not specified");
- }
-
HttpParams params = new BasicHttpParams();
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
diskFileItemFactory = new DiskFileItemFactory();
- Authenticator emailAuthenticator = new EmailAuthenticator(emailAddress, emailPassword);
- emailTimer = new Timer("Email decoder timer", true);
- emailTimer.schedule(new DecodeEmailTask(emailAddress, emailAuthenticator), 0L, EMAIL_CHECK_INTERVAL);
-
log.info("DecodeServlet configured");
}
@Override
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
String imageURIString = request.getParameter("u");
if (imageURIString == null || imageURIString.length() == 0) {
response.sendRedirect("badurl.jspx");
}
HttpGet getRequest = new HttpGet(imageURI);
+ getRequest.addHeader("Connection", "close"); // Avoids CLOSE_WAIT socket issue?
try {
HttpResponse getResponse = client.execute(getRequest);
} finally {
is.close();
}
- } catch (HttpException he) {
+ } catch (IllegalArgumentException iae) {
+ // Thrown if hostname is bad or null
+ getRequest.abort();
+ response.sendRedirect("badurl.jspx");
+ } catch (SocketException se) {
+ // Thrown if hostname is bad or null
getRequest.abort();
response.sendRedirect("badurl.jspx");
} catch (UnknownHostException uhe) {
}
- private static void processStream(InputStream is, HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
+ private static void processStream(InputStream is, HttpServletRequest request,
+ HttpServletResponse response) throws ServletException, IOException {
BufferedImage image = ImageIO.read(is);
if (image == null) {
response.sendRedirect("badimage.jspx");
Reader reader = new MultiFormatReader();
Result result;
try {
- result = reader.decode(new BufferedImageMonochromeBitmapSource(image), HINTS);
+ LuminanceSource source = new BufferedImageLuminanceSource(image);
+ BinaryBitmap bitmap = new BinaryBitmap(new GlobalHistogramBinarizer(source));
+ result = reader.decode(bitmap, HINTS);
} catch (ReaderException re) {
log.info("DECODE FAILED: " + re.toString());
response.sendRedirect("notfound.jspx");
@Override
public void destroy() {
log.config("DecodeServlet shutting down...");
- emailTimer.cancel();
}
}
projects / zxing.git / blobdiff