fixed / clean ups

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

diff --git a/source/mircoders/storage/DatabaseContentToMedia.java b/source/mircoders/storage/DatabaseContentToMedia.java
index 425e13a..c99bf76 100755 (executable)
--- a/source/mircoders/storage/DatabaseContentToMedia.java
+++ b/source/mircoders/storage/DatabaseContentToMedia.java
@@ -48,7 +48,7 @@ import mircoders.entity.EntityUploadedMedia;
  * <b>implements abstract DB connection to the content_x_media SQL table
  *
  * @author RK, mir-coders group
- * @version $Id: DatabaseContentToMedia.java,v 1.19.2.4 2003/11/26 19:21:06 rk Exp $
+ * @version $Id: DatabaseContentToMedia.java,v 1.19.2.5 2004/01/18 17:31:01 zapata Exp $
  *
  */
 
@@ -68,14 +68,14 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
 
     logger = new LoggerWrapper("Database.ContentToMedia");
     hasTimestamp = false;
-    theTable = "content_x_media";
+    mainTable = "content_x_media";
     theEntityClass = mir.entity.GenericEntity.class;
   }
 
   public boolean hasMedia(EntityContent content) throws StorageObjectFailure,
       StorageObjectExc {
     if (content != null) {
-      try {        
+      try {
         return (getSize("content_id=" + content.getId()) == 0) ? false:true;
       }
       catch (Exception e) {
@@ -93,19 +93,19 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
 
   private EntityList getMultiMediaForContent(StorageObject store, EntityContent content)
     throws StorageObjectFailure {
-    
+
     EntityList returnList = null;
     if (content != null) {
       String id = content.getId();
-      try {        
+      try {
         Vector extraTable = new Vector();
-        extraTable.add(theTable+" cxm");
+        extraTable.add(mainTable+" cxm");
         // media should stay in uploaded order. this is especially important
         // for photo stories which require a specific chronologic order.
-        // this is why we have the the second parameter "id"       
-        store.selectByWhereClause("m", extraTable, 
+        // this is why we have the the second parameter "id"
+        store.selectByWhereClause("m", extraTable,
           "m.id=cxm.media_id and cxm.content_id="+id, "id", -1, -1);
-                                       
+
                        } catch (Exception e) {
         logger.error("DatabaseContentToMedia.getMultiMediaForContent: " + e.toString());
         throw new StorageObjectFailure("DatabaseContentToMedia.etMultiMediaForContent: " +
@@ -114,7 +114,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
     }
     return returnList;
   }
-    
+
   /**
    * get all the audio belonging to a content entity
    */
@@ -156,7 +156,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
       return;
     }
     //first delete all row with content_id=contentId
-    String sql = "delete from " + theTable + " where content_id=" + contentId;
+    String sql = "delete from " + mainTable + " where content_id=" + contentId;
 
     Connection con = null;
     Statement stmt = null;
@@ -177,7 +177,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
     //now insert
     //first delete all row with content_id=contentId
     for (int i = 0; i < mediaId.length; i++) {
-      sql = "insert into " + theTable + " (content_id,media_id) values ("
+      sql = "insert into " + mainTable + " (content_id,media_id) values ("
           + contentId + "," + mediaId[i] + ")";
       try {
         con = getPooledCon();
@@ -205,7 +205,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
     Statement stmt = null;
     //now insert
 
-    String sql = "insert into " + theTable + " (content_id,media_id) values ("
+    String sql = "insert into " + mainTable + " (content_id,media_id) values ("
         + contentId + "," + mediaId + ")";
     try {
       con = getPooledCon();
@@ -228,7 +228,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
       return;
     }
     //first delete all row with content_id=contentId
-    String sql = "delete from " + theTable + " where content_id=" + contentId;
+    String sql = "delete from " + mainTable + " where content_id=" + contentId;
 
     Connection con = null;
     Statement stmt = null;
@@ -249,7 +249,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
     //now insert
     //first delete all row with content_id=contentId
 
-    sql = "insert into " + theTable + " (content_id,media_id) values ("
+    sql = "insert into " + mainTable + " (content_id,media_id) values ("
         + contentId + "," + mediaId + ")";
     try {
       con = getPooledCon();
@@ -272,7 +272,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
       return;
     }
     //delete all row with content_id=contentId
-    String sql = "delete from " + theTable + " where content_id=" + contentId;
+    String sql = "delete from " + mainTable + " where content_id=" + contentId;
 
     Connection con = null;
     Statement stmt = null;
@@ -293,13 +293,13 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
   }
 
   public void deleteByMediaId(String mediaId) throws StorageObjectFailure {
-  
+
     if (mediaId == null) {
       //theLog.printDebugInfo("-- delete topics failed -- no topic id");
       return;
     }
     //delete all row with content_id=contentId
-    String sql = "delete from " + theTable + " where media_id=" + mediaId;
+    String sql = "delete from " + mainTable + " where media_id=" + mediaId;
 
     Connection con = null;
     Statement stmt = null;
@@ -326,7 +326,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
       return;
     }
     //delete all row with content_id=contentId and media_id=mediaId
-    String sql = "delete from " + theTable + " where media_id=" + mediaId +
+    String sql = "delete from " + mainTable + " where media_id=" + mediaId +
         " and content_id= " + contentId;
 
     Connection con = null;
@@ -349,19 +349,19 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
 
   public EntityList getContent(EntityUploadedMedia media) throws
       StorageObjectFailure {
-        
+
     EntityList returnList = null;
     if (media != null) {
 
       String id = media.getId();
       Vector extraTables = new Vector();
-      extraTables.add(theTable + " cxm");
-      
+      extraTables.add(mainTable + " cxm");
+
       String mediaSelect = "cxm.content_id=c.id and cxm.media_id="+id;
       try {
         returnList = DatabaseContent.getInstance().selectByWhereClause("c",
           extraTables, mediaSelect, "c.id" );
-        
+
       }
       catch (Exception e) {
         logger.error("-- get content failed");
@@ -378,15 +378,15 @@ public class DatabaseContentToMedia extends Database implements StorageObject{
   public EntityList getContent() throws StorageObjectFailure {
 
     EntityList returnList = null;
-  
+
     Vector extraTables = new Vector();
-    extraTables.add(theTable + " cxm");
-    
+    extraTables.add(mainTable + " cxm");
+
     String mediaSelect = "cxm.content_id=c.id";
     try {
       returnList = DatabaseContent.getInstance().selectByWhereClause("c",
         extraTables, mediaSelect, "c.webdb_lastchange desc" );
-      
+
     }
     catch (Exception e) {
       logger.error("-- get content failed");