X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fentity%2FEntityComment.java;h=b99e30aeb33266e98ce587a26d4e9a90ffbac9ad;hb=831225b6a524c40cb4f1db71a0c53297eefd8234;hp=1bbe80bf7a5c88ca31e838b93c9d9e11437857a2;hpb=351d6f11a54363419d2d6fd049f17356584dbd55;p=mir.git

diff --git a/source/mircoders/entity/EntityComment.java b/source/mircoders/entity/EntityComment.java
index 1bbe80bf..b99e30ae 100755
--- a/source/mircoders/entity/EntityComment.java
+++ b/source/mircoders/entity/EntityComment.java
@@ -19,14 +19,12 @@ import mir.storage.*;
  */
 
 
-public class EntityComment extends AbstractEntity implements Entity
+public class EntityComment extends Entity
 {
-  private static int instances;
 
   public EntityComment()
   {
     super();
-    instances++;
   }
 
   public EntityComment(StorageObject theStorage) {
@@ -34,13 +32,6 @@ public class EntityComment extends AbstractEntity implements Entity
     setStorage(theStorage);
   }
 
-  public HashMap getValues() {
-    HashMap returnHash = super.getValues();
-    String create = (String)returnHash.get("webdb_create");
-    returnHash.put("date",StringUtil.dateToReadableDate(create));
-
-    return returnHash;
-  }
 
   /**
    * overridden method setValues to patch creator_main_url
@@ -48,21 +39,51 @@ public class EntityComment extends AbstractEntity implements 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();
-  }
 }