Update of /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24686/src/java/org/archive/access/nutch
Modified Files:
NutchwaxOpenSearchServlet.java
Log Message:
* src/java/org/archive/access/nutch/NutchwaxOpenSearchServlet.java
* src/web/search.jsp
Set config in tomcat rather than here.
See faq in wera on encodings.
Index: NutchwaxOpenSearchServlet.java
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch/NutchwaxOpenSearchServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NutchwaxOpenSearchServlet.java 6 Oct 2005 01:45:35 -0000 1.2
--- NutchwaxOpenSearchServlet.java 6 Oct 2005 17:35:02 -0000 1.3
***************
*** 50,67 ****
// Make a delegating method that preprocesses the query string
// converting any exacturl values so they'll pass the NutchAnalysis.
- // Also make it so we encode the parameter strings properly.
HttpServletRequest delegatingReq = new HttpServletRequest() {
public String getParameter(String parameter) {
String q = req.getParameter(parameter);
! if (parameter == null || !parameter.equals("query") ||
! q == null) {
! return q;
! }
! try {
! q = new String(q.getBytes("ISO-8859-1"), "UTF-8");
! } catch (java.io.UnsupportedEncodingException e) {
! throw new RuntimeException(e);
! }
! return NutchwaxQuery.encodeExacturl(q);
}
--- 50,58 ----
// Make a delegating method that preprocesses the query string
// converting any exacturl values so they'll pass the NutchAnalysis.
HttpServletRequest delegatingReq = new HttpServletRequest() {
public String getParameter(String parameter) {
String q = req.getParameter(parameter);
! return (parameter != null && parameter.equals("query"))?
! NutchwaxQuery.encodeExacturl(q): q;
}
|
