You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/12/08 16:41:56 UTC
svn commit: r355127 - in /incubator/roller/trunk:
contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
web/WEB-INF/classes/roller.properties
Author: snoopdave
Date: Thu Dec 8 07:41:31 2005
New Revision: 355127
URL: http://svn.apache.org/viewcvs?rev=355127&view=rev
Log:
Fix for ROL-919: option to turn off bookmark queries in Topic Tag
Modified:
incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
incubator/roller/trunk/web/WEB-INF/classes/roller.properties
Modified: incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java?rev=355127&r1=355126&r2=355127&view=diff
==============================================================================
--- incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java (original)
+++ incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java Thu Dec 8 07:41:31 2005
@@ -306,12 +306,16 @@
/**
* Build the bookmark map.
- *
+ * If ignoreBookmarks property is set, an empty map is returned.
* @return map of the user's bookmarks (type BookmarkData), keyed by name (type String).
*/
protected Map buildBookmarkMap(WebsiteData website) throws RollerException
{
Map bookmarkMap = new HashMap();
+ if (RollerConfig.getBooleanProperty(
+ "org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.ignoreBookmarks")) {
+ return bookmarkMap;
+ }
if (website == null)
{
mLogger.debug("Init called without website. Skipping bookmark initialization.");
Modified: incubator/roller/trunk/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/roller.properties?rev=355127&r1=355126&r2=355127&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/roller.properties Thu Dec 8 07:41:31 2005
@@ -309,6 +309,10 @@
org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.tagRegexWithoutBookmark=topic:\\[(.*?)\\]
org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.linkFormatString=<a rel=\"tag\" href=\"{0}{1}\">{2}</a>
+# Set to true to allow only Technorati tags (and avoid costly bookmark queries)
+org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.ignoreBookmarks=true
+
+
#----------------------------------
# legacy settings (thing that should be deprecated