X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fproducer%2FProducerStartPage.java;h=ad8e225d912073a1a8ca24a2b1f173e0d59b715a;hb=f648183ac28a7f1fc1a4dede14065d752404576b;hp=8fe05c68f7f75263e84a80ddd662e2e1fc47d05d;hpb=a0061f3bdba87b5f519e734294c9f30e89265743;p=mir.git

diff --git a/source/mircoders/producer/ProducerStartPage.java b/source/mircoders/producer/ProducerStartPage.java
index 8fe05c68..ad8e225d 100755
--- a/source/mircoders/producer/ProducerStartPage.java
+++ b/source/mircoders/producer/ProducerStartPage.java
@@ -77,7 +77,7 @@ public class ProducerStartPage extends Producer {
     Database            mediaStorage=null;
     String              tinyIcon;
     String              iconAlt;
-    Logfile theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Producer.Logfile"));
+    Logfile theLog = Logfile.getInstance(this.getClass().getName());
 
     SimpleList mediaList;
     SimpleHash contentHash;
@@ -94,7 +94,7 @@ public class ProducerStartPage extends Producer {
     SimpleList parentList = HTMLTemplateProcessor.makeSimpleList(theParentList);
 
     // get the newswire
-    whereClause="is_published=true AND to_article_type >= 1";
+    whereClause="is_published=true AND to_article_type = 1";
     entityList = contentModule.getContent(whereClause,"date desc, webdb_create desc",0,newsPerPage);
     SimpleList newsWireList = HTMLTemplateProcessor.makeSimpleList(entityList);
     for (int i=0; i < entityList.size();i++) {
@@ -130,7 +130,7 @@ public class ProducerStartPage extends Producer {
                 theLog.printError("ProducerStartpage:problem in reflection: "+mediaHandlerName);
               }
 
-              //the best media type
+              //the "best" media type to show
               if (mediaHandler.isVideo()) {
                 tinyIcon = MirConfig.getProp("Producer.Icon.TinyVideo");
                 iconAlt = "Video";
@@ -176,14 +176,13 @@ public class ProducerStartPage extends Producer {
     SimpleList startItemList = HTMLTemplateProcessor.makeSimpleList(entityList);
     for (int k=0; k < entityList.size();k++) {
       currentContent = (EntityContent)entityList.elementAt(k);
-      //images to content
+      //media to content
       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();
-        //SimpleHash allMediaSimpleHash = new SimpleHash();
         for (int n=0; n < currentMediaList.size();n++) {
           upMedia = currentMediaList.elementAt(n);
           upMediaSimpleHash = HTMLTemplateProcessor.makeSimpleHash(upMedia);
@@ -218,7 +217,6 @@ public class ProducerStartPage extends Producer {
           } //end if media_type != null
         } //end for
         try{
-          //SimpleList contentList = (SimpleList)mergeData.get("contentlist");
           contentHash = (SimpleHash)startItemList.get(k);
           contentHash.put("to_media_audio", mediaListAudio);
           contentHash.put("to_media_images", mediaListImages);
@@ -228,21 +226,6 @@ public class ProducerStartPage extends Producer {
       } //end if currentMediaList != null
     } //enf for featurueList.size..
 
-
-
-    /*for (int i=0; i < entityList.size();i++) {
-      currentContent = (EntityContent)entityList.elementAt(i);
-      //fetching/setting the images
-      imageEntityList = DatabaseContentToMedia.getInstance().getImages(currentContent);
-      if (imageEntityList!=null && imageEntityList.getCount()>=1) {
-        try{
-          mediaList = HTMLTemplateProcessor.makeSimpleList(imageEntityList);
-          contentHash = (SimpleHash)startItemList.get(i);
-          contentHash.put("to_media", mediaList);
-        } catch (Exception e){}
-      }
-    }*/
-
     // get the breaking news
     // only the first 5
     // todo: the number of breaking_news items have to be configurable
@@ -257,14 +240,13 @@ public class ProducerStartPage extends Producer {
     SimpleList featureList = HTMLTemplateProcessor.makeSimpleList(entityList);
     for (int k=0; k < entityList.size();k++) {
       currentContent = (EntityContent)entityList.elementAt(k);
-      //images to content
+      //media to content
       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();
-        //SimpleHash allMediaSimpleHash = new SimpleHash();
         for (int n=0; n < currentMediaList.size();n++) {
           upMedia = currentMediaList.elementAt(n);
           upMediaSimpleHash = HTMLTemplateProcessor.makeSimpleHash(upMedia);
@@ -285,6 +267,8 @@ public class ProducerStartPage extends Producer {
               theLog.printError("ProducerList: problem in reflection: "+mediaHandlerName);
             } //end catch
             upMediaSimpleHash.put("url", mediaHandler.getListView(upMedia, mediaType));
+
+            // he marc, shouldn't this be .equals("1") ?
             if (upMedia.getValue("is_published") == "1") {
               if (mediaHandler.isImage()) {
                 mediaListImages.add(upMediaSimpleHash);
@@ -299,7 +283,6 @@ public class ProducerStartPage extends Producer {
           } //end if media_type != null
         } //end for
         try{
-          //SimpleList contentList = (SimpleList)mergeData.get("contentlist");
           contentHash = (SimpleHash)featureList.get(k);
           contentHash.put("to_media_audio", mediaListAudio);
           contentHash.put("to_media_images", mediaListImages);
@@ -309,21 +292,6 @@ public class ProducerStartPage extends Producer {
       } //end if currentMediaList != null
     } //enf for featurueList.size..
 
-
-
-    /*for (int i=0; i < entityList.size();i++) {
-      currentContent = (EntityContent)entityList.elementAt(i);
-      //fetching/setting the images
-      imageEntityList = DatabaseContentToMedia.getInstance().getImages(currentContent);
-      if (imageEntityList!=null && imageEntityList.getCount()>=1) {
-        try{
-          mediaList = HTMLTemplateProcessor.makeSimpleList(imageEntityList);
-          contentHash = (SimpleHash)featureList.get(i);
-          contentHash.put("to_media", mediaList);
-        } catch (Exception e){}
-      }
-    }*/
-
     // Zusaetzlich Informationen
     startPageModel = new SimpleHash();
     startPageModel.put("breakingnews", breakingList);