incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r954400 - in /incubator/esme/trunk/server/src/main/scala/org/apache/esme: lib/StreamMgr.scala lib/UserMgr.scala model/Message.scala
Date Mon, 14 Jun 2010 10:09:31 GMT
Author: rhirsch
Date: Mon Jun 14 10:09:31 2010
New Revision: 954400

URL: http://svn.apache.org/viewvc?rev=954400&view=rev
Log:
[ESME-229] tags are present twice on streams page

Modified:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/UserMgr.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala?rev=954400&r1=954399&r2=954400&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala Mon Jun
14 10:09:31 2010
@@ -118,7 +118,7 @@ object StreamMgr {
                         (lst => xs.flatMap(i => bind("item", lst,
                                                      "author" -> i.author.obj.map(nicknameWithProfileLink).openOr(Text("")),
                                                      "imageUrl" -> i.author.obj.map(profileImage).openOr(Text("")),
-                                                     "text" -> i.getText,
+                                                     "text" -> i.getBody,
                                                      "date" -> dateFormatter.format(i.getWhen)
                 ))))
       }

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/UserMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/UserMgr.scala?rev=954400&r1=954399&r2=954400&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/UserMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/UserMgr.scala Mon Jun 14
10:09:31 2010
@@ -79,7 +79,7 @@ object UserMgr {
   private def lastMessage(user: User): Tuple2[String,String] = {
     Message.findAll(By(Message.author, user), OrderBy(Message.id, Descending), MaxRows(1))
match {
       case Nil => ("", "")
-      case msg :: _ => (msg.getText, dateFormatter.format(msg.getWhen))
+      case msg :: _ => (msg.getBody, dateFormatter.format(msg.getWhen))
     }
   }
 

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala?rev=954400&r1=954399&r2=954400&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala Mon Jun
14 10:09:31 2010
@@ -468,6 +468,9 @@ class Message extends LongKeyedMapper[Me
   // termVector=YES means that we get the word frequencies for tag clouds
   @SearchableProperty{val termVector=TermVector.YES, val analyzer="stemming"}
   def getText:String = originalXml.text
+  
+  // Body without extra tags
+  def getBody:String = body
 
   @SearchableProperty{val termVector=TermVector.YES, val analyzer="default"}
   def getTextWords:String = originalXml.text



Mime
View raw message