Changeset 7554

Timestamp:

03/25/09 15:19:58 (16 months ago)

Author:

josowski

Message:

The articleformat directive was using a greedy regular expression causing it to fail when mulitple tags of the same type were passed in the same string

The RHC / social bookmarking digg title was also missing this directive.

References #1236

Location:

head/ambra/webapp/src/main

Files:

• java/org/topazproject/ambra/util/ArticleFormattingDirective.java (modified) (2 diffs)
• webapp/article/article_rhc.ftl (modified) (1 diff)

head/ambra/webapp/src/main/java/org/topazproject/ambra/util/ArticleFormattingDirective.java

@@ -2 +2 @@
  * $Id$
  *
- * Copyright (c) 2006-2008 by Topaz, Inc.
+ * Copyright (c) 2006-2009 by Topaz, Inc.
  * http://topazproject.org
  *
@@ -78 +78 @@
 
   private static final Pattern[] PATTERNS = {
-      Pattern.compile("(?:<|&lt;)italic(?:>|&gt;)(.*)(?:<|&lt;)/italic(?:>|&gt;)"),
+      Pattern.compile("(?:<|&lt;)italic(?:>|&gt;)(.*?)(?:<|&lt;)/italic(?:>|&gt;)"),
       Pattern.compile("<named-content(?:" +
           "(?:\\s+xmlns:xlink\\s*=\\s*\"http://www.w3.org/1999/xlink\"\\s*)|" +
           "(?:\\s+content-type\\s*=\\s*\"genus-species\"\\s*)|" +
           "(?:\\s+xlink:type\\s*=\\s*\"simple\"\\s*)" +
-          ")*>(.*)</named-content>"),
-      Pattern.compile("<bold>(.*)</bold>"),
-      Pattern.compile("<monospace>(.*)</monospace>"),
-      Pattern.compile("<overline>(.*)</overline>"),
-      Pattern.compile("<sc>(.*)</sc>"),
-      Pattern.compile("<strike>(.*)</strike>"),
-      Pattern.compile("<underline>(.*)</underline>"),
+          ")*>(.*?)</named-content>"),
+      Pattern.compile("<bold>(.*?)</bold>"),
+      Pattern.compile("<monospace>(.*?)</monospace>"),
+      Pattern.compile("<overline>(.*?)</overline>"),
+      Pattern.compile("<sc>(.*?)</sc>"),
+      Pattern.compile("<strike>(.*?)</strike>"),
+      Pattern.compile("<underline>(.*?)</underline>"),
       Pattern.compile("<email(?:" +
           "(?:\\s+xmlns:xlink\\s*=\\s*\"http://www.w3.org/1999/xlink\"\\s*)|" +
           "(?:\\s+xlink:type\\s*=\\s*\"simple\"\\s*)" +
-          ")*>(.*)</email>")
+          ")*>(.*?)</email>")
   };
 

head/ambra/webapp/src/main/webapp/article/article_rhc.ftl

@@ -102 +102 @@
           digg_url = '${docURL}';
           digg_skin = 'icon';
-          digg_title = '${docTitle?replace("'","\\'")}';
+          digg_title = '<@articleFormat>${docTitle?replace("'","\\'")}</@articleFormat>';
           digg_bodytext = '';
           digg_topic = '';