X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmircoders%2Fentity%2FEntityComment.java;h=b99e30aeb33266e98ce587a26d4e9a90ffbac9ad;hb=50d223072c642a8e12e0fa99d378426ce2667926;hp=c41b3af8b5391aad80af2093efde14ed9cc6c629;hpb=1e06f519c12e542b61df7a19ceec7871011112c7;p=mir.git diff --git a/source/mircoders/entity/EntityComment.java b/source/mircoders/entity/EntityComment.java index c41b3af8..b99e30ae 100755 --- 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(); - } }