This reverts to making the images table inherit from media and no longer uploaded_med...

[mir.git] / source / mircoders / producer / ProducerContent.java

diff --git a/source/mircoders/producer/ProducerContent.java b/source/mircoders/producer/ProducerContent.java
index c482d73..abfd911 100755 (executable)
--- a/source/mircoders/producer/ProducerContent.java
+++ b/source/mircoders/producer/ProducerContent.java
@@ -154,7 +154,7 @@ public class ProducerContent extends Producer {
           for (int n=0; n < currentMediaList.size();n++) {
             upMedia = currentMediaList.elementAt(n);
             upMediaSimpleHash = HTMLTemplateProcessor.makeSimpleHash(upMedia);
-            mediaType = ((EntityUploadedMedia)upMedia).getMediaType();
+            mediaType = ((EntityMedia)upMedia).getMediaType();
             //must be a non-existant to_media_type entry..
             if (mediaType != null) {
               try {
@@ -163,12 +163,10 @@ public class ProducerContent extends Producer {
                 mediaStorageClass = Class.forName("mircoders.storage.Database"+mediaStorageName);
                 mediaHandlerClass = Class.forName("mir.media.MediaHandler"+mediaHandlerName);
                 mediaHandler = (MirMedia)mediaHandlerClass.newInstance();
-                if(!mediaStorageName.equals(new String("UploadedMedia"))) {
-                  Method m = mediaStorageClass.getMethod("getInstance", null);
-                  mediaStorage = (Database)m.invoke(null, null);
-                  //we most likely need further info
-                  upMedia = mediaStorage.selectById(upMedia.getId());
-                }
+                Method m = mediaStorageClass.getMethod("getInstance", null);
+                mediaStorage = (Database)m.invoke(null, null);
+                //we most likely need further info
+                upMedia = mediaStorage.selectById(upMedia.getId());
               } catch (Exception e) {
                 theLog.printError("ProducerStartpage:problem in reflection: "+mediaHandlerName);
               } //end catch