first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it

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

diff --git a/source/mircoders/producer/ProducerList.java b/source/mircoders/producer/ProducerList.java
index 7989c2b..5533a37 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;
 
 
 
@@ -44,6 +35,7 @@ abstract public class ProducerList extends Producer {
     handleIt(htmlout,user,force);
   }
 
+  /** @todo this should return the number of pages produced! */
   public void handleIt(PrintWriter htmlout, EntityUsers user, boolean force)
     throws StorageObjectException, ModuleException {
 
@@ -96,80 +88,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 images
-
-        if(list!=null){
-          for (int k=0; k < list.size();k++) {
-            currentContent = (EntityContent)list.elementAt(k);
-            //images to content
-            EntityList 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);
-                mediaType = ((EntityMedia)upMedia).getMediaType();
-                //must be a non-existant to_media_type entry..
-                if (mediaType != null) {
-                  try {
-                    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());
-                  } catch (Exception e) {
-                    theLog.printError("ProducerList: problem in reflection: "+mediaHandlerName);
-                  } //end catch
-                  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
-              try{
-                SimpleList contentList = (SimpleList)mergeData.get("contentlist");
-                SimpleHash contentHash = (SimpleHash)contentList.get(k);
-                contentHash.put("to_media_audio", mediaListAudio);
-                contentHash.put("to_media_images", mediaListImages);
-                contentHash.put("to_media_video", mediaListVideo);
-                contentHash.put("to_media_other", mediaListOther);
-              } catch (Exception e){}
-            } //end if currentMediaList != null
-
-            //content to html
-            if(currentContent.getValue("is_html").equals("0")){
-              String temp = (String)currentContent.getValue("description");
-              if(temp!=null && temp.length()>0){
-                temp = StringUtil.createHTML(temp);
-                temp = StringUtil.decodeHTMLinTags(temp);
-                currentContent.setValueForProperty("description",temp);
-              }
-            } else {
-              String temp = (String)currentContent.getValue("description");
-              if(temp!=null && temp.length()>0){
-                temp = StringUtil.decodeHTMLinTags(temp);
-                currentContent.setValueForProperty("description",temp);
-              }
-            }
-          }
-        }
-        SimpleList itemList = HTMLTemplateProcessor.makeSimpleList(list);
         //process hashmap additional and add to mergedata
         if (additional != null) {
           Set set = additional.keySet();
@@ -214,5 +132,8 @@ abstract public class ProducerList extends Producer {
     logHTML(htmlout, "Producer.List finished: " + sessionConnectTime + " ms.");
   } //end handle
 
-  abstract public void setAdditional(String key, TemplateModel value);
+  public void setAdditional(String key, TemplateModel value) {
+    additional.put(key,value);
+  }
+
 }