cleanup list producer

diff --git a/source/mircoders/producer/ProducerList.java b/source/mircoders/producer/ProducerList.java
index 3579294..9caf80b 100755 (executable)
--- a/source/mircoders/producer/ProducerList.java
+++ b/source/mircoders/producer/ProducerList.java
@@ -27,15 +27,6 @@ abstract public class ProducerList extends Producer {
   public String orderBy;
   public String fileDesc;
   protected HashMap additional = new HashMap();
-  Entity              mediaType;
-  Entity              upMedia;
-  SimpleHash          upMediaSimpleHash;
-  Class               mediaHandlerClass;
-  Class               mediaStorageClass;
-  String              mediaStorageName;
-  String              mediaHandlerName=null;
-  MirMedia            mediaHandler=null;
-  Database            mediaStorage=null;
 
 
 
@@ -96,63 +87,6 @@ abstract public class ProducerList extends Producer {
       //now produce the pages
       if (list!=null || force==true) {
         SimpleHash mergeData = HTMLTemplateProcessor.makeSimpleHashWithEntitylistInfos(list);
-        //first we try to get the media
-
-        if(list!=null){
-          for (int k=0; k < list.size();k++) {
-            currentContent = (EntityContent)list.elementAt(k);
-            try {
-                //media to content
-                EntityList currentMediaList = DatabaseContentToMedia.getInstance().getUploadedMedia(currentContent);
-                SimpleList contentList = (SimpleList)mergeData.get("contentlist");
-                SimpleHash contentHash = (SimpleHash)contentList.get(k);
-                if (currentMediaList!=null && currentMediaList.getCount()>=1) {
-                  SimpleList mediaListAudio = new SimpleList();
-                  SimpleList mediaListImages = new SimpleList();
-                  SimpleList mediaListVideo = new SimpleList();
-                  SimpleList mediaListOther = new SimpleList();
-                  //SimpleHash allMediaSimpleHash = new SimpleHash();
-                  for (int n=0; n < currentMediaList.size();n++) {
-                    upMedia = currentMediaList.elementAt(n);
-                    upMediaSimpleHash = HTMLTemplateProcessor.makeSimpleHash(upMedia);
-                    mediaType = ((EntityMedia)upMedia).getMediaType();
-                    mediaHandlerName = mediaType.getValue("classname");
-                    mediaStorageName = mediaType.getValue("tablename");
-                    mediaStorageClass = Class.forName("mircoders.storage.Database"+mediaStorageName);
-                    mediaHandlerClass = Class.forName("mir.media.MediaHandler"+mediaHandlerName);
-                    mediaHandler = (MirMedia)mediaHandlerClass.newInstance();
-                    Method m = mediaStorageClass.getMethod("getInstance", null);
-                    mediaStorage = (Database)m.invoke(null, null);
-                    //we most likely need further info
-                    upMedia = mediaStorage.selectById(upMedia.getId());
-                    upMediaSimpleHash.put("url", mediaHandler.getListView(upMedia, mediaType));
-                    if (upMedia.getValue("is_published").equals("1")) {
-                        if (mediaHandler.isImage()) {
-                          mediaListImages.add(upMediaSimpleHash);
-                        } else if (mediaHandler.isAudio()) {
-                          mediaListAudio.add(upMediaSimpleHash);
-                        } else if (mediaHandler.isVideo()) {
-                          mediaListVideo.add(upMediaSimpleHash);
-                        } else {
-                          mediaListOther.add(upMediaSimpleHash);
-                        }
-                    } //end if is_published
-                  } //end for
-
-
-                  contentHash.put("to_media_audio", mediaListAudio);
-                  contentHash.put("to_media_images", mediaListImages);
-                  contentHash.put("to_media_video", mediaListVideo);
-                  contentHash.put("to_media_other", mediaListOther);
-                } //end if currentMediaList != null
-
-            } catch (Exception e) {
-                logHTML(htmlout, "Producer.List id " +currentContent.getId()+ " seems corrupt, skipping it :: "+e.toString());
-                theLog.printError("Producer.List id " +currentContent.getId()+ " seems corrupt, skipping it :: "+e.toString());
-            }
-          } //end for over each article
-        } //end if list != null
-        SimpleList itemList = HTMLTemplateProcessor.makeSimpleList(list);
         //process hashmap additional and add to mergedata
         if (additional != null) {
           Set set = additional.keySet();

diff --git a/source/mircoders/producer/ProducerTopics.java b/source/mircoders/producer/ProducerTopics.java
index e03e68c..1d1c9b4 100755 (executable)
--- a/source/mircoders/producer/ProducerTopics.java
+++ b/source/mircoders/producer/ProducerTopics.java
@@ -105,48 +105,6 @@ public class ProducerTopics extends ProducerList {
           currentContent = (EntityContent)entityList.elementAt(0);
           try {
               SimpleHash specialHash = HTMLTemplateProcessor.makeSimpleHash(currentContent);
-
-              currentMediaList = DatabaseContentToMedia.getInstance().getUploadedMedia(currentContent);
-              if (currentMediaList!=null && currentMediaList.getCount()>=1) {
-                SimpleList mediaListAudio = new SimpleList();
-                SimpleList mediaListImages = new SimpleList();
-                SimpleList mediaListVideo = new SimpleList();
-                SimpleList mediaListOther = new SimpleList();
-                for (int n=0; n < currentMediaList.size();n++) {
-                  upMedia = currentMediaList.elementAt(n);
-                  upMediaSimpleHash = HTMLTemplateProcessor.makeSimpleHash(upMedia);
-                  mediaType = ((EntityMedia)upMedia).getMediaType();
-                  //must be a non-existant to_media_type entry..
-                  if (mediaType != null) {
-                    mediaHandlerName = mediaType.getValue("classname");
-                    mediaStorageName = mediaType.getValue("tablename");
-                    mediaStorageClass = Class.forName("mircoders.storage.Database"+mediaStorageName);
-                    mediaHandlerClass = Class.forName("mir.media.MediaHandler"+mediaHandlerName);
-                    mediaHandler = (MirMedia)mediaHandlerClass.newInstance();
-                    Method m = mediaStorageClass.getMethod("getInstance", null);
-                    mediaStorage = (Database)m.invoke(null, null);
-                    //we most likely need further info
-                    upMedia = mediaStorage.selectById(upMedia.getId());
-                    upMediaSimpleHash.put("url", mediaHandler.getListView(upMedia, mediaType));
-                    if (upMedia.getValue("is_published").equals("1")) {
-                      if (mediaHandler.isImage()) {
-                        mediaListImages.add(upMediaSimpleHash);
-                      } else if (mediaHandler.isAudio()) {
-                        mediaListAudio.add(upMediaSimpleHash);
-                      } else if (mediaHandler.isVideo()) {
-                        mediaListVideo.add(upMediaSimpleHash);
-                      } else {
-                        mediaListOther.add(upMediaSimpleHash);
-                      }
-                    } //end if is_published
-                  } //end if media_type != null
-                } //end for
-                specialHash.put("to_media_audio", mediaListAudio);
-                specialHash.put("to_media_images", mediaListImages);
-                specialHash.put("to_media_video", mediaListVideo);
-                specialHash.put("to_media_other", mediaListOther);
-              } //end if currentMediaList != null
-
               setAdditional("special",specialHash);
           } catch (Exception e) {
             theLog.printError("ProducerTopics: problem with start special media: "+currentContent.getId()+" "+e.toString()+" <font color=\"red\">skipping</font>");