we also need to check to see if the order is empty for things to work properly in...

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

diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java
index 69a51e4..dffbb91 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleUploadedMedia.java
+++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java
@@ -33,6 +33,7 @@ package mircoders.servlet;
 
 import freemarker.template.SimpleHash;
 import freemarker.template.SimpleList;
+
 import mir.entity.Entity;
 import mir.entity.EntityList;
 import mir.media.MediaHelper;
@@ -46,6 +47,8 @@ import mir.servlet.ServletModuleException;
 import mir.servlet.ServletModuleUserException;
 import mir.storage.Database;
 import mir.storage.StorageObjectException;
+import mir.log.*;
+
 import mircoders.entity.EntityUsers;
 import mircoders.entity.EntityUploadedMedia;
 import mircoders.storage.DatabaseMediaType;
@@ -68,7 +71,7 @@ import java.util.HashMap;
  *  ServletModuleBilder -
  *  liefert HTML fuer Bilder
  *
- * @version $Id: ServletModuleUploadedMedia.java,v 1.11 2002/11/27 08:57:32 mh Exp $
+ * @version $Id: ServletModuleUploadedMedia.java,v 1.14 2002/12/23 03:44:51 mh Exp $
  * @author RK, the mir-coders group
  */
 
@@ -81,6 +84,10 @@ public abstract class ServletModuleUploadedMedia
     return null;
   }
 
+  public ServletModuleUploadedMedia() {
+    logger = new LoggerWrapper("ServletModule.UploadedMedia");
+  }
+
   public void insert(HttpServletRequest req, HttpServletResponse res)
           throws ServletModuleException, ServletModuleUserException {
     try {
@@ -109,7 +116,8 @@ public abstract class ServletModuleUploadedMedia
       deliver(req, res, mergeData, popups, templateListString);
     }
     catch (FileHandlerUserException e) {
-      throw new ServletModuleUserException(e.getMsg());
+      logger.error("ServletModuleUploadedMedia.insert: " + e.getMessage());
+      throw new ServletModuleUserException(e.getMessage());
     }
     catch (FileHandlerException e) {
       throw new ServletModuleException(
@@ -137,7 +145,7 @@ public abstract class ServletModuleUploadedMedia
         parameters.put("is_published", "0");
 
       String id = mainModule.set(parameters);
-      theLog.printError("media ID" + id);
+      logger.debug("update: media ID = " + id);
       _edit(id, req, res);
     }
     catch (IOException e) {
@@ -173,7 +181,7 @@ public abstract class ServletModuleUploadedMedia
     mergeData.put("offset", offset);
 
     String order = req.getParameter("order");
-    if (order == null) order = "webdb_lastchange desc";
+    if (order == null || order.equals("")) order = "webdb_lastchange desc";
 
     // if in connection mode to content
     String cid = req.getParameter("cid");
@@ -198,7 +206,7 @@ public abstract class ServletModuleUploadedMedia
     }
     //theLog.printDebugInfo("sql-whereclause: " + whereClause + " order: " + order + " offset: " + offset);
 
-    // fetch und ausliefern
+    // 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);
@@ -217,9 +225,8 @@ public abstract class ServletModuleUploadedMedia
             mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
         }
       }
-      //fetch the popups
       popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData());
-      // raus damit
+
       deliver(req, res, mergeData, popups, templateListString);
     }
     catch (ModuleException e) {
@@ -245,7 +252,7 @@ public abstract class ServletModuleUploadedMedia
       } else if(Integer.parseInt(numOfMedia) > Integer.parseInt(maxMedia)) {
         numOfMedia = maxMedia;
       }
-    
+
       int mediaNum = Integer.parseInt(numOfMedia);
       SimpleList mediaFields = new SimpleList();
       for(int i =0; i<mediaNum;i++){
@@ -314,7 +321,7 @@ public abstract class ServletModuleUploadedMedia
         res.setContentType(ctx.getMimeType(fName));
         //important that before calling this res.getWriter was not called first
         ServletOutputStream out = res.getOutputStream();
- 
+
         int read ;
         byte[] buf = new byte[8 * 1024];
         while((read = in.read(buf)) != -1) {
@@ -334,8 +341,8 @@ public abstract class ServletModuleUploadedMedia
         throw new ServletModuleException(e.toString());
       }
     }
-    else theLog.printDebugInfo("id nicht angeben.");
-    // darf keine exception werfen
+    else logger.error("id not specified.");
+    // no exception allowed
   }
 
   public void getIcon(HttpServletRequest req, HttpServletResponse res)
@@ -354,7 +361,7 @@ public abstract class ServletModuleUploadedMedia
 
         mediaHandler = MediaHelper.getHandler(mediaType);
         InputStream in = mediaHandler.getIcon(ent);
- 
+
         res.setContentType(ctx.getMimeType(fName));
         //important that before calling this res.getWriter was not called first
         ServletOutputStream out = res.getOutputStream();
@@ -378,8 +385,8 @@ public abstract class ServletModuleUploadedMedia
         throw new ServletModuleException(e.toString());
       }
     }
-    else theLog.printDebugInfo("id nicht angeben.");
-    // darf keine exception werfen
+    else logger.error("getIcon: id not specified.");
+    // no exception allowed
   }
 
 }