fix bookmark.rss

- channel end tag postion
- link with html entity
This commit is contained in:
reger 2014-07-21 19:26:12 +02:00
parent e441831a24
commit 7f0e757bb5
2 changed files with 15 additions and 15 deletions

View File

@ -318,9 +318,9 @@ public class Bookmarks {
if (bookmark != null){ if (bookmark != null){
if (bookmark.getFeed() && isAdmin) { if (bookmark.getFeed() && isAdmin) {
prop.put("display_bookmarks_"+count+"_link", "/FeedReader_p.html?url="+bookmark.getUrl()); prop.putXML("display_bookmarks_"+count+"_link", "/FeedReader_p.html?url="+bookmark.getUrl());
} else { } else {
prop.put("display_bookmarks_"+count+"_link",bookmark.getUrl()); prop.putXML("display_bookmarks_"+count+"_link",bookmark.getUrl());
} }
prop.putHTML("display_bookmarks_"+count+"_title", bookmark.getTitle()); prop.putHTML("display_bookmarks_"+count+"_title", bookmark.getTitle());
prop.putHTML("display_bookmarks_"+count+"_description", bookmark.getDescription()); prop.putHTML("display_bookmarks_"+count+"_description", bookmark.getDescription());

View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0"> <rss version="2.0">
<channel> <channel>
<title><![CDATA[YaCy '#[clientname]#': Bookmarks]]></title> <title><![CDATA[YaCy '#[clientname]#': Bookmarks]]></title>
<link>http://#[address]#/Bookmarks.html</link> <link>http://#[address]#/Bookmarks.html</link>
<description><![CDATA[#[user]#'s Bookmark-Feed]]></description> <description><![CDATA[#[user]#'s Bookmark-Feed]]></description>
</channel> #{display_bookmarks}#<item>
#{display_bookmarks}#<item> <title><![CDATA[#[title]#]]></title>
<title><![CDATA[#[title]#]]></title> <link>#[link]#</link>
<link>#[link]#</link> <pubDate>#[rfc822date]#</pubDate>
<pubDate>#[rfc822date]#</pubDate> <guid>#[hash]#</guid>
<guid>#[hash]#</guid> <description><![CDATA[<p>#[description]#</p><p>Tagged with | #{tags}#<a href="Bookmarks.html?tag=#[tag]#" class="bookmarkTags">#[tag]#</a> | #{/tags}#</p>]]></description>
<description><![CDATA[<p>#[description]#</p><p>Tagged with | #{tags}#<a href="Bookmarks.html?tag=#[tag]#" class="bookmarkTags">#[tag]#</a> | #{/tags}#</p>]]></description> #{tags}#<category><![CDATA[#[tag]#]]></category>#{/tags}#
#{tags}#<category><![CDATA[#[tag]#]]></category>#{/tags}# </item>#{/display_bookmarks}#
</item>#{/display_bookmarks}# </channel>
</rss> </rss>