get rid of long standing bug which caused links (href's) with ampersands (&) in them...

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

diff --git a/source/mircoders/entity/EntityContent.java b/source/mircoders/entity/EntityContent.java
index e6fbbe0..696c7fd 100755 (executable)
--- a/source/mircoders/entity/EntityContent.java
+++ b/source/mircoders/entity/EntityContent.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mircoders.entity;
 
 import java.lang.*;
@@ -19,8 +50,9 @@ import mircoders.storage.*;
  * this class implements mapping of one line of the database table content
  * to a java object
  *
- * @author RK
- * @version 2001
+ * @version $Id: EntityContent.java,v 1.9.2.3 2002/11/26 01:51:10 mh Exp $
+ * @author rk, mir-coders group
+ *
  */
 
 
@@ -145,13 +177,15 @@ public class EntityContent extends Entity
     String returnField = null;
     if (field!=null)
     {
-      if (field.equals("date_formatted"))
+      if (field.equals("date_formatted") || field.equals("webdb_create_short") )
       {
                  if (hasValueForField("date"))
-       returnField = StringUtil.webdbDate2readableDate(getValue("date"));
+       returnField = StringUtil.webdbDate2readableDate(getValue("webdb_create"));
                }
       else if (field.equals("description_parsed"))
         returnField = getDescriptionParsed();
+      else if (field.equals("description_sentence"))
+        returnField = getDescriptionSentence();
       else if (field.equals("content_data_parsed"))
         returnField = getContentDataParsed();
       else
@@ -266,7 +300,7 @@ public class EntityContent extends Entity
 
   private String getContentDataParsed() {
     String returnField = getValue("content_data");
-    if (returnField!=null & returnField.length()>0 ) {
+    if ((returnField!=null) && (returnField.length()>0) ) {
       returnField=StringUtil.deleteForbiddenTags(returnField);
       //create http-links and email-links
       if (getValue("is_html").equals("0")) {
@@ -274,11 +308,21 @@ public class EntityContent extends Entity
                                             mirconf_mailLinkName,mirconf_extLinkName,
                                             mirconf_intLinkName);
       }
-      returnField = StringUtil.decodeHTMLinTags(returnField);
     }
     return returnField;
   }
 
+  private String getDescriptionSentence() {
+    String returnField = getValue("description");
+    if (returnField != null && returnField.length()>0) {
+       returnField = StringUtil.removeHTMLTags(returnField);
+       int endOfFirstSentence=StringUtil.findEndOfSentence(returnField,0);
+       if (endOfFirstSentence > 0){
+        returnField = returnField.substring(0,endOfFirstSentence);
+       }
+    }
+    return returnField;
+  }
 
   private String getDescriptionParsed() {
     String returnField = getValue("description");
@@ -289,7 +333,6 @@ public class EntityContent extends Entity
                                             mirconf_mailLinkName,mirconf_extLinkName,
                                             mirconf_intLinkName);
       }
-      returnField = StringUtil.decodeHTMLinTags(returnField);
     }
     return returnField;
   }
@@ -336,9 +379,10 @@ public class EntityContent extends Entity
           tinyIcon = MirConfig.getProp("Producer.Icon.TinyAudio");
           iconAlt = "Audio";
         } else if (tinyIcon == null && !mediaHandler.isImage()) {
-          tinyIcon = mediaHandler.getTinyIcon();
-          iconAlt = mediaHandler.getIconAlt();
+          tinyIcon = mediaHandler.getTinyIconName();
+          iconAlt = mediaHandler.getIconAltName();
         }
+
       }
       //it only has image(s)
       if (tinyIcon == null) {