bufix media

[mir.git] / source / mircoders / storage / DatabaseUploadedMedia.java

diff --git a/source/mircoders/storage/DatabaseUploadedMedia.java b/source/mircoders/storage/DatabaseUploadedMedia.java
index 5d91315..8c2000f 100755 (executable)
--- a/source/mircoders/storage/DatabaseUploadedMedia.java
+++ b/source/mircoders/storage/DatabaseUploadedMedia.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,38 +18,33 @@
  * 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.storage;
 
-import mir.entity.Entity;
-import mir.entity.EntityRelation;
-import mir.log.LoggerWrapper;
-import mir.storage.Database;
-import mir.storage.StorageObject;
+import java.util.Iterator;\r
+\r
+import mir.entity.Entity;\r
+import mir.entity.EntityBrowser;\r
+import mir.log.LoggerWrapper;\r
+import mir.storage.Database;\r
+import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;
 
 public class DatabaseUploadedMedia extends Database implements StorageObject {
   private static DatabaseUploadedMedia  instance;
-  private static EntityRelation         relationMediaType;
 
-  public static DatabaseUploadedMedia getInstance() {
+  public synchronized static DatabaseUploadedMedia getInstance() {
     if (instance == null ) {
-      synchronized(DatabaseUploadedMedia.class) {
-        if (instance == null ) {
-          instance = new DatabaseUploadedMedia();
-          instance.myselfDatabase = instance;
-        }
-      }
+      instance = new DatabaseUploadedMedia();
     }
 
     return instance;
@@ -62,7 +57,6 @@ public class DatabaseUploadedMedia extends Database implements StorageObject {
 
     theTable="uploaded_media";
     theCoreTable="media";
-    relationMediaType = new EntityRelation("to_media_type", "id", DatabaseMediaType.getInstance(), EntityRelation.TO_ONE);
     theEntityClass = mircoders.entity.EntityUploadedMedia.class;
   }
 
@@ -74,7 +68,9 @@ public class DatabaseUploadedMedia extends Database implements StorageObject {
   public Entity getMediaType(Entity ent) throws StorageObjectFailure {
     Entity type=null;
     try {
-      type = relationMediaType.getOne(ent);
+      Iterator i = new EntityBrowser(DatabaseMediaType.getInstance(), ent.getValue("to_media_type") + " = id" , "id", 1);
+      if (i.hasNext())
+        type = (Entity) i.next();
     }
     catch (Throwable t) {
       logger.error("DatabaseUploadedMedia :: failed to get media_type: " + t.getMessage());