[Archive-access-cvs] SF.net SVN: archive-access: [2413] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex/ LocalResourceIndex.java

[<bra...@us...>]

Revision: 2413
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2413&view=rev
Author:   bradtofel
Date:     2008-07-07 14:33:24 -0700 (Mon, 07 Jul 2008)

Log Message:
-----------
BUGFIX: was not throwing exception(BadQuery) when no results are within the requested Window. This is a Bad Query, because the UI shouldn't generate links to result pages beyond those possible, so the user has manually changed the pageNum argument.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java	2008-07-07 21:31:49 UTC (rev 2412)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java	2008-07-07 21:33:24 UTC (rev 2413)
@@ -476,10 +476,14 @@
 		public ObjectFilter<T> getFilter() {
 			return windowFilters;
 		}
-		public void annotateResults(SearchResults results) {
+		public void annotateResults(SearchResults results) 
+		throws BadQueryException {
 			results.setFirstReturned(startResult);
 			results.setNumRequested(resultsPerPage);
-
+			int numSeen = endFilter.getNumSeen();
+			if(numSeen == 0) {
+				throw new BadQueryException("No results in requested window");
+			}
 			// how many went by the filters:
 			results.setMatchingCount(startFilter.getNumSeen());
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.