From 25951cee144a761b36317f718b9676fa2a7a115e Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Sat, 26 Oct 2013 00:34:55 +0200
Subject: [PATCH] - fixed opensearchdescription, this delivered an url with
 missing 'global' option - added display=2 to compare_yacy to remove the
 superfluous border

---
 htroot/opensearchdescription.java |  7 +++----
 htroot/opensearchdescription.xml  | 12 ++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/htroot/opensearchdescription.java b/htroot/opensearchdescription.java
index 4e7bef9d1..8c2cb7c55 100644
--- a/htroot/opensearchdescription.java
+++ b/htroot/opensearchdescription.java
@@ -43,15 +43,14 @@ public class opensearchdescription {
         String thisaddress = header.get("Host", Domains.LOCALHOST);
         if (thisaddress.indexOf(':',0) == -1) thisaddress += ":" + serverCore.getPortNr(env.getConfig("port", "8090"));
 
-        int compareyacy = 0;
-        if (post != null && post.getBoolean("compare_yacy")) compareyacy = 1;
-
         final serverObjects prop = new serverObjects();
-        prop.put("compareyacy", compareyacy);
+        prop.put("compareyacy", post != null && post.getBoolean("compare_yacy") ? 1 : 0);
         prop.putXML("compareyacy_thisaddress", thisaddress);
         prop.putXML("thisaddress", thisaddress);
         prop.putXML("SearchPageGreeting", promoteSearchPageGreeting);
         prop.putXML("clientname", sb.peers.mySeed().getName());
+        prop.putXML("compareyacy_search_left", post == null ? compare_yacy.defaultsearchL : post.get("left", compare_yacy.defaultsearchL));
+        prop.putXML("compareyacy_search_right", post == null ? compare_yacy.defaultsearchR : post.get("right", compare_yacy.defaultsearchR));
 
         // return rewrite properties
         return prop;
diff --git a/htroot/opensearchdescription.xml b/htroot/opensearchdescription.xml
index 3d38509bd..3d513564b 100644
--- a/htroot/opensearchdescription.xml
+++ b/htroot/opensearchdescription.xml
@@ -13,18 +13,18 @@
   <AdultContent>true</AdultContent>
   <Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer '#[clientname]#'.</Description>
   #(compareyacy)#
-  <Url type="text/html" method="GET" template="http://#[thisaddress]#/yacysearch.html?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all" />
-  <Url type="application/rss+xml" method="GET" template="http://#[thisaddress]#/yacysearch.rss?nav=&amp;query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;verify=false" />
+  <Url type="text/html" method="GET" template="http://#[thisaddress]#/yacysearch.html?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all&amp;resource=global" />
+  <Url type="application/rss+xml" method="GET" template="http://#[thisaddress]#/yacysearch.rss?nav=&amp;query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all&amp;resource=global" />
   ::
-  <Url type="text/html" method="GET" template="http://#[thisaddress]#/compare_yacy.html?verify=true&amp;resource=global&amp;nav=all&amp;query={searchTerms}" />
+  <Url type="text/html" method="GET" template="http://#[thisaddress]#/compare_yacy.html?query={searchTerms}&amp;left=#[search_left]#&amp;right=#[search_right]#&amp;display=2" />
   #(/compareyacy)#
   <Url type="application/x-suggestions+json" template="http://#[thisaddress]#/suggest.json?query={searchTerms}"/>
   <Url type="application/x-suggestions+xml" template="http://#[thisaddress]#/suggest.xml?query={searchTerms}"/>
   <!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results -->
   <Developer>See https://gitorious.org/+yacy-developers</Developer>
-  <Query role="example" searchTerms="yacy+open+source" />
-  <Tags>YaCy Open Source P2P Web Search</Tags>
+  <Query role="example" searchTerms="yacy+free+software" />
+  <Tags>YaCy Free Software Open Source P2P Peer-to-Peer Uncensored Distributed Web Search Engine</Tags>
   <Contact>See http://#[thisaddress]#/ViewProfile.html?hash=localhash</Contact>
-  <Attribution>YaCy Software &amp;copy; 2004-2012 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
+  <Attribution>http://yacy.net YaCy Software &amp;copy; 2004-2014 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
   <SyndicationRight>open</SyndicationRight>
 </OpenSearchDescription>