X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmircoders%2Fstorage%2FDatabaseContent.java;h=bf14742b54431c966a34056d29b6aeb1190f309b;hb=95c2e3a74f492f6f61d4dbe8bb47996f43af0627;hp=03a18407c7be5e40662e6979f219c1ee36d92857;hpb=8563841098b6ab3e6233f61519e58b41dcc30266;p=mir.git

diff --git a/source/mircoders/storage/DatabaseContent.java b/source/mircoders/storage/DatabaseContent.java
index 03a18407..bf14742b 100755
--- 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,70 +18,44 @@
  * 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 java.lang.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
+import mir.log.LoggerWrapper;
+import mir.storage.Database;
+import mir.storage.DatabaseFailure;
 
-import freemarker.template.*;
+import java.sql.Connection;
+import java.sql.Statement;
 
-import mir.storage.*;
-import mir.entity.*;
-import mir.misc.*;
-
-import mircoders.entity.*;
-
-/**
- * <b>this class implements the access to the content-table</b>
- *
- *
- */
-
-public class DatabaseContent extends Database implements StorageObject {
+public class DatabaseContent extends Database  {
 
   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 StorageObjectException {
+  public synchronized static DatabaseContent getInstance() {
 
     if (instance == null ) {
       instance = new DatabaseContent();
-      instance.myselfDatabase = instance;
     }
     return instance;
   }
 
-  private DatabaseContent()
-    throws StorageObjectException {
+  private DatabaseContent() throws DatabaseFailure {
 
     super();
-    this.theTable="content";
-    this.theCoreTable="media";
+    mainTable="content";
+    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);
-    try { this.theEntityClass = Class.forName("mircoders.entity.EntityContent"); }
-    catch (Exception e) { throw new StorageObjectException(e.toString()); }
+    entityClass = mircoders.entity.EntityContent.class;
   }
 
   // methods
@@ -90,42 +64,33 @@ public class DatabaseContent extends Database implements StorageObject {
    * sets the database flag is_produced to unproduced
    */
 
-  public void setUnproduced(String where) throws StorageObjectException
+  public void setUnproduced(String where) throws DatabaseFailure
   {
     Connection con=null;Statement stmt=null;
     String sql = "update content set is_produced='0' where " + where;
-    theLog.printDebugInfo("set unproduced: "+where);
+    logger.debug("set unproduced: "+where);
     try {
-      con = getPooledCon();
+      con = obtainConnection();
       // should be a preparedStatement because is faster
       stmt = con.createStatement();
       executeUpdate(stmt,sql);
-      theLog.printDebugInfo("set unproduced: "+where);
+      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
-   */
-  public EntityList getComments(EntityContent entC) throws StorageObjectException {
-    return relationComments.getMany(entC,"webdb_create","is_published='1'");
-  }
+  public boolean delete(String id) throws DatabaseFailure {
+    DatabaseComment.getInstance().deleteByContentId(id);
+    DatabaseContentToTopics.getInstance().deleteByContentId(id);
+    DatabaseContentToMedia.getInstance().deleteByContentId(id);
 
-  /**
-   * returns the features that belong to the article (via entityrelation)
-   */
-  public EntityList getFeature(EntityContent entC) throws StorageObjectException {
-    return relationFeature.getMany(entC);
+    return super.delete(id);
   }
 
-  public boolean delete(String id) throws StorageObjectException
-  {
-    DatabaseComment.getInstance().deleteByContentId(id);
-    super.delete(id);
-    return true;
+  protected String getPrimaryKeySequence() {
+    return "media_id_seq";
   }
-
 }