Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Now if there are no hits, I return a HitsIterator that will return 0 for all appropriate fields instead of returning null 

I put the string "relevance" into a static variable.


git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@150810 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Peter Carlson 2002-09-07 01:00:47 +00:00
parent 0a7e5168e5
commit 18d1f6e5df
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sandbox/contributions/searchbean/src/java/org/apache/lucene/beans/HitsIterator.java
View File

@ -42,7 +42,7 @@ public class HitsIterator {
private int totalPages = -1; // set by constructor private int totalPages = -1; // set by constructor
private int endPagePosition = 0; // position currentPage ends private int endPagePosition = 0; // position currentPage ends
/** Creates new HitsIterator */ /** Creates new HitsIterator */
private HitsIterator() { private HitsIterator() {
} }
@ -54,7 +54,7 @@ public class HitsIterator {
public HitsIterator(Hits hits, String sortFlag) throws IOException{ public HitsIterator(Hits hits, String sortFlag) throws IOException{
this.hitsCollection = hits; this.hitsCollection = hits;
if (sortFlag != null){ if (sortFlag != null){
if ((sortFlag != "") && (sortFlag !="relevance")){ if ((sortFlag != "") && (sortFlag.equals(SearchBean.SORT_FIELD_RELEVANCE))){
//logger.debug("Sorting hits by field "+sortFlag); //logger.debug("Sorting hits by field "+sortFlag);
sortByField(sortFlag); sortByField(sortFlag);
//logger.debug("Completed sorting by field "+sortFlag); //logger.debug("Completed sorting by field "+sortFlag);
@ -80,7 +80,9 @@ public class HitsIterator {
if (sf !=null){ if (sf !=null){
c = (Comparator) new CompareDocumentsByField(); c = (Comparator) new CompareDocumentsByField();
} else { } else {
//logger.error("Sort field not found"); //logger.error("Sort field not found");
// use default sort of Lucene -- Relevance
// Should I throw an exception here?
arrayOfIndividualHits = null; arrayOfIndividualHits = null;
return; return;
} }
@ -100,14 +102,17 @@ public class HitsIterator {
private void setPageCount() { private void setPageCount() {
if (totalHits == 0){
totalPages = totalHits / pageSize; totalPages = 0;
setCurrentPage(0);
//account for remainder if not exaxtly divisable } else {
if (totalHits % pageSize != 0) totalPages = totalHits / pageSize;
{ totalPages++;}
//account for remainder if not exaxtly divisable
setCurrentPage(1); // reset currentPage to make sure not over the limit if (totalHits % pageSize != 0)
{ totalPages++;}
setCurrentPage(1); // reset currentPage to make sure not over the limit
}
} }
public int getPageCount() { public int getPageCount() {
@ -151,6 +156,7 @@ public class HitsIterator {
} }
public org.apache.lucene.document.Document getDoc() throws IOException { public org.apache.lucene.document.Document getDoc() throws IOException {
// Determine if using relevnace or sorting by another field
if (arrayOfIndividualHits == null) if (arrayOfIndividualHits == null)
return hitsCollection.doc(currentPosition - 1); return hitsCollection.doc(currentPosition - 1);
else { else {
@ -160,6 +166,7 @@ public class HitsIterator {
} }
public int getScore() throws Exception{ public int getScore() throws Exception{
// Determine if using relevnace or sorting by another field
if (arrayOfIndividualHits == null) if (arrayOfIndividualHits == null)
return (int) (hitsCollection.score(currentPosition - 1)*100.0f); return (int) (hitsCollection.score(currentPosition - 1)*100.0f);
else else
@ -184,8 +191,9 @@ public class HitsIterator {
} }
public void setCurrentPage(int currentPage) throws IndexOutOfBoundsException{ public void setCurrentPage(int currentPage) throws IndexOutOfBoundsException{
if (currentPage > totalPages){ if (currentPage > totalPages){
throw new IndexOutOfBoundsException("currentPage greater than total pages"); currentPage = totalPages; // don't allow to go over max
//throw new IndexOutOfBoundsException("currentPage greater than total pages");
} }
this.currentPage = currentPage; this.currentPage = currentPage;