From c798a9d1bb8515d652515c46b01198117a895faa Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Sat, 7 Jun 2014 03:01:26 +0200
Subject: [PATCH] fix unresolved pattern in yacysearch.rss title and rss xml
 error due to html & encoding in url entries

---
 htroot/yacysearch.html     | 2 +-
 htroot/yacysearch.java     | 2 +-
 htroot/yacysearchitem.java | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index 4a8f60274..da44fbb5b 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -92,7 +92,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
 <form class="search small" name="searchform" action="" method="get" accept-charset="UTF-8" style="position:fixed;top:8px;z-index:1052;max-width:500px;">
   
   <div class="input-group">
-    <input type="text" class="form-control searchinput typeahead" size="40" maxlength="200" placeholder="#(topmenu)##[promoteSearchPageGreeting]#::#[promoteSearchPageGreeting]##(/topmenu)#" name="query" value="#[former]#" onFocus="this.select()" id="search" onclick="document.getElementById('Enter').innerHTML = 'search'"/>
+    <input type="text" class="form-control searchinput typeahead" size="40" maxlength="200" placeholder="#[promoteSearchPageGreeting]#" name="query" value="#[former]#" onFocus="this.select()" id="search" onclick="document.getElementById('Enter').innerHTML = 'search'"/>
     <div class="input-group-btn">
        <button id="Enter" class="btn btn-default" type="submit">search</button>
     </div>
diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java
index 6487188cb..a8b3f7317 100644
--- a/htroot/yacysearch.java
+++ b/htroot/yacysearch.java
@@ -142,7 +142,7 @@ public class yacysearch {
         final String EXT = header.get("EXT", "");
         final boolean rss = EXT.equals("rss");
         final boolean json = EXT.equals("json");
-        prop.put("topmenu_promoteSearchPageGreeting", promoteSearchPageGreeting);
+        prop.put("promoteSearchPageGreeting", promoteSearchPageGreeting);
         
         // adding some additional properties needed for the rss feed
         String hostName = header.get("Host", Domains.LOCALHOST);
diff --git a/htroot/yacysearchitem.java b/htroot/yacysearchitem.java
index 8465c7a98..348d1a90c 100644
--- a/htroot/yacysearchitem.java
+++ b/htroot/yacysearchitem.java
@@ -183,7 +183,7 @@ public class yacysearchitem {
 					}
 				}
 			}
-            prop.putHTML("content_link", modifyURL);
+            prop.putXML("content_link", modifyURL); // putXML for rss
 //            prop.putHTML("content_value", Interaction.TripleGet(result.urlstring(), "http://virtual.x/hasvalue", "anonymous"));
 // END interaction
 
@@ -208,8 +208,8 @@ public class yacysearchitem {
             prop.putHTML("content_sizename", RSSMessage.sizename(result.filesize()));
             prop.putHTML("content_showSize_sizename", RSSMessage.sizename(result.filesize()));
             prop.putHTML("content_host", resultURL.getHost() == null ? "" : resultURL.getHost());
-            prop.putHTML("content_file", resultFileName);
-            prop.putHTML("content_path", resultURL.getPath());
+            prop.putXML("content_file", resultFileName); // putXML for rss
+            prop.putXML("content_path", resultURL.getPath()); // putXML for rss
             prop.put("content_nl", (item == theSearch.query.offset) ? 0 : 1);
             prop.putHTML("content_publisher", result.publisher());
             prop.putHTML("content_creator", result.creator());// author