--- Harveststatus-seeds.jsp 2011-09-02 17:55:41.000000000 +0200 +++ /tmp/Harveststatus-seeds.jsp 2011-09-02 17:52:03.000000000 +0200 @@ -31,7 +31,7 @@ displayed. --%><%@ page import="java.util.Date, java.util.Collection, - java.util.List, java.util.Map, java.util.Set, + java.util.List, java.util.Map, java.util.Set, java.util.HashMap, java.util.Iterator, dk.netarkivet.common.CommonSettings, dk.netarkivet.common.utils.Settings, @@ -66,12 +66,14 @@ HarvestDefinitionDAO hddao = HarvestDefinitionDAO.getInstance(); -List result = hddao.getListOfDomainsOfHarvestDefinition(harvestName); -domainCount += result.size(); +List domainList = hddao.getListOfDomainsOfHarvestDefinition(harvestName); +domainCount = domainList.size(); +Map> seedsMap = new HashMap>(); -for (String domainname : result) { +for (String domainname : domainList) { List seeds = hddao.getListOfSeedsOfDomainOfHarvestDefinition( harvestName, domainname); + seedsMap.put(domainname, seeds); seedCount += seeds.size(); } %> @@ -82,7 +84,7 @@ startPage="1"; } - long totalResultsCount = result.size(); + long totalResultsCount = domainList.size(); long pageSize = Long.parseLong(Settings.get( CommonSettings.HARVEST_STATUS_DFT_PAGE_SIZE)); long actualPageSize = (pageSize == 0 ? @@ -181,14 +183,11 @@ <% -List matchingDomainsSubList=result. -subList((int)startIndex,(int)endIndex); +List matchingDomainsSubList=domainList.subList( + (int)startIndex, (int)endIndex); for (String domainname : matchingDomainsSubList) { - List seeds = hddao.getListOfSeedsOfDomainOfHarvestDefinition( - harvestName, domainname); -// seedCount += seeds.size(); - + List seeds = seedsMap.get(domainname); %>
<%=domainname%> (<%=seeds.size()%>