X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleUploadedMedia.java;h=58067ea6364051f8222eb51459f3bf188b043ff1;hb=63e0ee1fb8038eb6d8f0190cf38c3b3ab2727216;hp=dffbb91191c4ee5276693ab8d8b6085d1dfd092a;hpb=dc0178e733cadfd118b69a5760b35b33610a14c2;p=mir.git

diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java
index dffbb911..58067ea6 100755
--- a/source/mircoders/servlet/ServletModuleUploadedMedia.java
+++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,309 +18,444 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
  */
 
 package mircoders.servlet;
 
-import freemarker.template.SimpleHash;
-import freemarker.template.SimpleList;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ArrayList;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
+import mir.config.MirPropertiesConfiguration;
 import mir.entity.Entity;
-import mir.entity.EntityList;
-import mir.media.MediaHelper;
-import mir.media.MirMedia;
-import mir.media.MirMediaException;
-import mir.media.MirMediaUserException;
-import mir.misc.*;
-import mir.module.ModuleException;
+import mir.entity.adapter.EntityAdapter;
+import mir.entity.adapter.EntityAdapterModel;
+import mir.entity.adapter.EntityIteratorAdapter;
+import mir.log.LoggerWrapper;
+import mircoders.media.MediaHelper;
+import mir.media.MediaHandler;
 import mir.servlet.ServletModule;
-import mir.servlet.ServletModuleException;
-import mir.servlet.ServletModuleUserException;
-import mir.storage.Database;
-import mir.storage.StorageObjectException;
-import mir.log.*;
-
-import mircoders.entity.EntityUsers;
+import mir.servlet.ServletModuleExc;
+import mir.servlet.ServletModuleFailure;
+import mir.servlet.ServletModuleUserExc;
+import mir.session.UploadedFile;
+import mir.util.CachingRewindableIterator;
+import mir.util.ExceptionFunctions;
+import mir.util.HTTPParsedRequest;
+import mir.util.HTTPRequestParser;
+import mir.util.JDBCStringRoutines;
+import mir.util.SQLQueryBuilder;
+import mir.util.URLBuilder;
+import mircoders.entity.EntityComment;
+import mircoders.entity.EntityContent;
 import mircoders.entity.EntityUploadedMedia;
-import mircoders.storage.DatabaseMediaType;
-import mircoders.storage.DatabaseMediafolder;
-import mircoders.media.MediaRequest;
+import mircoders.global.MirGlobal;
+import mircoders.media.MediaUploadProcessor;
+import mircoders.media.UnsupportedMediaTypeExc;
+import mircoders.module.ModuleMediaType;
+import mircoders.media.UnsupportedMediaTypeExc;
+import mircoders.storage.DatabaseComment;
+import mircoders.storage.DatabaseContent;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletOutputStream;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLEncoder;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
+import org.apache.commons.fileupload.FileItem;
 
-/*
- *  ServletModuleBilder -
- *  liefert HTML fuer Bilder
+/**
  *
- * @version $Id: ServletModuleUploadedMedia.java,v 1.14 2002/12/23 03:44:51 mh Exp $
- * @author RK, the mir-coders group
+ * <p>Title: </p>
+ * <p>Description: </p>
+ * <p>Copyright: Copyright (c) 2003</p>
+ * <p>Company: </p>
+ * @author the mir coders
+ * @version 1.0
  */
 
-public abstract class ServletModuleUploadedMedia
-        extends mir.servlet.ServletModule {
-
-  //private static DatabaseRights dbRights;
+public abstract class ServletModuleUploadedMedia extends ServletModule {
+  protected String moduleName = "UploadedMedia";
 
   public static ServletModule getInstance() {
     return null;
   }
 
   public ServletModuleUploadedMedia() {
+    super();
+
+    definition = "uploadedMedia";
     logger = new LoggerWrapper("ServletModule.UploadedMedia");
   }
 
-  public void insert(HttpServletRequest req, HttpServletResponse res)
-          throws ServletModuleException, ServletModuleUserException {
+  public void insert(HttpServletRequest aRequest, HttpServletResponse aResponse)
+          throws ServletModuleExc, ServletModuleUserExc {
     try {
-      EntityUsers user = _getUser(req);
-      MediaRequest mediaReq =  new MediaRequest(user.getId(), false, false);
-      WebdbMultipartRequest mp = new WebdbMultipartRequest(req, (FileHandler)mediaReq);
-      EntityList mediaList = mediaReq.getEntityList();
-
-      SimpleHash mergeData = new SimpleHash();
-      SimpleHash popups = new SimpleHash();
-      mergeData.put("contentlist", mediaList);
-      if (mediaList.getOrder() != null) {
-        mergeData.put("order", mediaList.getOrder());
-        mergeData.put("order_encoded", URLEncoder.encode(mediaList.getOrder()));
+      HTTPParsedRequest parsedRequest = new HTTPParsedRequest(aRequest,
+          configuration.getString("Mir.DefaultEncoding"),
+          configuration.getInt("MaxMediaUploadSize")*1024,
+          configuration.getString("TempDir"));
+
+      Map mediaValues = new HashMap();
+
+      mediaValues.put("to_publisher", ServletHelper.getUser(aRequest).getId());
+
+      Iterator i = mainModule.getStorageObject().getFieldNames().iterator();
+      while (i.hasNext()) {
+        String field = (String) i.next();
+        String value = parsedRequest.getParameter(field);
+        if (value!=null)
+          mediaValues.put(field, value);
       }
-      mergeData.put("count", (new Integer(mediaList.getCount())).toString());
-      mergeData.put("from", (new Integer(mediaList.getFrom())).toString());
-      mergeData.put("to", (new Integer(mediaList.getTo())).toString());
-      if (mediaList.hasNextBatch())
-        mergeData.put("next", (new Integer(mediaList.getNextBatch())).toString());
-      if (mediaList.hasPrevBatch())
-          mergeData.put("prev", (new Integer(mediaList.getPrevBatch())).toString());
-      //fetch the popups
-      popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData());
-      // raus damit
-      deliver(req, res, mergeData, popups, templateListString);
-    }
-    catch (FileHandlerUserException e) {
-      logger.error("ServletModuleUploadedMedia.insert: " + e.getMessage());
-      throw new ServletModuleUserException(e.getMessage());
-    }
-    catch (FileHandlerException e) {
-      throw new ServletModuleException(
-              "upload -- media handling exception " + e.toString());
-    }
-    catch (StorageObjectException e) {
-      throw new ServletModuleException("upload -- storageobjectexception "
-                                      + e.toString());
+
+      List mediaList = new ArrayList();
+
+      i = parsedRequest.getFiles().iterator();
+      while (i.hasNext()) {
+        UploadedFile file = new mir.session.CommonsUploadedFileAdapter((FileItem) i.next());
+
+        String suffix = file.getFieldName().substring(5);
+        mediaValues.put("title", parsedRequest.getParameter("media_title" + suffix));
+
+        mediaList.add(MediaUploadProcessor.processMediaUpload(file, mediaValues));
+      }
+
+      String articleid = parsedRequest.getParameter("articleid");
+      String commentid = parsedRequest.getParameter("commentid");
+
+      if (articleid!=null) {
+        EntityContent entContent = (EntityContent) DatabaseContent.getInstance().selectById(articleid);
+
+        i=mediaList.iterator();
+
+        while (i.hasNext()) {
+          String id = ((EntityUploadedMedia) i.next()).getId();
+
+          entContent.attach(id);
+          logAdminUsage(aRequest, id, "object attached to article " + articleid);
+        }
+
+        (ServletModuleContent.getInstance()).editObject(aRequest, aResponse, articleid);
+
+
+        return;
+      }
+
+      if (commentid!=null) {
+        EntityComment comment = (EntityComment) DatabaseComment.getInstance().selectById(commentid);
+
+        i=mediaList.iterator();
+
+        while (i.hasNext()) {
+          String id = ((EntityUploadedMedia) i.next()).getId();
+
+          comment.attach(id);
+
+          logAdminUsage(aRequest, id, "object attached to comment " + commentid);
+        }
+
+        (ServletModuleComment.getInstance()).editObject(aRequest, aResponse, commentid);
+
+        return;
+      }
+
+      logAdminUsage(aRequest, "", mediaList.size() + " objects added");
+
+      returnUploadedMediaList(aRequest, aResponse, mediaList, 1, mediaList.size(), mediaList.size(), "", null, null);
     }
-    catch (IOException e) {
-      throw new ServletModuleException("upload -- ioexception " + e.toString());
+    catch (Throwable t) {
+      Throwable cause = ExceptionFunctions.traceCauseException(t);
+
+      if (cause instanceof UnsupportedMediaTypeExc) {
+        throw new ServletModuleUserExc("media.error.unsupportedformat", new String[] {});
+      }
+      throw new ServletModuleFailure("ServletModuleUploadedMedia.insert: " + t.toString(), t);
     }
   }
 
-  public void update(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException {
+  public void update(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
 
     try {
-      EntityUsers user = _getUser(req);
-      WebdbMultipartRequest mp = new WebdbMultipartRequest(req, null);
-      HashMap parameters = mp.getParameters();
+      HTTPParsedRequest parsedRequest = new HTTPParsedRequest(aRequest,
+          configuration.getString("Mir.DefaultEncoding"),
+          configuration.getInt("MaxMediaUploadSize")*1024,
+          configuration.getString("TempDir"));
+      Map mediaValues = new HashMap();
+
+      Iterator i = mainModule.getStorageObject().getFieldNames().iterator();
+      while (i.hasNext()) {
+        String field = (String) i.next();
+        String value = parsedRequest.getParameter(field);
+        if (value!=null)
+          mediaValues.put(field, value);
+      }
 
-      parameters.put("to_publisher", user.getId());
-      parameters.put("is_produced", "0");
-      if (!parameters.containsKey("is_published"))
-        parameters.put("is_published", "0");
+      mediaValues.put("to_publisher", ServletHelper.getUser(aRequest).getId());
+      mediaValues.put("is_produced", "0");
+      if (!mediaValues.containsKey("is_published"))
+        mediaValues.put("is_published", "0");
 
-      String id = mainModule.set(parameters);
+      String id = mainModule.set(mediaValues);
       logger.debug("update: media ID = " + id);
-      _edit(id, req, res);
-    }
-    catch (IOException e) {
-      throw new ServletModuleException("upload -- ioexception " + e.toString());
+      logAdminUsage(aRequest, id, "object modified");
+
+      editUploadedMediaObject(id, aRequest, aResponse);
     }
-    catch (ModuleException e) {
-      throw new ServletModuleException("upload -- moduleexception " + e.toString());
-    }
-    catch (Exception e) {
-      throw new ServletModuleException("upload -- exception " + e.toString());
+    catch (Throwable e) {
+      throw new ServletModuleFailure("upload -- exception " + e.toString(), e);
     }
 
   }
 
+  public void returnUploadedMediaList(HttpServletRequest aRequest, HttpServletResponse aResponse,
+                                      Object aList, int aFrom, int aTo, int aCount,
+                                      String aThisUrl, String aNextUrl, String aPreviousUrl) throws ServletModuleExc {
 
-  public void list(HttpServletRequest req, HttpServletResponse res)
-          throws ServletModuleException {
-    // Parameter auswerten
-    SimpleHash mergeData = new SimpleHash();
-    SimpleHash popups = new SimpleHash();
-
-    String query_text = req.getParameter("query_text");
-    mergeData.put("query_text", query_text);
-    if (query_text != null) mergeData.put("query_text_encoded", URLEncoder.encode(query_text));
-    String query_field = req.getParameter("query_field");
-    mergeData.put("query_field", query_field);
-    String query_is_published = req.getParameter("query_is_published");
-    mergeData.put("query_is_published", query_is_published);
-    String query_media_folder = req.getParameter("query_media_folder");
-    mergeData.put("query_media_folder", query_media_folder);
-    String offset = req.getParameter("offset");
-    if (offset == null || offset.equals("")) offset = "0";
-    mergeData.put("offset", offset);
-
-    String order = req.getParameter("order");
-    if (order == null || order.equals("")) order = "webdb_lastchange desc";
-
-    // if in connection mode to content
-    String cid = req.getParameter("cid");
-    mergeData.put("cid", cid);
-
-
-    // sql basteln
-    String whereClause = "";
-    boolean isFirst = true;
-    if (query_text != null && !query_text.equalsIgnoreCase("")) {
-      whereClause += "lower(" + query_field + ") like lower('%" + query_text + "%')";
-      isFirst = false;
-    }
-    if (query_is_published != null && !query_is_published.equals("")) {
-      if (isFirst == false) whereClause += " and ";
-      whereClause += "is_published='" + query_is_published + "'";
-      isFirst = false;
+    try {
+      HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
+      Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)});
+
+      responseData.put("searchfield", requestParser.getParameterWithDefault("searchfield", ""));
+      responseData.put("searchtext", requestParser.getParameterWithDefault("searchtext", ""));
+      responseData.put("searchispublished", requestParser.getParameterWithDefault("searchispublished", ""));
+      responseData.put("searchmediafolder", requestParser.getParameterWithDefault("searchmediafolder", ""));
+      responseData.put("articleid", requestParser.getParameter("articleid"));
+      responseData.put("commentid", requestParser.getParameter("commentid"));
+
+      responseData.put("thisurl", aThisUrl);
+      responseData.put("nexturl", aNextUrl);
+      responseData.put("prevurl", aPreviousUrl);
+      responseData.put("returnurl", requestParser.getParameter("returnurl"));
+
+
+      responseData.put("from", Integer.toString(aFrom));
+      responseData.put("count", Integer.toString(aCount));
+      responseData.put("to", Integer.toString(aTo));
+
+      responseData.put("medialist", aList);
+
+      addExtraData(responseData);
+      ServletHelper.generateResponse(aResponse.getWriter(), responseData, listGenerator);
     }
-    if (query_media_folder != null && !query_media_folder.equals("")) {
-      if (isFirst == false) whereClause += " and ";
-      whereClause += "to_media_folder='" + query_media_folder + "'";
+    catch (Throwable t) {
+      throw new ServletModuleFailure(t);
     }
-    //theLog.printDebugInfo("sql-whereclause: " + whereClause + " order: " + order + " offset: " + offset);
+  }
+
+  public void returnUploadedMediaList(HttpServletRequest aRequest, HttpServletResponse aResponse,
+                                      String aWhereClause, String anOrderByClause, int anOffset) throws ServletModuleExc {
+
+    HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
+    URLBuilder urlBuilder = new URLBuilder();
+    EntityAdapterModel model;
+    String nextPageUrl = null;
+    String previousPageUrl = null;
+    String thisUrl = null;
+
+    int count;
 
-    // fetch and deliver
     try {
-      if (query_text != null || query_is_published != null || query_media_folder != null) {
-        EntityList theList = mainModule.getByWhereClause(whereClause, order, (new Integer(offset)).intValue(), 10);
-        if (theList != null) {
-          mergeData.put("contentlist", theList);
-          if (theList.getOrder() != null) {
-            mergeData.put("order", theList.getOrder());
-            mergeData.put("order_encoded", URLEncoder.encode(theList.getOrder()));
-          }
-          mergeData.put("count", (new Integer(theList.getCount())).toString());
-          mergeData.put("from", (new Integer(theList.getFrom())).toString());
-          mergeData.put("to", (new Integer(theList.getTo())).toString());
-          if (theList.hasNextBatch())
-            mergeData.put("next", (new Integer(theList.getNextBatch())).toString());
-          if (theList.hasPrevBatch())
-            mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
-        }
+      model = MirGlobal.localizer().dataModel().adapterModel();
+
+      Object mediaList =
+          new CachingRewindableIterator(
+          new EntityIteratorAdapter(aWhereClause, anOrderByClause, nrEntitiesPerListPage,
+                   model, definition, nrEntitiesPerListPage, anOffset)
+          );
+
+      count = mainModule.getSize(aWhereClause);
+
+      urlBuilder.setValue("module", moduleName);
+      urlBuilder.setValue("do", "list");
+      urlBuilder.setValue("where", aWhereClause);
+      urlBuilder.setValue("order", anOrderByClause);
+
+      urlBuilder.setValue("articleid", requestParser.getParameter("articleid"));
+      urlBuilder.setValue("commentid", requestParser.getParameter("commentid"));
+      urlBuilder.setValue("searchfield", requestParser.getParameter("searchfield"));
+      urlBuilder.setValue("searchtext", requestParser.getParameter("searchtext"));
+      urlBuilder.setValue("searchispublished", requestParser.getParameter("searchispublished"));
+      urlBuilder.setValue("searchmediafolder", requestParser.getParameter("searchmediafolder"));
+      urlBuilder.setValue("returnurl", requestParser.getParameter("returnurl"));
+      urlBuilder.setValue("where", aWhereClause);
+      urlBuilder.setValue("order", anOrderByClause);
+
+      urlBuilder.setValue("offset", anOffset);
+      thisUrl = urlBuilder.getQuery();
+
+      if (count >= anOffset + nrEntitiesPerListPage) {
+        urlBuilder.setValue("offset", anOffset + nrEntitiesPerListPage);
+        nextPageUrl = urlBuilder.getQuery();
+      }
+
+      if (anOffset > 0) {
+        urlBuilder.setValue("offset", Math.max(anOffset - nrEntitiesPerListPage, 0));
+        previousPageUrl = urlBuilder.getQuery();
       }
-      popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData());
 
-      deliver(req, res, mergeData, popups, templateListString);
+      returnUploadedMediaList(aRequest, aResponse, mediaList,
+              anOffset+1, anOffset+nrEntitiesPerListPage, count, thisUrl,
+              nextPageUrl, previousPageUrl);
     }
-    catch (ModuleException e) {
-      throw new ServletModuleException(e.toString());
+    catch (Throwable e) {
+      throw new ServletModuleFailure(e);
     }
-    catch (Exception e) {
-      throw new ServletModuleException(e.toString());
+  }
+
+  public void search(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
+    HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
+
+    SQLQueryBuilder queryBuilder = new SQLQueryBuilder();
+
+    String searchField = requestParser.getParameter("searchfield");
+    String searchText = requestParser.getParameter("searchtext");
+    String searchIsPublished = requestParser.getParameter("searchispublished");
+    String searchMediaFolder = requestParser.getParameter("searchmediafolder");
+
+    queryBuilder.appendDescendingOrder("webdb_create");
+
+    if (searchIsPublished!=null)
+      if (searchIsPublished.equals("0")) {
+        queryBuilder.appendAndCondition("is_published='f'");
+      }
+      else if (searchIsPublished.equals("1")) {
+        queryBuilder.appendAndCondition("is_published='t'");
+      }
+
+    if (searchField!=null && searchText!=null && searchText.length()>0) {
+        queryBuilder.appendAndCondition(
+          "lower(" + searchField + ") like " +
+          "'%" + JDBCStringRoutines.escapeStringLiteral(searchText.toLowerCase()) + "%'");
     }
+
+    if (searchMediaFolder!=null && searchMediaFolder.length()>0) {
+      queryBuilder.appendAndCondition("to_media_folder="+Integer.parseInt(searchMediaFolder));
+    }
+
+    returnUploadedMediaList(aRequest, aResponse,
+            queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), requestParser.getIntegerWithDefault("offset", 0));
+  }
+
+  public void list(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
+    HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
+
+    returnUploadedMediaList(aRequest, aResponse,
+       requestParser.getParameterWithDefault("where", ""),
+       requestParser.getParameterWithDefault("order", "webdb_create desc"),
+       requestParser.getIntegerWithDefault("offset", 0));
   }
 
 
-  public void add(HttpServletRequest req, HttpServletResponse res)
-          throws ServletModuleException {
+  public void add(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
     try {
-      SimpleHash mergeData = new SimpleHash();
-      mergeData.put("new", "1");
-      SimpleHash popups = new SimpleHash();
-      popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData());
-      String maxMedia = MirConfig.getProp("ServletModule.OpenIndy.MaxMediaUploadItems");
-      String numOfMedia = req.getParameter("medianum");
-      if(numOfMedia==null||numOfMedia.equals("")){
-        numOfMedia="1";
-      } else if(Integer.parseInt(numOfMedia) > Integer.parseInt(maxMedia)) {
-        numOfMedia = maxMedia;
-      }
+      HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
+      Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)});
+
+      int nrMedia = requestParser.getIntegerWithDefault("nrmedia", 1);
+      int maxNrMedia=configuration.getInt("ServletModule.OpenIndy.MaxMediaUploadItems", 20);
 
-      int mediaNum = Integer.parseInt(numOfMedia);
-      SimpleList mediaFields = new SimpleList();
-      for(int i =0; i<mediaNum;i++){
-        Integer mNum = new Integer(i+1);
-        mediaFields.add(mNum.toString());
+      List fields = mainModule.getStorageObject().getFieldNames();
+      Map media = new HashMap();
+      Iterator i = fields.iterator();
+      while (i.hasNext()) {
+        media.put(i.next(), null);
       }
-      mergeData.put("medianum",numOfMedia);
-      mergeData.put("mediafields",mediaFields);
-      deliver(req, res, mergeData, popups, templateObjektString);
-    } catch (Exception e) {
-      throw new ServletModuleException(e.toString());
+      media.put("to_media_folder", new Integer(7));
+      responseData.put("uploadedmedia", media);
+
+      responseData.put("new", Boolean.TRUE);
+      responseData.put("articleid", requestParser.getParameter("articleid"));
+      responseData.put("commentid", requestParser.getParameter("commentid"));
+      responseData.put("returnurl", requestParser.getParameter("returnurl"));
+
+      if (nrMedia<=0)
+        nrMedia=1;
+      if (nrMedia>maxNrMedia)
+        nrMedia=maxNrMedia;
+
+      List mediaFields = new ArrayList();
+      for (int j=0; j<nrMedia; j++)
+        mediaFields.add(new Integer(j));
+
+      responseData.put("nrmedia", new Integer(nrMedia));
+      responseData.put("mediafields", mediaFields);
+
+      responseData.put("edittemplate", editGenerator);
+      responseData.put("module", moduleName);
+
+      addExtraData(responseData);
+
+      ServletHelper.generateResponse(aResponse.getWriter(), responseData, "uploadedmedia.template");
+    }
+    catch (Exception e) {
+      throw new ServletModuleFailure(e);
     }
   }
 
-  public void edit(HttpServletRequest req, HttpServletResponse res)
-          throws ServletModuleException {
-    String idParam = req.getParameter("id");
-    _edit(idParam, req, res);
+  public void edit(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
+    editUploadedMediaObject(aRequest.getParameter("id"), aRequest, aResponse);
   }
 
-  private void _edit(String idParam, HttpServletRequest req, HttpServletResponse res)
-          throws ServletModuleException {
+  private void editUploadedMediaObject(String idParam, HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
     if (idParam != null && !idParam.equals("")) {
       try {
-        SimpleHash popups = new SimpleHash();
-        popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData());
-        deliver(req, res, mainModule.getById(idParam), popups,
-                templateObjektString);
+        Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)});
+        EntityAdapter object =
+            model.makeEntityAdapter(definition, mainModule.getById(idParam));
+        HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
+        responseData.put("uploadedmedia", object);
+        responseData.put("new", Boolean.FALSE);
+        responseData.put("articleid", null);
+        responseData.put("commentid", null);
+        responseData.put("returnurl", requestParser.getParameter("returnurl"));
+        responseData.put("thisurl", null);
+
+        responseData.put("edittemplate", editGenerator);
+        responseData.put("module", moduleName);
+
+        addExtraData(responseData);
+
+        ServletHelper.generateResponse(aResponse.getWriter(), responseData, "uploadedmedia.template");
       }
-      catch (ModuleException e) {
-        throw new ServletModuleException(e.toString());
-      }
-      catch (StorageObjectException e) {
-        throw new ServletModuleException(e.toString());
+      catch (Throwable e) {
+        throw new ServletModuleFailure(e);
       }
     }
     else {
-      throw new ServletModuleException("ServletmoduleUploadedMedia :: _edit without id");
+      throw new ServletModuleExc("ServletmoduleUploadedMedia :: editUploadedMediaObject without id");
     }
   }
 
+  public void getMedia(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
+    String idParam = aRequest.getParameter("id");
 
-  /** @todo should be in ServletModule.java */
-  private EntityUsers _getUser(HttpServletRequest req) {
-    HttpSession session = req.getSession(false);
-    return (EntityUsers) session.getAttribute("login.uid");
-  }
-
-  public void getMedia(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException
-  {
-    String idParam = req.getParameter("id");
     if (idParam!=null && !idParam.equals("")) {
       try {
-        EntityUploadedMedia ent = (EntityUploadedMedia)mainModule.getById(idParam);
-        Entity mediaType = ent.getMediaType();
-        MirMedia mediaHandler;
+        EntityUploadedMedia entity = (EntityUploadedMedia)mainModule.getById(idParam);
+        Entity mediaType = entity.getMediaType();
+        MediaHandler mediaHandler;
 
-        ServletContext ctx =
-                    (ServletContext)MirConfig.getPropAsObject("ServletContext");
-        String fName = ent.getId()+"."+mediaType.getValue("name");
+        ServletContext ctx = MirPropertiesConfiguration.getContext();
+        String fName = entity.getId()+"."+mediaType.getFieldValue("name");
 
         mediaHandler = MediaHelper.getHandler(mediaType);
-        InputStream in = mediaHandler.getMedia(ent, mediaType);
+        InputStream in = mediaHandler.getMedia(entity, mediaType);
 
-        res.setContentType(ctx.getMimeType(fName));
-        //important that before calling this res.getWriter was not called first
-        ServletOutputStream out = res.getOutputStream();
+        aResponse.setContentType(ctx.getMimeType(fName));
+        //important that before calling this aResponse.getWriter was not called first
+        ServletOutputStream out = aResponse.getOutputStream();
 
         int read ;
         byte[] buf = new byte[8 * 1024];
@@ -330,65 +465,113 @@ public abstract class ServletModuleUploadedMedia
         in.close();
         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());
+      catch (Throwable e) {
+        throw new ServletModuleFailure(e);
       }
     }
     else logger.error("id not specified.");
     // no exception allowed
   }
 
-  public void getIcon(HttpServletRequest req, HttpServletResponse res)
-    throws ServletModuleException
-  {
-    String idParam = req.getParameter("id");
-    if (idParam!=null && !idParam.equals("")) {
-      try {
-        EntityUploadedMedia ent = (EntityUploadedMedia)mainModule.getById(idParam);
-        Entity mediaType = ent.getMediaType();
-        MirMedia mediaHandler;
 
-        ServletContext ctx =
-                    (ServletContext)MirConfig.getPropAsObject("ServletContext");
-        String fName = ent.getId()+"."+mediaType.getValue("name");
+  /**
+   * @param aRequest
+   * @param aResponse
+   * @throws ServletModuleExc
+   */
+  public void getIcon(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
+    getThumbnail(aRequest, aResponse);
+  }
+
+  /**
+   *
+   * @param aRequest
+   * @param aResponse
+   * @throws ServletModuleExc
+   */
+  public void getThumbnail(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
+    String id = aRequest.getParameter("id");
+
+    if (id!=null && !id.equals("")) {
+      try {
+        EntityUploadedMedia mediaEntity = (EntityUploadedMedia) mainModule.getById(id);
+        Entity mediaType = mediaEntity.getMediaType();
+        MediaHandler mediaHandler;
 
         mediaHandler = MediaHelper.getHandler(mediaType);
-        InputStream in = mediaHandler.getIcon(ent);
+        InputStream thumbnailInputStream = mediaHandler.getThumbnail(mediaEntity);
 
-        res.setContentType(ctx.getMimeType(fName));
-        //important that before calling this res.getWriter was not called first
-        ServletOutputStream out = res.getOutputStream();
+        if (thumbnailInputStream==null)
+          throw new ServletModuleExc("no icon available");
 
-        int read ;
-        byte[] buf = new byte[8 * 1024];
-        while((read = in.read(buf)) != -1) {
-          out.write(buf, 0, read);
-        }
-        in.close();
-        out.close();
-      }
+        aResponse.setContentType(mediaHandler.getThumbnailMimeType(mediaEntity, mediaType));
 
-      catch (IOException e) {
-        throw new ServletModuleException(e.toString());
-      }
-      catch (ModuleException e) {
-        throw new ServletModuleException(e.toString());
+        ServletOutputStream out = aResponse.getOutputStream();
+        try {
+          int read;
+          byte[] buf = new byte[8 * 1024];
+
+          while ((read = thumbnailInputStream.read(buf)) != -1) {
+            out.write(buf, 0, read);
+          }
+
+          thumbnailInputStream.close();
+        }
+        finally {
+          out.close();
+        }
       }
-      catch (Exception e) {
-        throw new ServletModuleException(e.toString());
+      catch (Throwable e) {
+        logger.error("getIcon: " + e.toString());
       }
     }
     else logger.error("getIcon: id not specified.");
-    // no exception allowed
   }
 
-}
+  protected void addExtraData(Map aTarget) throws ServletModuleExc, ServletModuleFailure {
+    try {
+      aTarget.put("mediafolders",
+                  new EntityIteratorAdapter("", "", 20, MirGlobal.localizer().dataModel().adapterModel(), "mediaFolder"));
+    }
+    catch (Throwable t) {
+      throw new ServletModuleFailure(t);
+    }
+  }
 
+  public void showarticles(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc
+  {
+    String idParam = aRequest.getParameter("id");
+    if (idParam!=null && !idParam.equals("")) {
+      try {
+        // TODO rewrite as relational sql
+        ServletModuleContent.getInstance().returnList(
+            aRequest,
+            aResponse,
+            "exists (select * from content_x_media where content_id=content.id and media_id='" +
+                  JDBCStringRoutines.escapeStringLiteral( idParam ) + "')", "", 0);
+      }
+      catch (Throwable t) {
+        throw new ServletModuleFailure(t);
+      }
+    }
+    else logger.error("showarticles: id not specified.");
+  }
 
+  public void showcomments(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc
+  {
+    String idParam = aRequest.getParameter("id");
+    if (idParam!=null && !idParam.equals("")) {
+      try {
+        // TODO rewrite as relational sql
+        ServletModuleComment.getInstance().returnList(
+            aRequest,
+            aResponse,
+            "exists (select * from comment_x_media where comment_id=comment.id and media_id='" + JDBCStringRoutines.escapeStringLiteral( idParam ) + "')", "", 0);
+      }
+      catch (Throwable t) {
+        throw new ServletModuleFailure(t);
+      }
+    }
+    else logger.error("showcomments: id not specified.");
+  }
+}
\ No newline at end of file