Modified: lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.jj URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.jj?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.jj (original) +++ lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysis.jj Tue May 9 06:43:52 2006 @@ -28,12 +28,15 @@ package org.apache.nutch.analysis; +import java.io.StringReader; +import org.apache.hadoop.conf.Configuration; import org.apache.nutch.searcher.Query; import org.apache.nutch.searcher.QueryFilters; import org.apache.nutch.searcher.Query.Clause; -import org.apache.hadoop.conf.Configuration; import org.apache.nutch.util.NutchConfiguration; +import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.StopFilter; +import org.apache.lucene.analysis.TokenStream; import java.io.*; import java.util.*; @@ -51,10 +54,17 @@ private static final Set STOP_SET = StopFilter.makeStopSet(STOP_WORDS); + private Analyzer analyzer = null; private String queryString; private QueryFilters queryFilters; + /** Constructs a nutch analysis. */ + public NutchAnalysis(String query, Analyzer analyzer) { + this(new FastCharStream(new StringReader(query))); + this.analyzer = analyzer; + } + /** True iff word is a stop word. Stop words are only removed from queries. * Every word is indexed. */ public static boolean isStopWord(String word) { @@ -63,8 +73,14 @@ /** Construct a query parser for the text in a reader. */ public static Query parseQuery(String queryString, Configuration conf) throws IOException { - NutchAnalysis parser = - new NutchAnalysis(new FastCharStream(new StringReader(queryString))); + return parseQuery(queryString, null, conf); + } + + /** Construct a query parser for the text in a reader. */ + public static Query parseQuery(String queryString, Analyzer analyzer, Configuration conf) + throws IOException { + NutchAnalysis parser = new NutchAnalysis( + queryString, (analyzer != null) ? analyzer : new NutchDocumentAnalyzer(conf)); parser.queryString = queryString; parser.queryFilters = new QueryFilters(conf); return parser.parse(conf); @@ -266,19 +282,46 @@ int start; ArrayList result = new ArrayList(); String term; + StringBuffer terms = new StringBuffer(); } { { start = token.endColumn; } - term = term() { result.add(term); } + term = term() { + terms.append(term).append(" "); + //result.add(term); + } ( LOOKAHEAD( (infix())+ term() ) (infix())+ - term = term() { result.add(term); })* + term = term() { + terms.append(term).append(" "); + //result.add(term); + })* { if (this.queryFilters.isRawField(field)) { - result.clear(); +// result.clear(); result.add(queryString.substring(start, token.endColumn)); + + } else { + org.apache.lucene.analysis.Token token; + TokenStream tokens = analyzer.tokenStream( + field, new StringReader(terms.toString())); + + while (true) { + try { + token = tokens.next(); + } catch (IOException e) { + token = null; + } + if (token == null) { break; } + result.add(token.termText()); + } + try { + tokens.close(); + } catch (IOException e) { + // ignore + } } return result; }
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysisTokenManager.java URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysisTokenManager.java?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysisTokenManager.java (original) +++ lucene/nutch/trunk/src/java/org/apache/nutch/analysis/NutchAnalysisTokenManager.java Tue May 9 06:43:52 2006 @@ -1,11 +1,14 @@ /* Generated By:JavaCC: Do not edit this line. NutchAnalysisTokenManager.java */ package org.apache.nutch.analysis; +import java.io.StringReader; +import org.apache.hadoop.conf.Configuration; import org.apache.nutch.searcher.Query; import org.apache.nutch.searcher.QueryFilters; import org.apache.nutch.searcher.Query.Clause; -import org.apache.hadoop.conf.Configuration; -import org.apache.lucene.analysis.StopFilter; import org.apache.nutch.util.NutchConfiguration; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.StopFilter; +import org.apache.lucene.analysis.TokenStream; import java.io.*; import java.util.*; @@ -313,12 +316,10 @@ int jjimageLen; int lengthOfMatch; protected char curChar; -public NutchAnalysisTokenManager(CharStream stream) -{ +public NutchAnalysisTokenManager(CharStream stream){ input_stream = stream; } -public NutchAnalysisTokenManager(CharStream stream, int lexState) -{ +public NutchAnalysisTokenManager(CharStream stream, int lexState){ this(stream); SwitchTo(lexState); } @@ -436,15 +437,13 @@ { case 1 : if (image == null) - image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); - else + image = new StringBuffer(); image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); matchedToken.image = matchedToken.image.toLowerCase(); break; case 2 : if (image == null) - image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); - else + image = new StringBuffer(); image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))); // remove dots for (int i = 0; i < image.length(); i++) { Modified: lucene/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java (original) +++ lucene/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java Tue May 9 06:43:52 2006 @@ -80,7 +80,10 @@ if (queryString == null) queryString = ""; String urlQuery = URLEncoder.encode(queryString, "UTF-8"); - + + // the query language + String queryLang = request.getParameter("lang"); + int start = 0; // first hit to display String startString = request.getParameter("start"); if (startString != null) @@ -116,11 +119,13 @@ // Make up query string for use later drawing the 'rss' logo. String params = "&hitsPerPage=" + hitsPerPage + + (queryLang == null ? "" : "&lang=" + queryLang) + (sort == null ? "" : "&sort=" + sort + (reverse? "&reverse=true": "") + (dedupField == null ? "" : "&dedupField=" + dedupField)); - Query query = Query.parse(queryString, this.conf); + Query query = Query.parse(queryString, queryLang, this.conf); NutchBean.LOG.info("query: " + queryString); + NutchBean.LOG.info("lang: " + queryLang); // execute the query Hits hits; @@ -212,7 +217,7 @@ addNode(doc, item, "nutch", "cache", base+"/cached.jsp?"+id); addNode(doc, item, "nutch", "explain", base+"/explain.jsp?"+id - +"&query="+urlQuery); + +"&query="+urlQuery+"&lang="+queryLang); if (hit.moreFromDupExcluded()) { addNode(doc, item, "nutch", "moreFromSite", requestUrl Modified: lucene/nutch/trunk/src/java/org/apache/nutch/searcher/Query.java URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/searcher/Query.java?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/java/org/apache/nutch/searcher/Query.java (original) +++ lucene/nutch/trunk/src/java/org/apache/nutch/searcher/Query.java Tue May 9 06:43:52 2006 @@ -25,12 +25,17 @@ import java.util.ArrayList; import java.util.logging.Logger; -import org.apache.hadoop.util.LogFormatter; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.io.Writable; +import org.apache.hadoop.util.LogFormatter; +import org.apache.nutch.analysis.AnalyzerFactory; + import org.apache.nutch.analysis.NutchAnalysis; import org.apache.nutch.util.NutchConfiguration; -import org.apache.hadoop.io.Writable; + +import org.apache.lucene.analysis.Analyzer; + /** A Nutch query. */ public final class Query implements Writable, Cloneable, Configurable { @@ -425,10 +430,16 @@ return (String[])result.toArray(new String[result.size()]); } + /** Parse a query from a string. */ + public static Query parse(String queryString, String queryLang, Configuration conf) + throws IOException { + return fixup(NutchAnalysis.parseQuery( + queryString, AnalyzerFactory.get(conf).get(queryLang), conf), conf); + } /** Parse a query from a string. */ public static Query parse(String queryString, Configuration conf) throws IOException { - return fixup(NutchAnalysis.parseQuery(queryString, conf), conf); + return parse(queryString, null, conf); } /** Convert clauses in unknown fields to the default field. */ Modified: lucene/nutch/trunk/src/web/jsp/explain.jsp URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/jsp/explain.jsp?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/jsp/explain.jsp (original) +++ lucene/nutch/trunk/src/web/jsp/explain.jsp Tue May 9 06:43:52 2006 @@ -17,7 +17,11 @@ Hit hit = new Hit(Integer.parseInt(request.getParameter("idx")), Integer.parseInt(request.getParameter("id"))); HitDetails details = bean.getDetails(hit); - Query query = Query.parse(request.getParameter("query"), nutchConf); + // get the lang from request + // get the lang from request + String queryLang = request.getParameter("lang"); + if (queryLang == null) { queryLang = ""; } + Query query = Query.parse(request.getParameter("query"), queryLang, nutchConf); String language = ResourceBundle.getBundle("org.nutch.jsp.explain", request.getLocale()) .getLocale().getLanguage(); Modified: lucene/nutch/trunk/src/web/jsp/search.jsp URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/jsp/search.jsp?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/jsp/search.jsp (original) +++ lucene/nutch/trunk/src/web/jsp/search.jsp Tue May 9 06:43:52 2006 @@ -36,7 +36,7 @@ // it effectively prevents the servlet class from being loaded into // the JVM } - + %> <%-- @@ -57,7 +57,7 @@ if (queryString == null) queryString = ""; String htmlQueryString = Entities.encode(queryString); - + // a flag to make the code cleaner a bit. boolean clusteringAvailable = (clusterer != null); @@ -89,8 +89,12 @@ int hitsToCluster = HITS_TO_CLUSTER; // number of hits to cluster - Query query = Query.parse(queryString, nutchConf); + // get the lang from request + String queryLang = request.getParameter("lang"); + if (queryLang == null) { queryLang = ""; } + Query query = Query.parse(queryString, queryLang, nutchConf); bean.LOG.info("query: " + queryString); + bean.LOG.info("lang: " + queryLang); String language = ResourceBundle.getBundle("org.nutch.jsp.search", request.getLocale()) @@ -98,7 +102,7 @@ String requestURI = HttpUtils.getRequestURL(request).toString(); String base = requestURI.substring(0, requestURI.lastIndexOf('/')); String rss = "../opensearch?query="+htmlQueryString - +"&hitsPerSite="+hitsPerSite+params; + +"&hitsPerSite="+hitsPerSite+"&lang="+queryLang+params; %><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <% // To prevent the character encoding declared with 'contentType' page @@ -132,6 +136,7 @@ <form name="search" action="../search.jsp" method="get"> <input name="query" size=44 value="<%=htmlQueryString%>"> <input type="hidden" name="hitsPerPage" value="<%=hitsPerPage%>"> + <input type="hidden" name="lang" value="<%=language%>"> <input type="submit" value="<i18n:message key="search"/>"> <% if (clusteringAvailable) { %> <input id="clustbox" type="checkbox" name="clustering" value="yes" <% if (clustering.equals("yes")) { %>CHECKED<% } %>> @@ -219,12 +224,13 @@ <br> <span class="url"><%=Entities.encode(url)%></span> (<a href="../cached.jsp?<%=id%>"><i18n:message key="cached"/></a>) - (<a href="../explain.jsp?<%=id%>&query=<%=URLEncoder.encode(queryString, "UTF-8")%>"><i18n:message key="explain"/></a>) + (<a href="../explain.jsp?<%=id%>&query=<%=URLEncoder.encode(queryString, "UTF-8")%>&lang=<%=queryLang%>"><i18n:message key="explain"/></a>) (<a href="../anchors.jsp?<%=id%>"><i18n:message key="anchors"/></a>) <% if (hit.moreFromDupExcluded()) { String more = "query="+URLEncoder.encode("site:"+hit.getDedupValue()+" "+queryString, "UTF8") +params+"&hitsPerSite="+0 + +"&lang="+queryLang +"&clustering="+clustering;%> (<a href="../search.jsp?<%=more%>"><i18n:message key="moreFrom"/> <%=hit.getDedupValue()%></a>) @@ -254,6 +260,7 @@ %> <form name="next" action="../search.jsp" method="get"> <input type="hidden" name="query" value="<%=htmlQueryString%>"> + <input type="hidden" name="lang" value="<%=queryLang%>"> <input type="hidden" name="start" value="<%=end%>"> <input type="hidden" name="hitsPerPage" value="<%=hitsPerPage%>"> <input type="hidden" name="hitsPerSite" value="<%=hitsPerSite%>"> @@ -271,6 +278,7 @@ %> <form name="showAllHits" action="../search.jsp" method="get"> <input type="hidden" name="query" value="<%=htmlQueryString%>"> + <input type="hidden" name="lang" value="<%=queryLang%>"> <input type="hidden" name="hitsPerPage" value="<%=hitsPerPage%>"> <input type="hidden" name="hitsPerSite" value="0"> <input type="hidden" name="clustering" value="<%=clustering%>"> Modified: lucene/nutch/trunk/src/web/pages/ca/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/ca/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/ca/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/ca/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Cerca"/> -<a href="help.html">Ajuda</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="ca"/> + <input name="query" size="44"/> <input type="submit" value="Cerca"/> + <a href="help.html">Ajuda</a> </form> </center> </body> Modified: lucene/nutch/trunk/src/web/pages/de/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/de/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/de/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/de/search.xml Tue May 9 06:43:52 2006 @@ -5,9 +5,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Suchen"/> -<a href="help.html">Hilfe</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="de"/> + <input name="query" size="44"/> <input type="submit" value="Suchen"/> + <a href="help.html">Hilfe</a> </form> </center> </body> Modified: lucene/nutch/trunk/src/web/pages/en/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/en/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/en/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/en/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Search"/> -<a href="help.html">help</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="en"/> + <input name="query" size="44"/> <input type="submit" value="Search"/> + <a href="help.html">help</a> </form> </center> <div style="text-align: right;"> Modified: lucene/nutch/trunk/src/web/pages/es/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/es/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/es/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/es/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Buscar"/> -<a href="help.html">ayuda</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="es"/> + <input name="query" size="44"/> <input type="submit" value="Buscar"/> + <a href="help.html">ayuda</a> </form> </center> </body> Modified: lucene/nutch/trunk/src/web/pages/fi/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/fi/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/fi/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/fi/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Hae"/> -<a href="help.html">Apua</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="fi"/> + <input name="query" size="44"/> <input type="submit" value="Hae"/> + <a href="help.html">Apua</a> </form> </center> </body> Modified: lucene/nutch/trunk/src/web/pages/fr/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/fr/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/fr/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/fr/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Recherche"/> -<a href="help.html">Aide</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="fr"/> + <input name="query" size="44"/> <input type="submit" value="Recherche"/> + <a href="help.html">Aide</a> </form> </center> </body> Modified: lucene/nutch/trunk/src/web/pages/hu/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/hu/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/hu/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/hu/search.xml Tue May 9 06:43:52 2006 @@ -5,9 +5,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Keresés"/> -<a href="help.html">segítség</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="hu"/> + <input name="query" size="44"/> <input type="submit" value="Keresés"/> + <a href="help.html">segítség</a> </form> </center> </body> Modified: lucene/nutch/trunk/src/web/pages/it/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/it/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/it/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/it/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="cerca" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Cerca"/> -<a href="help.html">aiuto</a> +<form name="cerca" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="it"/> + <input name="query" size="44"/> <input type="submit" value="Cerca"/> + <a href="help.html">aiuto</a> </form> </center> <div style="text-align: right;"> Modified: lucene/nutch/trunk/src/web/pages/jp/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/jp/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/jp/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/jp/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="æ¤ç´¢"/> -<a href="help.html">ãã«ã</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="jp"/> + <input name="query" size="44"/> <input type="submit" value="æ¤ç´¢"/> + <a href="help.html">ãã«ã</a> </form> </center> </body> Modified: lucene/nutch/trunk/src/web/pages/ms/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/ms/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/ms/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/ms/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Search"/> -<a href="help.html">Penunjuk</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="ms"/> + <input name="query" size="44"/> <input type="submit" value="Search"/> + <a href="help.html">Penunjuk</a> </form> </center> </body> Modified: lucene/nutch/trunk/src/web/pages/nl/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/nl/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/nl/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/nl/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Zoeken"/> -<a href="help.html">Help</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="nl"/> + <input name="query" size="44"/> <input type="submit" value="Zoeken"/> + <a href="help.html">Help</a> </form> </center> </body> Modified: lucene/nutch/trunk/src/web/pages/pl/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/pl/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/pl/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/pl/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Szukaj"/> -<a href="help.html">pomoc</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="pl"/> + <input name="query" size="44"/> <input type="submit" value="Szukaj"/> + <a href="help.html">pomoc</a> </form> </center> <div style="text-align: right;"> Modified: lucene/nutch/trunk/src/web/pages/pt/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/pt/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/pt/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/pt/search.xml Tue May 9 06:43:52 2006 @@ -3,8 +3,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input name="query" size="44"/> <input type="submit" value="Search"/> -<a href="help.html">ajuda</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="pt"/> + <input name="query" size="44"/> <input type="submit" value="Search"/> + <a href="help.html">ajuda</a> </form> </center> </body> Modified: lucene/nutch/trunk/src/web/pages/sh/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/sh/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/sh/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/sh/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Pretraži"/> -<a href="help.html">pomoÄ</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="sh"/> + <input name="query" size="44"/> <input type="submit" value="Pretraži"/> + <a href="help.html">pomoÄ</a> </form> </center> <div style="text-align: right;"> Modified: lucene/nutch/trunk/src/web/pages/sr/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/sr/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/sr/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/sr/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="ÐÑеÑÑажи"/> -<a href="help.html">помоÑ</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="sr"/> + <input name="query" size="44"/> <input type="submit" value="ÐÑеÑÑажи"/> + <a href="help.html">помоÑ</a> </form> </center> <div style="text-align: right;"> Modified: lucene/nutch/trunk/src/web/pages/sv/search.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/web/pages/sv/search.xml?rev=405430&r1=405429&r2=405430&view=diff ============================================================================== --- lucene/nutch/trunk/src/web/pages/sv/search.xml (original) +++ lucene/nutch/trunk/src/web/pages/sv/search.xml Tue May 9 06:43:52 2006 @@ -1,9 +1,10 @@ <page> <body> <center> -<form name="search" action="../search.jsp" method="get"> <input - name="query" size="44"/> <input type="submit" value="Search"/> -<a href="help.html">hjälp</a> +<form name="search" action="../search.jsp" method="get"> + <input type="hidden" name="lang" value="sv"/> + <input name="query" size="44"/> <input type="submit" value="Search"/> + <a href="help.html">hjälp</a> </form> </center> <div style="text-align: right;"> ------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Nutch-cvs mailing list Nutch-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nutch-cvs
