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

[mir.git] / source / mircoders / entity / EntityComment.java

diff --git a/source/mircoders/entity/EntityComment.java b/source/mircoders/entity/EntityComment.java
index c41b3af..b99e30a 100755 (executable)
--- a/source/mircoders/entity/EntityComment.java
+++ b/source/mircoders/entity/EntityComment.java
@@ -21,12 +21,10 @@ import mir.storage.*;
 
 public class EntityComment extends Entity
 {
-  private static int instances;
 
   public EntityComment()
   {
     super();
-    instances++;
   }
 
   public EntityComment(StorageObject theStorage) {
@@ -41,21 +39,51 @@ public class EntityComment extends Entity
   public void setValues(HashMap theStringValues)
   {
     if (theStringValues != null) {
-      if (!theStringValues.containsKey("is_published"))
+      if (!theStringValues.containsKey("is_published")) {
        theStringValues.put("is_published","0");
-      if (theStringValues.containsKey("main_url"))
-        if (((String)theStringValues.get("main_url")).equalsIgnoreCase("http://")) {
-          theStringValues.remove("main_url");
-        } else if (!((String)theStringValues.get("main_url")).startsWith("http://")){
-          theStringValues.put("main_url","http://"+((String)theStringValues.get("main_url")));
-        }
+                       }
+
+                       if (theStringValues.containsKey("main_url")){
+                               if (((String)theStringValues.get("main_url")).equalsIgnoreCase("http://")) {
+                                       theStringValues.remove("main_url");
+                               } else if ((!((String)theStringValues.get("main_url")).startsWith("http://"))
+                                                                       && ((String)theStringValues.get("main_url")).length()>0){
+                                       theStringValues.put("main_url","http://"+((String)theStringValues.get("main_url")));
+                               }
+                       }
+
     }
     super.setValues(theStringValues);
   }
 
+       /**
+        * overridden method getValue to include formatted date into every
+        * entityContent
+        */
+
+       public String getValue(String field)
+  {
+    String returnField = null;
+    if (field!=null)
+    {
+      if (field.equals("date_formatted"))
+      {
+                 if (hasValueForField("date"))
+       returnField = StringUtil.webdbDate2readableDate(getValue("date"));
+               }
+      else if (field.equals("description_parsed")) {
+        /** @todo the config stuff should be moved to StringUtil */
+        String extLinkName = MirConfig.getProp("Producer.ExtLinkName");
+        String intLinkName = MirConfig.getProp("Producer.IntLinkName");
+        String mailLinkName = MirConfig.getProp("Producer.MailLinkName");
+        String imageRoot = MirConfig.getProp("Producer.ImageRoot");
+        returnField = StringUtil.createHTML(getValue("description"),imageRoot,mailLinkName,extLinkName,intLinkName);
+      }
+      else
+        return super.getValue(field);
+    }
+    return returnField;
+       }
+
 
-  public void finalize() {
-    instances--;
-    super.finalize();
-  }
 }