quick hack bugfix

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

diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index 750e539..90a2f3d 100755 (executable)
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -40,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;
@@ -47,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.5 2002/11/28 19:55:25 mh Exp $
  */
 
 
@@ -94,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("description"))
         returnValue = getDescr();
       else if (key.equals("mediatype"))
         returnValue = getMediaTypeString();
       else if (key.equals("mimetype"))
         returnValue = getMimeType();
+      /*else if (key.equals("size")) {
+        String size = super.getValue(key);
+        if (size != null)
+          returnValue = NumberUtils.humanReadableSize(Double.parseDouble(size));
+      }*/
       else
         returnValue = super.getValue(key);
     }
@@ -139,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;
@@ -194,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;