[Yanel-commits] rev 43993 - in public/yanel/trunk/src/contributions/resources/search: htdocs src/java/org/wyona/yanel/impl/resources/search

[michi at wyona.com]

Author: michi
Date: 2009-08-05 10:06:09 +0200 (Wed, 05 Aug 2009)
New Revision: 43993

Modified:
   public/yanel/trunk/src/contributions/resources/search/htdocs/results2xhtml.xsl
   public/yanel/trunk/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java
Log:
proxy search fixed

Modified: public/yanel/trunk/src/contributions/resources/search/htdocs/results2xhtml.xsl
===================================================================
--- public/yanel/trunk/src/contributions/resources/search/htdocs/results2xhtml.xsl	2009-08-05 08:00:18 UTC (rev 43992)
+++ public/yanel/trunk/src/contributions/resources/search/htdocs/results2xhtml.xsl	2009-08-05 08:06:09 UTC (rev 43993)
@@ -34,7 +34,7 @@
         <h1>Search</h1>
 
         <form>
-          Search <input type="text" name="q" value="{/y:search/y:query}"/> with <select name="provider"><option value="google">Google</option><option value="bing">bing</option><option value="yanel" selected="true">Yanel</option></select> &#160; <input type="submit" value="Search"/>
+          Search <input type="text" name="q" value="{/y:search/y:query}"/> with <select name="provider"><option value="google">Google</option><option value="bing">bing</option><option value="yanel" selected="true">Yanel</option><option value="yanelproxy-google">Google (Yanel Proxy)</option><option value="yanelproxy-msn">MSN (Yanel Proxy)</option></select> &#160; <input type="submit" value="Search"/>
         </form>
 
         <hr/>

Modified: public/yanel/trunk/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java	2009-08-05 08:00:18 UTC (rev 43992)
+++ public/yanel/trunk/src/contributions/resources/search/src/java/org/wyona/yanel/impl/resources/search/SearchResource.java	2009-08-05 08:06:09 UTC (rev 43993)
@@ -80,9 +80,9 @@
                 Result[] results;
                 if (provider.equals(DEFAULT_PROVIDER)) {
                     results = getLocalResults(query);
-                } else if (provider.equals("google")) {
+                } else if (provider.equals("yanelproxy-google")) {
                     results = getGoogleResults(query);
-                } else if (provider.equals("bing")) {
+                } else if (provider.equals("yanelproxy-msn")) {
                     results = getMSNResults(query);
                 } else {
                     results = new Result[0];