fixed a bug with content.to_media_icon.tiny_icon

[mir.git] / source / mircoders / localizer / basic / MirBasicDataModelLocalizer.java

diff --git a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
index 0e6d60e..def9266 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
@@ -51,6 +51,8 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
     try {\r
       anEntityAdapterDefinition.addDBDateField("creationdate", "webdb_create");\r
       anEntityAdapterDefinition.addCalculatedField("to_content", new CommentToContentField());\r
+\r
+      anEntityAdapterDefinition.addCalculatedField("description_parsed", new FilteredField("description"));\r
     }\r
     catch (Throwable t) {\r
       throw new MirLocalizerFailure(t.getMessage(), t);\r
@@ -117,7 +119,7 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
 \r
     public Object getValue(EntityAdapter anEntityAdapter) {\r
       try {\r
-        if (anEntityAdapter.get("is_html").equals("0")) {\r
+        if (anEntityAdapter.get("is_html")!=null && anEntityAdapter.get("is_html").equals("0")) {\r
           return MirGlobal.localizer().producerAssistant().filterText((String) anEntityAdapter.get(fieldName));\r
         }\r
         else {\r
@@ -134,7 +136,7 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
     public Object getValue(EntityAdapter anEntityAdapter) {\r
       try {\r
         return anEntityAdapter.getRelation(\r
-                    "to_media="+anEntityAdapter.get("id"),\r
+                    "to_media="+anEntityAdapter.get("id")+" and is_published='1'",\r
                     "webdb_create",\r
                     "comment" );\r
       }\r
@@ -227,7 +229,7 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
       }\r
 \r
       result = new HashMap();\r
-      result.put("tiny_icon", tinyIcon);\r
+      result.put("tiny_icon", MirGlobal.getConfigProperty("Producer.ImageRoot") + tinyIcon);\r
       result.put("icon_alt", iconAlt);\r
 \r
       return result;\r