several fixes, mostly in the anti-abuse system

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

diff --git a/source/mircoders/storage/DatabaseUploadedMedia.java b/source/mircoders/storage/DatabaseUploadedMedia.java
index 15ce4e6..0e077ed 100755 (executable)
--- a/source/mircoders/storage/DatabaseUploadedMedia.java
+++ b/source/mircoders/storage/DatabaseUploadedMedia.java
@@ -1,66 +1,79 @@
-package mircoders.storage;
-
-import java.lang.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
-
-import freemarker.template.*;
-
-import mir.storage.*;
-import mir.entity.*;
-import mir.misc.*;
-
-import mircoders.entity.*;
-
-/**
- * <b>this class implements the access to the content-table</b>
+/*
+ * 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  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.
  */
 
-public class DatabaseUploadedMedia extends Database implements StorageObject {
+package mircoders.storage;
 
+import mir.entity.Entity;
+import mir.entity.EntityRelation;
+import mir.log.LoggerWrapper;
+import mir.storage.Database;
+import mir.storage.StorageObject;
+import mir.storage.StorageObjectFailure;
+
+public class DatabaseUploadedMedia extends Database implements StorageObject {
   private static DatabaseUploadedMedia  instance;
   private static EntityRelation         relationMediaType;
 
-  // Contructors / Singleton
-
-  public static DatabaseUploadedMedia getInstance()
-    throws StorageObjectException {
-
+  public synchronized static DatabaseUploadedMedia getInstance() {
     if (instance == null ) {
       instance = new DatabaseUploadedMedia();
-      instance.myselfDatabase = instance;
     }
+
     return instance;
   }
 
-  private DatabaseUploadedMedia()
-    throws StorageObjectException {
-
+  private DatabaseUploadedMedia() {
     super();
-    this.theTable="uploaded_media";
-    this.theCoreTable="media";
+
+    logger = new LoggerWrapper("Database.UploadedMedia");
+
+    theTable="uploaded_media";
+    theCoreTable="media";
     relationMediaType = new EntityRelation("to_media_type", "id", DatabaseMediaType.getInstance(), EntityRelation.TO_ONE);
-    try { this.theEntityClass = Class.forName("mircoders.entity.EntityUploadedMedia"); }
-    catch (Exception e) { throw new StorageObjectException(e.toString()); }
+    theEntityClass = mircoders.entity.EntityUploadedMedia.class;
   }
 
-  // methods
-
 
   /**
-   * returns the comments that belong to the article (via entityrelation)
+   * returns the media_type that belongs to the media item (via entityrelation)
    * where db-flag is_published is true
    */
-  public Entity getMediaType(Entity ent) {
+  public Entity getMediaType(Entity ent) throws StorageObjectFailure {
     Entity type=null;
     try {
       type = relationMediaType.getOne(ent);
     }
-    catch (StorageObjectException e) {
-      theLog.printError("DatabaseUploadedMedia :: failed to get media_type");
+    catch (Throwable t) {
+      logger.error("DatabaseUploadedMedia :: failed to get media_type: " + t.getMessage());
+
+      throw new StorageObjectFailure("DatabaseUploadedMedia :: failed to get media_type", t);
     }
     return type;
   }