X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmircoders%2Fservlet%2FServletModuleImages.java;h=36bfd9411c62d8a798b29637100453ec0e11195c;hb=a43304491d4492208e37c53449497a8a05731899;hp=8a7fe7bdf3632e0b3d72efbcee117747ec594322;hpb=8563841098b6ab3e6233f61519e58b41dcc30266;p=mir.git

diff --git a/source/mircoders/servlet/ServletModuleImages.java b/source/mircoders/servlet/ServletModuleImages.java
index 8a7fe7bd..36bfd941 100755
--- a/source/mircoders/servlet/ServletModuleImages.java
+++ b/source/mircoders/servlet/ServletModuleImages.java
@@ -44,6 +44,7 @@ import freemarker.template.*;
 import com.oreilly.servlet.multipart.*;
 import com.oreilly.servlet.*;
 
+import mir.log.*;
 import mir.servlet.*;
 import mir.module.*;
 import mir.misc.*;
@@ -58,87 +59,31 @@ import mircoders.producer.*;
 
 /*
  *  ServletModuleImages -
- *  liefert HTML fuer Images
  *
- *
- * @author RK
+ * @version $Id: ServletModuleImages.java,v 1.24 2002/11/29 13:43:42 zapata Exp $
+ * @author RK, the mir-coders group
  */
 
 public class ServletModuleImages extends ServletModuleUploadedMedia
 {
-
-  //private static DatabaseRights dbRights;
-
   // Singelton / Kontruktor
   private static ServletModuleImages instance = new ServletModuleImages();
   public static ServletModule getInstance() { return instance; }
 
 
   private ServletModuleImages() {
-    theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Images.Logfile"));
+    logger = new LoggerWrapper("ServletModule.Images");
     templateListString = MirConfig.getProp("ServletModule.Images.ListTemplate");
     templateObjektString = MirConfig.getProp("ServletModule.Images.ObjektTemplate");
     templateConfirmString = MirConfig.getProp("ServletModule.Images.ConfirmTemplate");
+
     try {
       mainModule = new ModuleImages(DatabaseImages.getInstance());
-      //dbRights = DatabaseRights.getInstance();
     }
     catch (StorageObjectException e) {
-      theLog.printDebugInfo("servletmodulebilder konnte nicht initialisiert werden");
+      logger.error("Initialization of ServletModuleImages failed!: " + e.getMessage());
     }
   }
 
-  public void showimg(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException
-  {
-    String idParam = req.getParameter("id");
-    if (idParam!=null && !idParam.equals("")) {
-      try {
-        EntityImages entImage =(EntityImages)mainModule.getById(idParam);
-        ServletContext ctx =
-                    (ServletContext)MirConfig.getPropAsObject("ServletContext");
-        String fName = entImage.getId()+"."
-                      +entImage.getMediaType().getValue("name");
-        res.setContentType(ctx.getMimeType(fName));
-        ServletOutputStream out = res.getOutputStream(); // wichtig, dass vorher kein res.getwriter() gelaufen ist
-
-        byte[] outbytes = entImage.getImage();
-        out.write(outbytes);
-        out.close();
-      }
-
-      catch (IOException e) {throw new ServletModuleException(e.toString());}
-      catch (ModuleException e) {throw new ServletModuleException(e.toString());}
-      catch (Exception e) {throw new ServletModuleException(e.toString());}
-    }
-    else theLog.printDebugInfo("id nicht angeben.");
-    // darf keine exception werfen
-  }
-
-  public void showicon(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException
-  {
-    String idParam = req.getParameter("id");
-    if (idParam!=null && !idParam.equals("")) {
-      try {
-        EntityImages entImage =(EntityImages)mainModule.getById(idParam);
-        ServletContext ctx =
-                    (ServletContext)MirConfig.getPropAsObject("ServletContext");
-        String fName = entImage.getId()+"."
-                      +entImage.getMediaType().getValue("name");
-        res.setContentType(ctx.getMimeType(fName));
-        ServletOutputStream out = res.getOutputStream(); // wichtig, dass vorher kein res.getwriter() gelaufen ist
-
-        byte[] outbytes = entImage.getIcon();
-        out.write(outbytes);
-        out.close();
-      }
-
-      catch (IOException e) {throw new ServletModuleException(e.toString());}
-      catch (ModuleException e) {throw new ServletModuleException(e.toString());}
-      catch (Exception e) {throw new ServletModuleException(e.toString());}
-    }
-    else throw new ServletModuleException("id nicht angeben.");
-  }
 }