1.1 restoration

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

diff --git a/source/mircoders/storage/DatabaseContent.java b/source/mircoders/storage/DatabaseContent.java
index 357530e..53c00f7 100755 (executable)
--- a/source/mircoders/storage/DatabaseContent.java
+++ b/source/mircoders/storage/DatabaseContent.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,15 +18,14 @@
  * 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;
@@ -34,13 +33,10 @@ package mircoders.storage;
 import java.sql.Connection;
 import java.sql.Statement;
 
-import mir.entity.EntityList;
-import mir.entity.EntityRelation;
 import mir.log.LoggerWrapper;
 import mir.storage.Database;
 import mir.storage.StorageObject;
 import mir.storage.StorageObjectFailure;
-import mircoders.entity.EntityContent;
 
 /**
  * <b>this class implements the access to the content-table</b>
@@ -51,20 +47,16 @@ import mircoders.entity.EntityContent;
 public class DatabaseContent extends Database implements StorageObject {
 
   private static DatabaseContent      instance;
-  private static EntityRelation       relationComments;
-  private static EntityRelation       relationFeature;
 
   // Contructors / Singleton
 
   // the following *has* to be sychronized cause this static method
   // could get preemted and we could end up with 2 instances of DatabaseFoo.
   // see the "Singletons with needles and thread" article at JavaWorld -mh
-  public synchronized static DatabaseContent getInstance()
-    throws StorageObjectFailure {
+  public synchronized static DatabaseContent getInstance() {
 
     if (instance == null ) {
       instance = new DatabaseContent();
-      instance.myselfDatabase = instance;
     }
     return instance;
   }
@@ -72,14 +64,10 @@ public class DatabaseContent extends Database implements StorageObject {
   private DatabaseContent() throws StorageObjectFailure {
 
     super();
-    theTable="content";
-    theCoreTable="media";
+    mainTable="content";
+    primaryKeySequence="media_id_seq";
     logger = new LoggerWrapper("Database.Content");
 
-    relationComments =
-        new EntityRelation("id", "to_media", DatabaseComment.getInstance(), EntityRelation.TO_MANY);
-    relationFeature =
-        new EntityRelation("id", "to_feature", DatabaseFeature.getInstance(), EntityRelation.TO_ONE);
     theEntityClass = mircoders.entity.EntityContent.class;
   }
 
@@ -95,36 +83,32 @@ public class DatabaseContent extends Database implements StorageObject {
     String sql = "update content set is_produced='0' where " + where;
     logger.debug("set unproduced: "+where);
     try {
-      con = getPooledCon();
+      con = obtainConnection();
       // should be a preparedStatement because is faster
       stmt = con.createStatement();
       executeUpdate(stmt,sql);
       logger.debug("set unproduced: "+where);
     }
-    catch (Exception e) {_throwStorageObjectException(e, "-- set unproduced failed");}
+    catch (Exception e) {
+      _throwStorageObjectException(e, "-- set unproduced failed");
+    }
     finally { freeConnection(con,stmt);}
   }
 
   /**
-   * returns the comments that belong to the article (via entityrelation)
-   * where db-flag is_published is true
+   *
+   * @param id
+   * @return
+   * @throws StorageObjectFailure
    */
-  public EntityList getComments(EntityContent entC) throws StorageObjectFailure {
-    return relationComments.getMany(entC,"webdb_create","is_published='1'");
-  }
-
-  /**
-   * returns the features that belong to the article (via entityrelation)
-   */
-  public EntityList getFeature(EntityContent entC) throws StorageObjectFailure {
-    return relationFeature.getMany(entC);
-  }
 
   public boolean delete(String id) throws StorageObjectFailure
   {
     DatabaseComment.getInstance().deleteByContentId(id);
-    super.delete(id);
-    return true;
+    DatabaseContentToTopics.getInstance().deleteByContentId(id);
+    DatabaseContentToMedia.getInstance().deleteByContentId(id);
+
+    return super.delete(id);
   }
 
 }