[Archive-access-cvs] SF.net SVN: archive-access:[2622]

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

Revision: 2622
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2622&view=rev
Author:   bradtofel
Date:     2008-10-28 02:06:26 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
BUGFIX(ACC-33): Fixed Search Result summary and counts.

Modified Paths:
--------------
    branches/wayback-1_4_1/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp

Modified: branches/wayback-1_4_1/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
===================================================================
--- branches/wayback-1_4_1/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp	2008-10-28 01:52:22 UTC (rev 2621)
+++ branches/wayback-1_4_1/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp	2008-10-28 02:06:26 UTC (rev 2622)
@@ -26,14 +26,13 @@
 Date searchEndDate = wbRequest.getEndDate();
 
 long firstResult = uResults.getFirstReturned();
-long resultCount = uResults.getReturnedCount();
-long lastResult = resultCount + firstResult;
+long lastResult = uResults.getReturnedCount() + firstResult;
 
 long totalCaptures = uResults.getMatchingCount();
 
 %>
-<%= fmt.format("PathPrefixQuery.showingResults",firstResult,lastResult,
-        resultCount,searchString) %>
+<%= fmt.format("PathPrefixQuery.showingResults",firstResult + 1,lastResult,
+		totalCaptures,searchString) %>
 <br/>
 
 <hr></hr>

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp	2008-10-28 01:52:22 UTC (rev 2621)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/query/HTMLUrlResults.jsp	2008-10-28 02:06:26 UTC (rev 2622)
@@ -26,14 +26,13 @@
 Date searchEndDate = wbRequest.getEndDate();
 
 long firstResult = uResults.getFirstReturned();
-long resultCount = uResults.getReturnedCount();
-long lastResult = resultCount + firstResult;
+long lastResult = uResults.getReturnedCount() + firstResult;
 
 long totalCaptures = uResults.getMatchingCount();
 
 %>
-<%= fmt.format("PathPrefixQuery.showingResults",firstResult,lastResult,
-        resultCount,searchString) %>
+<%= fmt.format("PathPrefixQuery.showingResults",firstResult + 1,lastResult,
+		totalCaptures,searchString) %>
 <br/>
 
 <hr></hr>


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