From 592772978cac6558dc894763e21ff568a58a4490 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Wed, 29 Mar 2017 08:50:05 +0000
Subject: [PATCH] gemeinsame Api-Methoden der WeBox zusammengefuehrt
---
src/de/uhilger/wbx/web/TNServlet.java | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/src/de/uhilger/wbx/web/TNServlet.java b/src/de/uhilger/wbx/web/TNServlet.java
index 2d4e744..e681146 100644
--- a/src/de/uhilger/wbx/web/TNServlet.java
+++ b/src/de/uhilger/wbx/web/TNServlet.java
@@ -17,10 +17,15 @@
*/
package de.uhilger.wbx.web;
+import de.uhilger.wbx.Bild;
+import java.awt.Container;
import java.awt.Image;
+import java.awt.MediaTracker;
+import java.awt.Toolkit;
import java.io.File;
import java.io.IOException;
-import java.io.OutputStream;
+import java.net.URLDecoder;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -59,23 +64,47 @@
throws ServletException, IOException {
String uriStr = request.getRequestURI();
- File imgfile = new File(uriStr);
+ String relname = uriStr.substring(request.getContextPath().length());
- logger.fine("realpath of /: " + request.getServletContext().getRealPath("/"));
-
- logger.fine("imgfile: " + imgfile.getAbsolutePath());
-
+ // --- Logausgabe Start
+ File logurifile = new File(uriStr);
+ String loguriStr = uriStr.substring(request.getContextPath().length());
+ File logdir = new File(request.getServletContext().getRealPath("/"));
+ File logimgfile = new File(logdir, loguriStr);
+ StringBuffer buf = new StringBuffer();
+ buf.append("contextPath: ");
+ buf.append(request.getContextPath());
+ buf.append("\n");
+ buf.append("realpath of /: ");
+ buf.append(request.getServletContext().getRealPath("/"));
+ buf.append("\n");
+ buf.append("urifile: ");
+ buf.append(logurifile.getAbsolutePath());
+ buf.append("\n");
+ buf.append("imgfile: ");
+ buf.append(logimgfile.getAbsolutePath());
+ logger.fine(buf.toString());
+ // --- Logausgabe Ende
+
if(uriStr.contains(TN) && (uriStr.endsWith(JPG) || uriStr.endsWith(JPEG) || uriStr.endsWith(PNG))) {
- /*
- TODO: hier mit Hilfe der Klasse Bild eine Miniaturansicht erzeugen
- und in die Antwort schreiben
- */
- //writeImageStream(Image image, int gr, String mimeType, response.getOutputStream());
+ File dir = new File(request.getServletContext().getRealPath("/"));
+ relname = relname.replace(TN, "");
+ File imgfile = new File(dir, URLDecoder.decode(relname, "utf-8"));
+ Image image = Toolkit.getDefaultToolkit().getImage(imgfile.getAbsolutePath());
+ MediaTracker mediaTracker = new MediaTracker(new Container());
+ mediaTracker.addImage(image, 0);
+ try {
+ mediaTracker.waitForID(0);
+
+ if (!mediaTracker.isErrorAny()) {
+ Bild bild = new Bild();
+ bild.writeImageStream(image, bild.getVariantenGroesse(Bild.WINZIG), bild.getMimeType(imgfile), response.getOutputStream());
+ }
+ } catch (InterruptedException ex) {
+ logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+ }
} else {
super.doGet(request, response);
}
-
-
}
-
}
--
Gitblit v1.9.3