X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmircoders%2Fentity%2FEntityUploadedMedia.java;h=9f90ca357172f69928ab8162adf1497a2bacf989;hb=77b8f79d3873d20aa10bb775e03047cd6a9de0bf;hp=a09248911830782180c93922381d7d580b4b06ac;hpb=0fec104dee8d11f7f65447a635de68eed29ab040;p=mir.git

diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index a0924891..9f90ca35 100755
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -1,23 +1,57 @@
+/*
+ * 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;
-import freemarker.template.SimpleScalar;
-import freemarker.template.TemplateModel;
-import freemarker.template.TemplateModelException;
+import java.util.Map;
+
 import mir.entity.Entity;
+import mir.entity.EntityList;
+import mir.log.LoggerWrapper;
 import mir.media.MediaHelper;
 import mir.media.MirMedia;
+import mir.misc.NumberUtils;
 import mir.storage.StorageObject;
-import mir.storage.StorageObjectException;
+import mir.storage.StorageObjectFailure;
+import mircoders.storage.DatabaseContentToMedia;
 import mircoders.storage.DatabaseUploadedMedia;
-
-import java.util.HashMap;
+import freemarker.template.SimpleList;
+import freemarker.template.SimpleScalar;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
 
 /**
- * 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.22 2003/03/05 19:23:15 idfx Exp $
  */
 
 
@@ -26,6 +60,8 @@ public class EntityUploadedMedia extends Entity {
 
   public EntityUploadedMedia() {
     super();
+
+    logger = new LoggerWrapper("Entity.UploadedMedia");
   }
 
   public EntityUploadedMedia(StorageObject theStorage) {
@@ -33,7 +69,18 @@ public class EntityUploadedMedia extends Entity {
     setStorage(theStorage);
   }
 
-  public void setValues(HashMap theStringValues) {
+  public void update() throws StorageObjectFailure {
+    super.update();
+    EntityList contentList = DatabaseContentToMedia.getInstance().getContent(this);
+    if (contentList!=null && contentList.size()>0) {
+      for(int i=0;i<contentList.size();i++) {
+        EntityContent contentEnt = (EntityContent)contentList.elementAt(i);
+        contentEnt.setProduced(false);
+      }
+    }
+  }
+
+  public void setValues(Map theStringValues) {
     if (theStringValues != null) {
       if (!theStringValues.containsKey("is_published"))
         theStringValues.put("is_published", "0");
@@ -47,13 +94,13 @@ public class EntityUploadedMedia extends Entity {
    *
    * @return mir.entity.Entity
    */
-  public Entity getMediaType() throws StorageObjectException {
+  public Entity getMediaType() throws StorageObjectFailure {
     Entity ent = null;
     try {
       ent = DatabaseUploadedMedia.getInstance().getMediaType(this);
     }
-    catch (StorageObjectException e) {
-      throwStorageObjectException(e, "get MediaType failed -- ");
+    catch (StorageObjectFailure e) {
+      throwStorageObjectFailure(e, "get MediaType failed -- ");
     }
     return ent;
   }
@@ -63,13 +110,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);
     }
@@ -102,24 +154,22 @@ public class EntityUploadedMedia extends Entity {
         return "other";
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getMediaTypeString: could not fetch data "
-                          + this.getClass().toString() + " " + ex.toString());
+      logger.warn("EntityUploadedMedia.getMediaTypeString: could not fetch data: " + ex.toString());
     }
     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 "
-                          + this.getClass().toString() + " " + ex.toString());
+      logger.warn("EntityUploadedMedia.getBigIconName: could not fetch data: " + ex.toString());
     }
     return null;
   }
@@ -134,8 +184,7 @@ public class EntityUploadedMedia extends Entity {
       return mediaHandler.getURL(this, mediaType);
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getUrl: could not fetch data "
-                          + this.getClass().toString() + " " + ex.toString());
+      logger.warn("EntityUploadedMedia.getUrl: could not fetch data: " + ex.toString());
     }
     return null;
   }
@@ -147,11 +196,10 @@ public class EntityUploadedMedia extends Entity {
     try {
       mediaType = getMediaType();
       mediaHandler = MediaHelper.getHandler(mediaType);
-      return mediaHandler.getDescr();
+      return mediaHandler.getDescr(mediaType);
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getDescr: could not fetch data "
-                          + this.getClass().toString() + " " + ex.toString());
+      logger.warn("EntityUploadedMedia.getDescr: could not fetch data: " + ex.toString());
     }
     return null;
   }
@@ -163,8 +211,7 @@ public class EntityUploadedMedia extends Entity {
       return mediaType.getValue("mime_type");
     }
     catch (Exception ex) {
-      theLog.printWarning("-- getBigIcon: could not fetch data "
-                          + this.getClass().toString() + " " + ex.toString());
+      logger.warn("EntityUploadedMedia.getBigIconName: could not fetch data: " + ex.toString());
     }
     return null;
   }