cleanup list producer

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

diff --git a/source/mircoders/producer/ProducerTopics.java b/source/mircoders/producer/ProducerTopics.java
index 2e9fa00..1d1c9b4 100755 (executable)
--- a/source/mircoders/producer/ProducerTopics.java
+++ b/source/mircoders/producer/ProducerTopics.java
@@ -62,6 +62,8 @@ public class ProducerTopics extends ProducerList {
     for(int i=0; i < topicsEntityList.size(); i++){
 
       EntityTopics currentTopic = (EntityTopics)topicsEntityList.elementAt(i);
+
+      try {
       EntityList contentEntityList = DatabaseContentToTopics.getInstance().getContent(currentTopic);
       String whereClauseSpecial=null;
 
@@ -101,61 +103,24 @@ public class ProducerTopics extends ProducerList {
         EntityContent currentContent;
         if(entityList != null && entityList.size()==1){
           currentContent = (EntityContent)entityList.elementAt(0);
-          try { 
+          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") == "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: "+currentContent.getId()+" "+e.toString());
-            logHTML(htmlout,"ProducerTopics: problem with start special: "+currentContent.getId()+" "+e.toString());
+            theLog.printError("ProducerTopics: problem with start special media: "+currentContent.getId()+" "+e.toString()+" <font color=\"red\">skipping</font>");
+            logHTML(htmlout,"ProducerTopics: problem with start special media: "+currentContent.getId()+" "+e.toString());
           }
         }
-        
+
         //set the list of topics
         setAdditional("topicslist",topicsList);
 
         handleIt(htmlout,user,force);
       }
+      } catch (Exception e) {
+        logHTML(htmlout,"ProducerTopics: problem with topic id: "
+        +currentTopic.getId()+ "<font color=\"red\">skipping</font>");
+      }
     }
   }