1.1 restoration

[mir.git] / source / mircoders / servlet / ServletModuleUploadedMedia.java

diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java
index 976d76a..58067ea 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleUploadedMedia.java
+++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java
@@ -36,7 +36,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Vector;
+import java.util.ArrayList;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletOutputStream;
@@ -68,7 +68,9 @@ import mircoders.entity.EntityContent;
 import mircoders.entity.EntityUploadedMedia;
 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;
 
@@ -96,12 +98,6 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
 
     definition = "uploadedMedia";
     logger = new LoggerWrapper("ServletModule.UploadedMedia");
-    try {
-      model = MirGlobal.localizer().dataModel().adapterModel();
-    }
-    catch (Throwable t) {
-      throw new ServletModuleFailure(t);
-    }
   }
 
   public void insert(HttpServletRequest aRequest, HttpServletResponse aResponse)
@@ -116,7 +112,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
 
       mediaValues.put("to_publisher", ServletHelper.getUser(aRequest).getId());
 
-      Iterator i = mainModule.getStorageObject().getFields().iterator();
+      Iterator i = mainModule.getStorageObject().getFieldNames().iterator();
       while (i.hasNext()) {
         String field = (String) i.next();
         String value = parsedRequest.getParameter(field);
@@ -124,7 +120,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
           mediaValues.put(field, value);
       }
 
-      List mediaList = new Vector();
+      List mediaList = new ArrayList();
 
       i = parsedRequest.getFiles().iterator();
       while (i.hasNext()) {
@@ -151,7 +147,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
           logAdminUsage(aRequest, id, "object attached to article " + articleid);
         }
 
-        ((ServletModuleContent) ServletModuleContent.getInstance()).editObject(aRequest, aResponse, articleid);
+        (ServletModuleContent.getInstance()).editObject(aRequest, aResponse, articleid);
 
 
         return;
@@ -170,7 +166,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
           logAdminUsage(aRequest, id, "object attached to comment " + commentid);
         }
 
-        ((ServletModuleComment) ServletModuleComment.getInstance()).editObject(aRequest, aResponse, commentid);
+        (ServletModuleComment.getInstance()).editObject(aRequest, aResponse, commentid);
 
         return;
       }
@@ -182,7 +178,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
     catch (Throwable t) {
       Throwable cause = ExceptionFunctions.traceCauseException(t);
 
-      if (cause instanceof ModuleMediaType.UnsupportedMimeTypeExc) {
+      if (cause instanceof UnsupportedMediaTypeExc) {
         throw new ServletModuleUserExc("media.error.unsupportedformat", new String[] {});
       }
       throw new ServletModuleFailure("ServletModuleUploadedMedia.insert: " + t.toString(), t);
@@ -198,7 +194,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
           configuration.getString("TempDir"));
       Map mediaValues = new HashMap();
 
-      Iterator i = mainModule.getStorageObject().getFields().iterator();
+      Iterator i = mainModule.getStorageObject().getFieldNames().iterator();
       while (i.hasNext()) {
         String field = (String) i.next();
         String value = parsedRequest.getParameter(field);
@@ -241,6 +237,8 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
       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));
@@ -290,6 +288,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
       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);
 
@@ -320,7 +319,6 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
 
     SQLQueryBuilder queryBuilder = new SQLQueryBuilder();
 
-    String queryField = "";
     String searchField = requestParser.getParameter("searchfield");
     String searchText = requestParser.getParameter("searchtext");
     String searchIsPublished = requestParser.getParameter("searchispublished");
@@ -368,7 +366,7 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
       int nrMedia = requestParser.getIntegerWithDefault("nrmedia", 1);
       int maxNrMedia=configuration.getInt("ServletModule.OpenIndy.MaxMediaUploadItems", 20);
 
-      List fields = mainModule.getStorageObject().getFields();
+      List fields = mainModule.getStorageObject().getFieldNames();
       Map media = new HashMap();
       Iterator i = fields.iterator();
       while (i.hasNext()) {
@@ -380,14 +378,14 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
       responseData.put("new", Boolean.TRUE);
       responseData.put("articleid", requestParser.getParameter("articleid"));
       responseData.put("commentid", requestParser.getParameter("commentid"));
-      responseData.put("returnurl", null);
+      responseData.put("returnurl", requestParser.getParameter("returnurl"));
 
       if (nrMedia<=0)
         nrMedia=1;
       if (nrMedia>maxNrMedia)
         nrMedia=maxNrMedia;
 
-      List mediaFields = new Vector();
+      List mediaFields = new ArrayList();
       for (int j=0; j<nrMedia; j++)
         mediaFields.add(new Integer(j));
 
@@ -416,11 +414,12 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
         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", null);
+        responseData.put("returnurl", requestParser.getParameter("returnurl"));
         responseData.put("thisurl", null);
 
         responseData.put("edittemplate", editGenerator);
@@ -476,15 +475,12 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
 
 
   /**
-   * @obsolete
-   *
    * @param aRequest
    * @param aResponse
    * @throws ServletModuleExc
    */
   public void getIcon(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
     getThumbnail(aRequest, aResponse);
-
   }
 
   /**
@@ -493,40 +489,43 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
    * @param aResponse
    * @throws ServletModuleExc
    */
-  public void getThumbnail(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc
-  {
-    String idParam = aRequest.getParameter("id");
-    if (idParam!=null && !idParam.equals("")) {
+  public void getThumbnail(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc {
+    String id = aRequest.getParameter("id");
+
+    if (id!=null && !id.equals("")) {
       try {
-        EntityUploadedMedia ent = (EntityUploadedMedia) mainModule.getById(idParam);
-        Entity mediaType = ent.getMediaType();
+        EntityUploadedMedia mediaEntity = (EntityUploadedMedia) mainModule.getById(id);
+        Entity mediaType = mediaEntity.getMediaType();
         MediaHandler mediaHandler;
 
         mediaHandler = MediaHelper.getHandler(mediaType);
-        InputStream in = mediaHandler.getThumbnail(ent);
+        InputStream thumbnailInputStream = mediaHandler.getThumbnail(mediaEntity);
 
-        if (in==null)
+        if (thumbnailInputStream==null)
           throw new ServletModuleExc("no icon available");
 
-        aResponse.setContentType(mediaHandler.getThumbnailMimeType(ent, mediaType));
-        //important that before calling this aResponse.getWriter was not called first
+        aResponse.setContentType(mediaHandler.getThumbnailMimeType(mediaEntity, mediaType));
+
         ServletOutputStream out = aResponse.getOutputStream();
+        try {
+          int read;
+          byte[] buf = new byte[8 * 1024];
 
-        int read ;
-        byte[] buf = new byte[8 * 1024];
-        while((read = in.read(buf)) != -1) {
-          out.write(buf, 0, read);
+          while ((read = thumbnailInputStream.read(buf)) != -1) {
+            out.write(buf, 0, read);
+          }
+
+          thumbnailInputStream.close();
+        }
+        finally {
+          out.close();
         }
-        in.close();
-        out.close();
       }
-
       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 {
@@ -544,12 +543,12 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
     String idParam = aRequest.getParameter("id");
     if (idParam!=null && !idParam.equals("")) {
       try {
-        EntityUploadedMedia entity = (EntityUploadedMedia) mainModule.getById(idParam);
         // 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);
+            "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);
@@ -563,12 +562,11 @@ public abstract class ServletModuleUploadedMedia extends ServletModule {
     String idParam = aRequest.getParameter("id");
     if (idParam!=null && !idParam.equals("")) {
       try {
-        EntityUploadedMedia entity = (EntityUploadedMedia) mainModule.getById(idParam);
         // 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);
+            "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);