[Archive-access-cvs] archive-access/projects/nutch/src/java/org/archive/access/nutch NutchwaxOpenSearchServlet.java,1.1,1.2 NutchwaxSegmentMergeTool.java,1.1,1.2

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9487/src/java/org/archive/access/nutch

Modified Files:
	NutchwaxOpenSearchServlet.java NutchwaxSegmentMergeTool.java 
Log Message:
* project.properties
    webapp config.
* project.xml
    Minor change.
* src/java/org/archive/access/nutch/NutchwaxOpenSearchServlet.java 
    Make query string utf8.



Index: NutchwaxOpenSearchServlet.java
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch/NutchwaxOpenSearchServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NutchwaxOpenSearchServlet.java	27 Jul 2005 01:24:38 -0000	1.1
--- NutchwaxOpenSearchServlet.java	6 Oct 2005 01:45:35 -0000	1.2
***************
*** 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;
              }
              
--- 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);
              }
              

Index: NutchwaxSegmentMergeTool.java
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/java/org/archive/access/nutch/NutchwaxSegmentMergeTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NutchwaxSegmentMergeTool.java	2 Sep 2005 01:08:18 -0000	1.1
--- NutchwaxSegmentMergeTool.java	6 Oct 2005 01:45:35 -0000	1.2
***************
*** 225,228 ****
--- 225,229 ----
        }
        masters.add(masterDir);
+       LOG.severe("MasterDir is " + masterDir.toString());
        IndexWriter iw = new IndexWriter(masterDir, new WhitespaceAnalyzer(), true);
        iw.setUseCompoundFile(false);