Return-Path: 
 <esme-commits-return-575-apmail-incubator-esme-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org
Received: (qmail 36806 invoked from network); 2 Sep 2010 19:54:26 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 2 Sep 2010 19:54:26 -0000
Received: (qmail 2546 invoked by uid 500); 2 Sep 2010 19:54:26 -0000
Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org
Received: (qmail 2512 invoked by uid 500); 2 Sep 2010 19:54:26 -0000
Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:esme-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:esme-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:esme-commits@incubator.apache.org>
List-Id: <esme-commits.incubator.apache.org>
Reply-To: esme-dev@incubator.apache.org
Delivered-To: mailing list esme-commits@incubator.apache.org
Received: (qmail 2504 invoked by uid 99); 2 Sep 2010 19:54:25 -0000
Received: from Unknown (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Sep 2010 19:54:25 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Sep 2010 19:54:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 71A142388980; Thu,  2 Sep 2010 19:53:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r992087 -
 /incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Message.scala
Date: Thu, 02 Sep 2010 19:53:47 -0000
To: esme-commits@incubator.apache.org
From: vdichev@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100902195347.71A142388980@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: vdichev
Date: Thu Sep  2 19:53:47 2010
New Revision: 992087

URL: http://svn.apache.org/viewvc?rev=992087&view=rev
Log:
ESME-267 Links in messages in pools don't redirect through the shortened URL to disable popularity stats

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

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=992087&r1=992086&r2=992087&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 Thu Sep  2 19:53:47 2010
@@ -392,9 +392,16 @@ class Message extends LongKeyedMapper[Me
 
         case e: Elem if e.label == "url" =>
           e.attribute("url").flatMap(url =>
-            e.attribute("uniqueId").map(id =>
-              <xml:group> <a class="tiplelement" href={"/u/"+id} target="_blank" title={url}>{url.toString.substring(0,20)}...</a> </xml:group>)).
-          getOrElse(Text("") )
+            e.attribute("uniqueId").map { id =>
+              val href =
+                if (pool.defined_?)
+                  // disable shortener to avoid popularity statistics
+                  url.toString
+                else
+                  "/u/" + id
+              <xml:group> <a class="tiplelement" href={href} target="_blank" title={url}>{url.toString.substring(0,20)}...</a> </xml:group>
+            }
+          ).getOrElse(Text("") )
 
         case e: Elem if e.label == "em" =>
           e.attribute("text").map(text =>