Author: siren
Date: Fri Apr 21 11:34:40 2006
New Revision: 395982
URL: http://svn.apache.org/viewcvs?rev=395982&view=rev
Log:
changed dup field to be dynamic, not anymore hardcoded to site
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Preferences.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/SearchResultBean.java
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Preferences.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Preferences.java?rev=395982&r1=395981&r2=395982&view=diff
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Preferences.java
(original)
+++
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Preferences.java
Fri Apr 21 11:34:40 2006
@@ -36,7 +36,7 @@
public static final String KEY_RESULTS_PER_PAGE = "R";
- public static final String KEY_RESULTS_PER_DUP = "S";
+ public static final String KEY_HITS_PER_DUP = "S";
public static final String KEY_DUP_FIELD = "D";
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/Search.java?rev=395982&r1=395981&r2=395982&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
Fri Apr 21 11:34:40 2006
@@ -49,7 +49,7 @@
int startOffset;
- int hitsPerSite;
+ int hitsPerDup;
int hitsPerPage;
@@ -158,8 +158,8 @@
startOffset = parseInt(form.getValueString(SearchForm.NAME_START), 0);
hitsPerPage = parseInt(form.getValueString(SearchForm.NAME_HITSPERPAGE),
prefs.getInt(Preferences.KEY_RESULTS_PER_PAGE, 10));
- hitsPerSite = parseInt(form.getValueString("hitsPerSite"), prefs.getInt(
- Preferences.KEY_RESULTS_PER_DUP, 2));
+ hitsPerDup = parseInt(form.getValueString(SearchForm.NAME_HITSPERDUP),
prefs.getInt(
+ Preferences.KEY_HITS_PER_DUP, 2));
maxHits = hitsPerPage;
@@ -200,7 +200,7 @@
* @return Returns the hitsPerSite.
*/
public int getHitsPerSite() {
- return hitsPerSite;
+ return hitsPerDup;
}
/**
@@ -208,7 +208,7 @@
* The hitsPerSite to set.
*/
protected void setHitsPerSite(int hitsPerSite) {
- this.hitsPerSite = hitsPerSite;
+ this.hitsPerDup = hitsPerSite;
}
/**
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchForm.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchForm.java?rev=395982&r1=395981&r2=395982&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
Fri Apr 21 11:34:40 2006
@@ -45,9 +45,9 @@
* General HTTP parameter name wich contains hits per page value
*/
public static final String NAME_HITSPERPAGE = "hitsPerPage";
-
- public static final String NAME_HITSPERSITE = "hitsPerSite";
-
+
+ public static final String NAME_HITSPERDUP ="hitsPerDup";
+
public static final String NAME_START = "start";
public static final String NAME_QUERYSTRING = "query";
Modified:
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchResultBean.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchResultBean.java?rev=395982&r1=395981&r2=395982&view=diff
==============================================================================
---
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchResultBean.java
(original)
+++
lucene/nutch/trunk/contrib/web2/src/main/java/org/apache/nutch/webapp/common/SearchResultBean.java
Fri Apr 21 11:34:40 2006
@@ -111,7 +111,7 @@
more = "query="
+ URLEncoder.encode(search.getDupField() + ":" + hit.getDedupValue()
+ " " + search.getQueryString(), "UTF8")
- + search.getForm().getParameterString("UTF8");// "&hitsPerSite=" + 0;
+ + "&" + SearchForm.NAME_HITSPERDUP + "=0";
return more;
}
