X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fentity%2FEntityUploadedMedia.java;h=b28cdb10f2c044e2438dc5c5db4d89dd2193a8fe;hb=72a4ce57462288ed9a8f711638b33a8fcfe73d70;hp=f6ead2cf6d79b775d7e5f5cbc52dc40f21b9a121;hpb=1bb7abb8f82c9bc0287fb3e226a0ea5d805db2df;p=mir.git

diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index f6ead2cf..b28cdb10 100755
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,74 +18,37 @@
  * 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.
+ * the code of this program with  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 java.util.Map;
-
+import mir.entity.AbstractEntity;
 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.StorageObjectFailure;
-import mircoders.storage.DatabaseContentToMedia;
+import mir.storage.DatabaseFailure;
 import mircoders.storage.DatabaseUploadedMedia;
-import freemarker.template.SimpleList;
-import freemarker.template.SimpleScalar;
-import freemarker.template.TemplateModel;
-import freemarker.template.TemplateModelException;
+
+import java.util.Map;
 
 /**
  *
  * @author mh, mir-coders group
- * @version $Id: EntityUploadedMedia.java,v 1.23 2003/03/09 03:53:11 zapata Exp $
+ * @version $Id: EntityUploadedMedia.java,v 1.26.2.15 2006/02/21 20:24:43 zapata Exp $
  */
 
-
-public class EntityUploadedMedia extends Entity {
-
-
-  public EntityUploadedMedia() {
-    super();
-
-    logger = new LoggerWrapper("Entity.UploadedMedia");
-  }
-
-  public EntityUploadedMedia(StorageObject theStorage) {
-    this();
-    setStorage(theStorage);
-  }
-
-  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) {
+public class EntityUploadedMedia extends AbstractEntity {
+  public void setFieldValues(Map theStringValues) {
     if (theStringValues != null) {
       if (!theStringValues.containsKey("is_published"))
         theStringValues.put("is_published", "0");
     }
-    super.setValues(theStringValues);
+    super.setFieldValues(theStringValues);
   }
 
 
@@ -94,126 +57,14 @@ public class EntityUploadedMedia extends Entity {
    *
    * @return mir.entity.Entity
    */
-  public Entity getMediaType() throws StorageObjectFailure {
+  public Entity getMediaType() throws DatabaseFailure {
     Entity ent = null;
     try {
       ent = DatabaseUploadedMedia.getInstance().getMediaType(this);
     }
-    catch (StorageObjectFailure e) {
-      throwStorageObjectFailure(e, "get MediaType failed -- ");
+    catch (DatabaseFailure e) {
+      throw new DatabaseFailure(e);
     }
     return ent;
   }
-
-  public String getValue(String key) {
-    String returnValue = null;
-
-    if (key != null) {
-      if (key.equals("big_icon"))
-        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);
-    }
-    return returnValue;
-  }
-
-  public TemplateModel get(java.lang.String key) throws TemplateModelException {
-    if (key.equals("url"))
-      return getUrl();
-    return new SimpleScalar(getValue(key));
-  }
-
-  // @todo  all these methods should be merged into 1
-  // and the MediaHandler should be cached somehow.
-  private String getMediaTypeString() {
-    MirMedia mediaHandler = null;
-    Entity mediaType = null;
-
-    try {
-      mediaType = getMediaType();
-      mediaHandler = MediaHelper.getHandler(mediaType);
-      String t;
-      if (mediaHandler.isAudio())
-        return "audio";
-      else if (mediaHandler.isImage())
-        return "image";
-      else if (mediaHandler.isVideo())
-        return "video";
-      else
-        return "other";
-    }
-    catch (Exception ex) {
-      logger.warn("EntityUploadedMedia.getMediaTypeString: could not fetch data: " + ex.toString());
-    }
-    return null;
-  }
-
-  private String getBigIconName() {
-    MirMedia mediaHandler = null;
-    Entity mediaType = null;
-
-    try {
-      mediaType = getMediaType();
-      mediaHandler = MediaHelper.getHandler(mediaType);
-      return mediaHandler.getBigIconName();
-    }
-    catch (Exception ex) {
-      logger.warn("EntityUploadedMedia.getBigIconName: could not fetch data: " + ex.toString());
-    }
-    return null;
-  }
-
-  private SimpleList getUrl() {
-    MirMedia mediaHandler = null;
-    Entity mediaType = null;
-
-    try {
-      mediaType = getMediaType();
-      mediaHandler = MediaHelper.getHandler(mediaType);
-      return mediaHandler.getURL(this, mediaType);
-    }
-    catch (Throwable t) {
-      logger.warn("EntityUploadedMedia.getUrl: could not fetch data: " + t.toString());
-    }
-    return null;
-  }
-
-  private String getDescr() {
-    MirMedia mediaHandler = null;
-    Entity mediaType = null;
-
-    try {
-      mediaType = getMediaType();
-      mediaHandler = MediaHelper.getHandler(mediaType);
-      return mediaHandler.getDescr(mediaType);
-    }
-    catch (Exception ex) {
-      logger.warn("EntityUploadedMedia.getDescr: could not fetch data: " + ex.toString());
-    }
-    return null;
-  }
-  private String getMimeType() {
-    Entity mediaType = null;
-
-    try {
-      mediaType = getMediaType();
-      return mediaType.getValue("mime_type");
-    }
-    catch (Exception ex) {
-      logger.warn("EntityUploadedMedia.getBigIconName: could not fetch data: " + ex.toString());
-    }
-    return null;
-  }
-
 }