Author: mattmann
Date: Tue Feb 15 03:37:58 2011
New Revision: 1070770
URL: http://svn.apache.org/viewvc?rev=1070770&view=rev
Log:
- fix for OODT-141 LuceneCatalog pagination throws LuceneException when
grabbing out of bounds hitNum
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1070770&r1=1070769&r2=1070770&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Tue Feb 15 03:37:58 2011
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.3-SNAPSHOT (in progress)
--------------------------------------------
+* OODT-141 LuceneCatalog pagination throws LuceneException when
+ grabbing out of bounds hitNum
+
* OODT-140 commons-lang version should be standardized on
(2.1. vs 2.3) (bfoster)
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java?rev=1070770&r1=1070769&r2=1070770&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
Tue Feb 15 03:37:58 2011
@@ -675,7 +675,7 @@ public class LuceneCatalog implements Ca
if (hits.length() > 0) {
products = new Vector<Product>(n);
int i = 0;
- while (products.size() < n) {
+ while (products.size() < Math.min(n, hits.length())) {
Document productDoc = hits.doc(i);
CompleteProduct prod = toCompleteProduct(productDoc, false,
false);
Modified:
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java?rev=1070770&r1=1070769&r2=1070770&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
(original)
+++
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
Tue Feb 15 03:37:58 2011
@@ -285,6 +285,22 @@ public class TestLuceneCatalog extends T
Product retProd = ((Product) page.getPageProducts().get(0));
assertEquals("ShouldBeFirstForPage.txt", retProd.getProductName());
}
+
+ /**
+ * @since OODT-141
+ */
+ public void testTopResults(){
+ Product testProduct = getTestProduct();
+ try{
+ myCat.addProduct(testProduct);
+ myCat.addMetadata(getTestMetadata("tempProduct"), testProduct);
+ myCat.getTopNProducts(20);
+ }
+ catch(Exception e){
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
public void testAddProduct() {
