xml encoding problem...

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

diff --git a/source/mircoders/storage/DatabaseComment.java b/source/mircoders/storage/DatabaseComment.java
index 54fa068..3151c99 100755 (executable)
--- a/source/mircoders/storage/DatabaseComment.java
+++ b/source/mircoders/storage/DatabaseComment.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;
@@ -35,6 +34,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import mir.log.LoggerWrapper;
 import mir.storage.Database;
 import mir.storage.StorageObject;
 import mir.storage.StorageObjectFailure;
@@ -49,56 +49,50 @@ import freemarker.template.SimpleList;
 
 public class DatabaseComment extends Database implements StorageObject{
 
-       private static DatabaseComment instance;
+  private static DatabaseComment instance;
 
-       // 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 DatabaseComment getInstance() 
-         throws StorageObjectFailure {
-               if (instance == null) {
-                       instance = new DatabaseComment();
-                       instance.myselfDatabase = instance;
-               }
-               return instance;
-       }
+  public synchronized static DatabaseComment getInstance() {
+    if (instance == null) {
+      instance = new DatabaseComment();
+    }
+    return instance;
+  }
 
-       private DatabaseComment() throws StorageObjectFailure
-       {
-               super();
-               this.hasTimestamp = false;
-               ////this.cache = new HashMap();
-               this.theTable="comment";
-               try {
-                       this.theEntityClass = Class.forName("mircoders.entity.EntityComment");
-               }
-               catch (Exception e) { throw new StorageObjectFailure(e);        }
-       }
+  private DatabaseComment() {
+    super();
+    hasTimestamp = false;
+    theTable = "comment";
+    logger = new LoggerWrapper("Database.Comment");
 
-       public SimpleList getPopupData()
-        throws StorageObjectFailure { return getPopupData("title",true); }
+    this.theEntityClass = mircoders.entity.EntityComment.class;
+  }
 
-       public boolean deleteByContentId(String id)
-               throws StorageObjectFailure {
-               Statement   stmt=null;
-               Connection  con=null;
-               String      sql;
-               int         res = 0;
+  public SimpleList getPopupData() throws StorageObjectFailure {
+    return getPopupData("title", true);
+  }
 
-               /** @todo comments and topics should be deleted */
-               sql = "delete from "+ theTable + " where to_media="+id;
-               //theLog.printInfo("DELETE "+ sql);
+  public boolean deleteByContentId(String id) throws StorageObjectFailure {
+    Statement stmt = null;
+    Connection con = null;
+    String sql;
+    int res = 0;
 
-               try {
-                       con=getPooledCon();
-                       stmt = con.createStatement();
-                       res = stmt.executeUpdate(sql);
-               }       catch (SQLException sqe) {
-                       new StorageObjectFailure(sqe);
-                       return false;
-               } finally {
-                       freeConnection(con,stmt);
-               }
-               return true;
-       }
+    /** @todo comments and topics should be deleted */
+    sql = "delete from " + theTable + " where to_media=" + id;
+    logger.info("DELETE "+ sql);
+
+    try {
+      con = getPooledCon();
+      stmt = con.createStatement();
+      res = stmt.executeUpdate(sql);
+    }
+    catch (SQLException sqe) {
+      new StorageObjectFailure(sqe);
+      return false;
+    }
+    finally {
+      freeConnection(con, stmt);
+    }
+    return true;
+  }
 }