fix some counts
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d1b0a7b8 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d1b0a7b8 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d1b0a7b8 Branch: refs/heads/master Commit: d1b0a7b825eb4ef4097da104969cd8bd15c5b6e9 Parents: 999e68d Author: Tom Barber <t...@analytical-labs.com> Authored: Fri Jul 8 22:06:13 2016 +0100 Committer: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Committed: Thu Mar 9 21:35:02 2017 -0800 ---------------------------------------------------------------------- .../oodt/cas/filemgr/catalog/LuceneCatalog.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/d1b0a7b8/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java index c8936bf..0a5564b 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java @@ -447,7 +447,8 @@ public class LuceneCatalog implements Catalog { Sort sort = new Sort(new SortField("CAS.ProductReceivedTime", SortField.Type.STRING, true)); //TODO FIX NUMBER OF RECORDS - TopDocs topDocs = searcher.search(query, 1, sort); + TopDocs check = searcher.search(query, 1, sort); + TopDocs topDocs = searcher.search(query, check.totalHits, sort); ScoreDoc[] hits = topDocs.scoreDocs; @@ -519,7 +520,8 @@ public class LuceneCatalog implements Catalog { Sort sort = new Sort(new SortField("CAS.ProductReceivedTime", SortField.Type.STRING, true)); //TODO FIX NUMBER OF RECORDS - TopDocs topDocs = searcher.search(query, 1, sort); + TopDocs check = searcher.search(query, 1, sort); + TopDocs topDocs = searcher.search(query, check.totalHits, sort); ScoreDoc[] hits = topDocs.scoreDocs; @@ -584,7 +586,8 @@ public class LuceneCatalog implements Catalog { Sort sort = new Sort(new SortField("CAS.ProductReceivedTime", SortField.Type.STRING, true)); //TODO FIX NUMBER OF RECORDS - TopDocs topDocs = searcher.search(query, 1, sort); + TopDocs check = searcher.search(query, 1, sort); + TopDocs topDocs = searcher.search(query, check.totalHits, sort); ScoreDoc[] hits = topDocs.scoreDocs; @@ -728,7 +731,8 @@ public class LuceneCatalog implements Catalog { LOG.log(Level.FINE, "Querying LuceneCatalog: q: [" + booleanQuery + "]"); //TODO FIX NUMBER OF RECORDS - TopDocs topDocs = searcher.search(booleanQuery.build(), 1, sort); + TopDocs check = searcher.search(booleanQuery.build(), 1, sort); + TopDocs topDocs = searcher.search(booleanQuery.build(), check.totalHits, sort); ScoreDoc[] hits = topDocs.scoreDocs; @@ -1369,8 +1373,9 @@ public class LuceneCatalog implements Catalog { LOG.log(Level.FINE, "Querying LuceneCatalog: q: [" + booleanQuery + "]"); //TODO FIX NUMBER OF RECORDS - TopDocs topDocs = searcher.search(booleanQuery.build(),1, sort); - + TopDocs check = searcher.search(booleanQuery.build(),1, sort); + TopDocs topDocs = searcher.search(booleanQuery.build(),check.totalHits, sort); + // Calculate page size and set it while we have the results if (page != null) { page.setTotalPages(PaginationUtils.getTotalPage(topDocs.totalHits, pageSize));
