You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by cu...@apache.org on 2005/04/18 23:21:59 UTC

svn commit: r161802 - incubator/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java

Author: cutting
Date: Mon Apr 18 14:21:58 2005
New Revision: 161802

URL: http://svn.apache.org/viewcvs?view=rev&rev=161802
Log:
Fix deprecation warnings.  Also fix "explain", "cache" and
"moreFromSite" nodes to correctly be under the item, not the channel.

Modified:
    incubator/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java

Modified: incubator/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java
URL: http://svn.apache.org/viewcvs/incubator/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java?view=diff&r1=161801&r2=161802
==============================================================================
--- incubator/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java (original)
+++ incubator/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java Mon Apr 18 14:21:58 2005
@@ -26,7 +26,6 @@
 import javax.servlet.ServletException;
 import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpUtils;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -113,7 +112,7 @@
     HitDetails[] details = bean.getDetails(show);
     String[] summaries = bean.getSummary(details, query);
 
-    String requestUrl = HttpUtils.getRequestURL(request).toString();
+    String requestUrl = request.getRequestURL().toString();
     String base = requestUrl.substring(0, requestUrl.lastIndexOf('/'));
 
     try {
@@ -158,14 +157,15 @@
         addNode(doc, item, "description", summaries[i]);
         addNode(doc, item, "link", url);
 
-        addNode(doc, channel, "nutch", "cache", base+"/cached.jsp?"+id);
-        addNode(doc, channel, "nutch", "explain", base+"/explain.jsp?"+id
-                +"&query="+URLEncoder.encode(queryString));
+        addNode(doc, item, "nutch", "cache", base+"/cached.jsp?"+id);
+        addNode(doc, item, "nutch", "explain", base+"/explain.jsp?"+id
+                +"&query="+URLEncoder.encode(queryString, "UTF-8"));
 
         if (hit.moreFromSiteExcluded()) {
-          addNode(doc, channel, "nutch", "moreFromSite", base+"/search.jsp"
+          addNode(doc, item, "nutch", "moreFromSite", base+"/search.jsp"
                   +"?query="
-                  +URLEncoder.encode("site:"+hit.getSite()+" "+queryString)
+                  +URLEncoder.encode("site:"+hit.getSite()+" "+queryString,
+                                     "UTF-8")
                   +"&hitsPerPage="+hitsPerPage+"&hitsPerSite="+0);
         }
       }