From: mh <mh>
Date: Thu, 7 Feb 2002 11:35:33 +0000 (+0000)
Subject: freemarker media tweaking
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=6b591e13d4d1183cd3ee5dfdd1f2315d5b8e75dd;p=mir.git

freemarker media tweaking
---

diff --git a/source/mircoders/entity/EntityContent.java b/source/mircoders/entity/EntityContent.java
index 588ee886..8e8a6e95 100755
--- a/source/mircoders/entity/EntityContent.java
+++ b/source/mircoders/entity/EntityContent.java
@@ -166,9 +166,11 @@ public class EntityContent extends Entity
       }
       if (key.equals("to_media")) {
         try {
+          System.err.println("ASKED FOR MEDIA");
           return getUploadedMediaForContent();
         }
         catch (Exception ex) {
+          System.err.println("ASKED EXCE");
           theLog.printWarning("-- getUploadedMediaForContent: could not fetch data " + ex.toString());
           throw new TemplateModelException(ex.toString());
         }
@@ -433,22 +435,26 @@ public class EntityContent extends Entity
         // ########## TODO: this should be transparent
         //we most likely need further info
         upMedia = mediaStorage.selectById(upMedia.getId());
+        SimpleHash modelRoot = new SimpleHash();
         try {
           //upMediaSimpleHash.put("url", mediaHandler.getURL(upMedia, mediaType));
           // ################# TODO: this is broken cause of field checking
           // in Entity. must find a workaround
-          upMedia.setValueForProperty("url",
-                                    mediaHandler.getURL(upMedia, mediaType));
+          modelRoot.put("url", mediaHandler.getURL(upMedia, mediaType));
+          modelRoot.put("is_published", upMedia.getValue("is_published"));
+          //upMedia.setValueForProperty("url",
+                                    //mediaHandler.getURL(upMedia, mediaType));
           System.err.println("URL "+mediaHandler.getURL(upMedia, mediaType));
-          System.err.println("URK'ED? "+upMedia.get("url"));
-          System.err.println("PUB'ED? "+upMedia.get("is_published"));
+          System.err.println("URK'ED? "+modelRoot.get("url"));
+          System.err.println("PUB'ED? "+modelRoot.get("is_published"));
         }
         catch (Exception ex) {
           throw new TemplateModelException(ex.toString());
         }
         //upMediaSimpleHash.put("type",mediaType.getValue("classname"));
-        upMedia.setValueForProperty("type",mediaType.getValue("classname"));
-        returnList.add(upMedia);
+        //upMedia.setValueForProperty("type",mediaType.getValue("classname"));
+        modelRoot.put("type",mediaType.getValue("classname"));
+        returnList.add(modelRoot);
       } //end for
     } //end if currentMediaList != null
     return returnList;