X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fstorage%2FDatabaseVideo.java;h=eaff7e4d61a7c9f86683fff57f3eccce461ddeb0;hb=d06e23e638f2538f263af76bd32da6b140f20ac6;hp=0c720e89859e9bd4397fb97f438e1206bd884fe8;hpb=55d545036aa5c04676f2d20f0e98316a4679ec27;p=mir.git

diff --git a/source/mircoders/storage/DatabaseVideo.java b/source/mircoders/storage/DatabaseVideo.java
index 0c720e89..eaff7e4d 100755
--- a/source/mircoders/storage/DatabaseVideo.java
+++ b/source/mircoders/storage/DatabaseVideo.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;
@@ -37,20 +36,11 @@ import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
 import mir.storage.Database;
-import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
-import freemarker.template.SimpleList;
+import mir.storage.DatabaseFailure;
 
-/**
- * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle
- *
- *
- */
-
-public class DatabaseVideo extends Database implements StorageObject{
+public class DatabaseVideo extends Database {
 
   private static DatabaseVideo instance;
-  private static SimpleList publisherPopupData;
 
   // the following *has* to be sychronized cause this static method
   // could get preemted and we could end up with 2 instances of DatabaseFoo..
@@ -58,7 +48,6 @@ public class DatabaseVideo extends Database implements StorageObject{
   public synchronized static DatabaseVideo getInstance() {
     if (instance == null) {
       instance = new DatabaseVideo();
-      instance.myselfDatabase = instance;
     }
     return instance;
   }
@@ -67,34 +56,30 @@ public class DatabaseVideo extends Database implements StorageObject{
     super();
 
     logger = new LoggerWrapper("Database.Video");
-
-    hasTimestamp = true;
-    theTable = "video";
-    theCoreTable = "media";
-    theEntityClass = mircoders.entity.EntityVideo.class;
-  }
-
-  public SimpleList getPopupData() throws StorageObjectFailure {
-    return getPopupData("title", true);
+    mainTable = "video";
+    entityClass = mircoders.entity.EntityVideo.class;
   }
 
-  public void update(Entity theEntity) throws StorageObjectFailure {
-    String date = theEntity.getValue("date");
+  public void update(Entity theEntity) throws DatabaseFailure {
+    String date = theEntity.getFieldValue("date");
     if (date == null) {
       date = StringUtil.date2webdbDate(new GregorianCalendar());
-      theEntity.setValueForProperty("date", date);
+      theEntity.setFieldValue("date", date);
     }
 
     super.update(theEntity);
   }
 
-  public String insert(Entity theEntity) throws StorageObjectFailure {
-    String date = theEntity.getValue("date");
+  public String insert(Entity theEntity) throws DatabaseFailure {
+    String date = theEntity.getFieldValue("date");
     if (date == null) {
       date = StringUtil.date2webdbDate(new GregorianCalendar());
-      theEntity.setValueForProperty("date", date);
+      theEntity.setFieldValue("date", date);
     }
     return super.insert(theEntity);
   }
 
+  protected String getPrimaryKeySequence() {
+    return "media_id_seq";
+  }
 }