it's a bad thing w/ our persistance layer to override getValues, for keys that exist...

[mir.git] / source / mircoders / entity / EntityUploadedMedia.java

diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index 5724e71..fd4864d 100755 (executable)
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * 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.
+ */
+
 package mircoders.entity;
 
 import freemarker.template.SimpleList;
@@ -9,6 +40,7 @@ import mir.media.MediaHelper;
 import mir.media.MirMedia;
 import mir.storage.StorageObject;
 import mir.storage.StorageObjectException;
+import mir.misc.NumberUtils;
 import mircoders.storage.DatabaseUploadedMedia;
 
 import java.util.HashMap;
@@ -16,8 +48,8 @@ import java.util.HashMap;
 /**
  * Diese Klasse enthält die Daten eines MetaObjekts
  *
- * @author RK
- * @version 29.6.1999
+ * @author mh, mir-coders group
+ * @version $Id: EntityUploadedMedia.java,v 1.9.2.6 2002/11/29 21:09:03 mh Exp $
  */
 
 
@@ -63,13 +95,18 @@ public class EntityUploadedMedia extends Entity {
 
     if (key != null) {
       if (key.equals("big_icon"))
-        returnValue = getBigIcon();
-      else if (key.equals("descr"))
+        returnValue = getBigIconName();
+      else if (key.equals("descr") || key.equals("media_descr"))
         returnValue = getDescr();
       else if (key.equals("mediatype"))
         returnValue = getMediaTypeString();
       else if (key.equals("mimetype"))
         returnValue = getMimeType();
+      else if (key.equals("human_readable_size")) {
+        String size = super.getValue("size");
+        if (size != null)
+          returnValue = NumberUtils.humanReadableSize(Double.parseDouble(size));
+      }
       else
         returnValue = super.getValue(key);
     }
@@ -108,17 +145,17 @@ public class EntityUploadedMedia extends Entity {
     return null;
   }
 
-  private String getBigIcon() {
+  private String getBigIconName() {
     MirMedia mediaHandler = null;
     Entity mediaType = null;
 
     try {
       mediaType = getMediaType();
       mediaHandler = MediaHelper.getHandler(mediaType);
-      return mediaHandler.getBigIcon();
+      return mediaHandler.getBigIconName();
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getBigIcon: could not fetch data "
+      theLog.printWarning("-- getBigIconName: could not fetch data "
                           + this.getClass().toString() + " " + ex.toString());
     }
     return null;
@@ -163,7 +200,7 @@ public class EntityUploadedMedia extends Entity {
       return mediaType.getValue("mime_type");
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getBigIcon: could not fetch data "
+      theLog.printWarning("-- getBigIconName: could not fetch data "
                           + this.getClass().toString() + " " + ex.toString());
     }
     return null;