Author: siren
Date: Sat Jun 10 07:20:43 2006
New Revision: 413303
URL: http://svn.apache.org/viewvc?rev=413303&view=rev
Log:
removed unneeded SearchContext
Removed:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchContext.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchContextImpl.java
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/BaseSearch.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchForm.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/ServiceLocator.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/WebappInstanceServiceLocator.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/PostSearchExtensionPoint.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/PreSearchExtensionPoint.java
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/SearchExtensionPoint.java
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/BaseSearch.java
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/BaseSearch.java?rev=413303&r1=413302&r2=413303&view=diff
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/BaseSearch.java
(original)
+++
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/BaseSearch.java
Sat Jun 10 07:20:43 2006
@@ -64,8 +64,6 @@
}
- private SearchContextImpl context;
-
private ServiceLocator serviceLocator;
/**
@@ -114,9 +112,9 @@
/**
* Call plugins participating PreSearch activities
*/
- void callPreSearch() {
+ void callPreSearch(ServiceLocator locator) {
for (int i = 0; i < presearch.length; i++) {
- presearch[i].doPreSearch(context);
+ presearch[i].doPreSearch(serviceLocator);
}
}
@@ -125,16 +123,16 @@
*/
void callSearch() {
for (int i = 0; i < search.length; i++) {
- search[i].doSearch(context);
+ search[i].doSearch(serviceLocator);
}
}
/**
* Call plugins participating postSearch activities
*/
- void callPostSearch() {
+ void callPostSearch(ServiceLocator locator) {
for (int i = 0; i < postsearch.length; i++) {
- postsearch[i].doPostSearch(context);
+ postsearch[i].doPostSearch(serviceLocator);
}
}
@@ -143,10 +141,9 @@
*/
public void doSearch() {
// create context
- context = new SearchContextImpl(serviceLocator);
- callPreSearch();
+ callPreSearch(serviceLocator);
serviceLocator.getSearch().performSearch();
// callSearch();
- callPostSearch();
+ callPostSearch(serviceLocator);
}
}
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java?rev=413303&r1=413302&r2=413303&view=diff
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java
(original)
+++
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java
Sat Jun 10 07:20:43 2006
@@ -88,8 +88,15 @@
LOG.info("performing search, requiring:" + getHitsRequired());
try {
+ LOG.info("query:" + getQuery());
+ LOG.info("endOffset:" + getStartOffset() + getHitsRequired());
+ LOG.info("hitsPerDup:" + getHitsPerDup());
+ LOG.info("dupField:" + getDupField());
+ LOG.info("sortField:" + getSortColumn());
+ LOG.info("descending:" + isSortDesc());
+
hits = locator.getNutchBean().search(getQuery(), getStartOffset() +
getHitsRequired(),
- getHitsPerSite(), getDupField(), getSortColumn(), isSortDesc());
+ getHitsPerDup(), getDupField(), getSortColumn(), isSortDesc());
} catch (IOException e) {
hits = new Hits(0, new Hit[0]);
}
@@ -202,7 +209,7 @@
/**
* @return Returns the hitsPerSite.
*/
- public int getHitsPerSite() {
+ public int getHitsPerDup() {
return hitsPerDup;
}
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchForm.java
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchForm.java?rev=413303&r1=413302&r2=413303&view=diff
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchForm.java
(original)
+++
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchForm.java
Sat Jun 10 07:20:43 2006
@@ -266,7 +266,7 @@
/**
* Returns a string usable in urls that contains all active parameters and
* their values, if submitted encoding does not work values are encoded with
- * default encoding.
+ * utf-8 encoding.
*
* @param encoding
* @return
@@ -292,8 +292,8 @@
sb.append(URLEncoder.encode(kv.getKey(), encoding)).append("=").append(
URLEncoder.encode(kv.getValue(), encoding));
} else {
- sb.append(URLEncoder.encode(kv.getKey())).append("=").append(
- URLEncoder.encode(kv.getValue()));
+ sb.append(URLEncoder.encode(kv.getKey(),"utf-8")).append("=").append(
+ URLEncoder.encode(kv.getValue(), "utf-8"));
}
if (i.hasNext()) {
sb.append("&");
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/ServiceLocator.java
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/ServiceLocator.java?rev=413303&r1=413302&r2=413303&view=diff
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/ServiceLocator.java
(original)
+++
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/ServiceLocator.java
Sat Jun 10 07:20:43 2006
@@ -78,5 +78,5 @@
public Search getSearch();
public Locale getLocale();
-
+
}
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/WebappInstanceServiceLocator.java
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/WebappInstanceServiceLocator.java?rev=413303&r1=413302&r2=413303&view=diff
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/WebappInstanceServiceLocator.java
(original)
+++
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/WebappInstanceServiceLocator.java
Sat Jun 10 07:20:43 2006
@@ -135,4 +135,5 @@
public Locale getLocale() {
return getPreferences().getLocale(request);
}
+
}
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/PostSearchExtensionPoint.java
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/PostSearchExtensionPoint.java?rev=413303&r1=413302&r2=413303&view=diff
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/PostSearchExtensionPoint.java
(original)
+++
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/PostSearchExtensionPoint.java
Sat Jun 10 07:20:43 2006
@@ -15,7 +15,7 @@
*/
package org.apache.nutch.webapp.extension;
-import org.apache.nutch.webapp.common.SearchContext;
+import org.apache.nutch.webapp.common.ServiceLocator;
/**
* Plugins extending this extension point are run after the actual
@@ -25,6 +25,6 @@
public static final String
X_POINT_ID=PostSearchExtensionPoint.class.getName();
- void doPostSearch(SearchContext context);
+ void doPostSearch(ServiceLocator locator);
}
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/PreSearchExtensionPoint.java
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/PreSearchExtensionPoint.java?rev=413303&r1=413302&r2=413303&view=diff
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/PreSearchExtensionPoint.java
(original)
+++
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/PreSearchExtensionPoint.java
Sat Jun 10 07:20:43 2006
@@ -15,7 +15,7 @@
*/
package org.apache.nutch.webapp.extension;
-import org.apache.nutch.webapp.common.SearchContext;
+import org.apache.nutch.webapp.common.ServiceLocator;
/**
* Plugins extending this extension point are run before the actual
@@ -25,6 +25,6 @@
public static final String
X_POINT_ID=PreSearchExtensionPoint.class.getName();
- void doPreSearch(SearchContext context);
+ void doPreSearch(ServiceLocator locator);
}
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/SearchExtensionPoint.java
URL:
http://svn.apache.org/viewvc/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/SearchExtensionPoint.java?rev=413303&r1=413302&r2=413303&view=diff
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/SearchExtensionPoint.java
(original)
+++
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/extension/SearchExtensionPoint.java
Sat Jun 10 07:20:43 2006
@@ -15,7 +15,7 @@
*/
package org.apache.nutch.webapp.extension;
-import org.apache.nutch.webapp.common.SearchContext;
+import org.apache.nutch.webapp.common.ServiceLocator;
/**
* Plugins extending this interface can provide logic that
@@ -26,6 +26,6 @@
public static final String X_POINT_ID=SearchExtensionPoint.class.getName();
- void doSearch(SearchContext context);
+ void doSearch(ServiceLocator locator);
}
