From: zapata <zapata>
Date: Sun, 16 Mar 2003 19:54:45 +0000 (+0000)
Subject: and this time right...
X-Git-Tag: BEFORE_MERGE_1_1~208
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=662d2dfe5d60590b36eac3080b239f8d8ba36aff;p=mir.git

and this time right...
---

diff --git a/source/mircoders/entity/EntityAudio.java b/source/mircoders/entity/EntityAudio.java
index 9510e4df..768e8ebd 100755
--- a/source/mircoders/entity/EntityAudio.java
+++ b/source/mircoders/entity/EntityAudio.java
@@ -41,7 +41,7 @@ import mir.storage.StorageObjectFailure;
  * This class handles storage of audio data and meta data
  *
  * @author mh
- * @version $Id: EntityAudio.java,v 1.8 2003/03/16 19:34:43 zapata Exp $
+ * @version $Id: EntityAudio.java,v 1.9 2003/03/16 19:54:45 zapata Exp $
  */
 
 
@@ -56,16 +56,6 @@ public class EntityAudio extends EntityUploadedMedia
     setStorage(theStorage);
   }
 
-  public void update() throws StorageObjectFailure {
-    super.update();
-    try {
-      theStorageObject.executeUpdate("update content set is_produced='0' where exists(select * from content_x_media where to_content=content.id and to_media=" + getId()+")");
-    }
-    catch (SQLException e) {
-      throwStorageObjectFailure(e, "EntityAudio :: update :: failed!! ");
-    }
-  }
-
   public void setValues(Map theStringValues) {
     if (theStringValues != null) {
       if (!theStringValues.containsKey("is_published"))
diff --git a/source/mircoders/entity/EntityOther.java b/source/mircoders/entity/EntityOther.java
index e26e5e6e..a470850f 100755
--- a/source/mircoders/entity/EntityOther.java
+++ b/source/mircoders/entity/EntityOther.java
@@ -56,16 +56,6 @@ public class EntityOther extends EntityUploadedMedia
     setStorage(theStorage);
   }
 
-  public void update() throws StorageObjectFailure {
-    super.update();
-    try {
-      theStorageObject.executeUpdate("update content set is_produced='0' where exists(select * from content_x_media where to_content=content.id and to_media=" + getId()+")");
-    }
-    catch (SQLException e) {
-      throwStorageObjectFailure(e, "EntityOther :: update :: failed!! ");
-    }
-  }
-
   public void setValues(Map theStringValues) {
     if (theStringValues != null) {
       if (!theStringValues.containsKey("is_published"))
diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index f6ead2cf..ecff9254 100755
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -32,6 +32,12 @@
 package mircoders.entity;
 
 import java.util.Map;
+import java.sql.SQLException;
+
+import freemarker.template.SimpleList;
+import freemarker.template.SimpleScalar;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
 
 import mir.entity.Entity;
 import mir.entity.EntityList;
@@ -43,15 +49,11 @@ import mir.storage.StorageObject;
 import mir.storage.StorageObjectFailure;
 import mircoders.storage.DatabaseContentToMedia;
 import mircoders.storage.DatabaseUploadedMedia;
-import freemarker.template.SimpleList;
-import freemarker.template.SimpleScalar;
-import freemarker.template.TemplateModel;
-import freemarker.template.TemplateModelException;
 
 /**
  *
  * @author mh, mir-coders group
- * @version $Id: EntityUploadedMedia.java,v 1.23 2003/03/09 03:53:11 zapata Exp $
+ * @version $Id: EntityUploadedMedia.java,v 1.24 2003/03/16 19:54:45 zapata Exp $
  */
 
 
@@ -71,12 +73,11 @@ public class EntityUploadedMedia extends Entity {
 
   public void update() throws StorageObjectFailure {
     super.update();
-    EntityList contentList = DatabaseContentToMedia.getInstance().getContent(this);
-    if (contentList!=null && contentList.size()>0) {
-      for(int i=0;i<contentList.size();i++) {
-        EntityContent contentEnt = (EntityContent)contentList.elementAt(i);
-        contentEnt.setProduced(false);
-      }
+    try {
+      theStorageObject.executeUpdate("update content set is_produced='0' where exists(select * from content_x_media where to_content=content.id and to_media=" + getId()+")");
+    }
+    catch (SQLException e) {
+      throwStorageObjectFailure(e, "EntityAudio :: update :: failed!! ");
     }
   }
 
diff --git a/source/mircoders/entity/EntityVideo.java b/source/mircoders/entity/EntityVideo.java
index 372306de..b16d3d6c 100755
--- a/source/mircoders/entity/EntityVideo.java
+++ b/source/mircoders/entity/EntityVideo.java
@@ -59,20 +59,6 @@ public class EntityVideo extends EntityUploadedMedia
     setStorage(theStorage);
   }
 
-  //
-  // methods
-
-  public void update() throws StorageObjectFailure {
-    super.update();
-
-    try {
-      theStorageObject.executeUpdate("update content set is_produced='0' where exists(select * from content_x_media where to_content=content.id and to_media=" + getId()+")");
-    }
-    catch (SQLException e) {
-      logger.error("EntityVideo.update: " + e.toString());
-    }
-  }
-
   public void setValues(Map theStringValues) {
     if (theStringValues != null) {
       if (!theStringValues.containsKey("is_published"))