rebuilding head

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

diff --git a/source/mircoders/storage/DatabaseImages.java b/source/mircoders/storage/DatabaseImages.java
index 7a6f15c..33a0769 100755 (executable)
--- a/source/mircoders/storage/DatabaseImages.java
+++ b/source/mircoders/storage/DatabaseImages.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,29 +18,26 @@
  * 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 java.util.GregorianCalendar;
 
-import freemarker.template.*;
-
-import mir.storage.*;
-import mir.entity.*;
-import mir.misc.*;
+import mir.entity.Entity;
+import mir.log.LoggerWrapper;
+import mir.misc.StringUtil;
+import mir.storage.Database;
+import mir.storage.StorageObject;
+import mir.storage.StorageObjectFailure;
 
 /**
  * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle
@@ -50,60 +47,44 @@ import mir.misc.*;
 
 public class DatabaseImages extends Database implements StorageObject{
 
-       private static DatabaseImages instance;
-       private static SimpleList publisherPopupData;
+  private static DatabaseImages 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 DatabaseImages getInstance()
-    throws StorageObjectException
-       {
-               if (instance == null) {
-                       instance = new DatabaseImages();
-                       instance.myselfDatabase = instance;
-               }
-               return instance;
-       }
+  public synchronized static DatabaseImages getInstance() {
+    if (instance == null) {
+      instance = new DatabaseImages();
+    }
+    return instance;
+  }
 
-       private DatabaseImages() throws StorageObjectException
-       {
-               super();
-               this.hasTimestamp = true;
-               this.theTable="images";
-               this.theCoreTable="media";
-               try {
-                       this.theEntityClass = Class.forName("mircoders.entity.EntityImages");
-               }
-               catch (Exception e) { throw new StorageObjectException(e.toString());   }
-       }
+  private DatabaseImages() {
+    super();
 
-       public SimpleList getPopupData() throws StorageObjectException {
-               return getPopupData("title",true);
-       }
+    logger = new LoggerWrapper("Database.Images");
 
-       public void update(Entity theEntity) throws StorageObjectException
-       {
-               String date = theEntity.getValue("date");
-               if (date==null){
-                       date = StringUtil.date2webdbDate(new GregorianCalendar());
-                       theEntity.setValueForProperty("date",date);
-               }
+    hasTimestamp = true;
+    mainTable = "images";
+    primaryKeySequence = "media_id_seq";
+    theEntityClass = mircoders.entity.EntityImages.class;
+  }
 
-               super.update(theEntity);
-       }
+  public void update(Entity theEntity) throws StorageObjectFailure {
+    String date = theEntity.getFieldValue("date");
+    if (date == null) {
+      date = StringUtil.date2webdbDate(new GregorianCalendar());
+      theEntity.setFieldValue("date", date);
+    }
 
+    super.update(theEntity);
+  }
 
-       public String insert(Entity theEntity) throws StorageObjectException
-       {
-               String date = theEntity.getValue("date");
-               if (date==null){
-                       date = StringUtil.date2webdbDate(new GregorianCalendar());
-                       theEntity.setValueForProperty("date",date);
-               }
-               return super.insert(theEntity);
-       }
+  public String insert(Entity theEntity) throws StorageObjectFailure {
+    String date = theEntity.getFieldValue("date");
 
-       // initialisierungen aus den statischen Tabellen
+    if (date == null) {
+      date = StringUtil.date2webdbDate(new GregorianCalendar());
+      theEntity.setFieldValue("date", date);
+    }
 
+    return super.insert(theEntity);
+  }
 }