diff --git a/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/Translations.properties b/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/Translations.properties index 02abec2d5c..33731bd78e 100644 --- a/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/Translations.properties +++ b/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/Translations.properties @@ -732,3 +732,4 @@ running.jobs.monitor.no.hosts.disable = No hosts disabled. configure = Configure ## H3 labels pagetitle;h3.remote.access = H3 Remote Access +table.running.jobs.inseedlist=In seedlist (y/n) diff --git a/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/Translations_da.properties b/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/Translations_da.properties index f752009e47..0eee762df1 100644 --- a/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/Translations_da.properties +++ b/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/Translations_da.properties @@ -703,3 +703,4 @@ harvestdefinition.templates.show.inactive=Vis Inaktiv harvestdefinition.templates.default.template=Default Skabelon ## H3 labels pagetitle;h3.remote.access = H3 Fjernadgang +table.running.jobs.inseedlist=I seedlisten (j/n) diff --git a/harvester/history-gui/src/main/webapp/Harveststatus-running.jsp b/harvester/history-gui/src/main/webapp/Harveststatus-running.jsp index a891dc65a1..9374e3be9d 100644 --- a/harvester/history-gui/src/main/webapp/Harveststatus-running.jsp +++ b/harvester/history-gui/src/main/webapp/Harveststatus-running.jsp @@ -28,27 +28,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA This page displays a list of running jobs. --%> +<%-- TODO .getHost on the java.net.URL below? --%> <%@page import="dk.netarkivet.harvester.harvesting.monitor.HarvestMonitor"%> <%@ page import=" - java.util.Date, + java.net.URL, java.util.List, - java.util.Set, java.util.Map, - java.util.TreeMap, java.util.Collections, - java.text.SimpleDateFormat, dk.netarkivet.common.utils.I18n, dk.netarkivet.common.webinterface.HTMLUtils, - dk.netarkivet.common.webinterface.SiteSection, dk.netarkivet.harvester.harvesting.monitor.StartedJobInfo, dk.netarkivet.harvester.datamodel.RunningJobsInfoDAO, + dk.netarkivet.harvester.datamodel.Job, dk.netarkivet.harvester.webinterface.Constants, dk.netarkivet.harvester.webinterface.FindRunningJobQuery, dk.netarkivet.common.utils.StringUtils, dk.netarkivet.common.utils.TableSort, dk.netarkivet.harvester.webinterface.HarvestStatusRunningTablesSort" pageEncoding="UTF-8"%> +<%@ page import="dk.netarkivet.harvester.datamodel.JobDAO" %> +<%@ page import="javax.inject.Provider" %> +<%@ page import="com.sun.tools.corba.se.idl.toJavaPortable.StringGen" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> @@ -59,10 +60,14 @@ This page displays a list of running jobs. dk.netarkivet.harvester.Constants.TRANSLATIONS_BUNDLE);%> <% + // TODO remove, just for testing + String allParams = request.getParameterNames().toString(); + + // HarvestStatusRunningTablesSort tbs=(HarvestStatusRunningTablesSort) session.getAttribute("TablesSortData"); - if(tbs==null){ + if (tbs==null){ tbs = new HarvestStatusRunningTablesSort(); session.setAttribute("TablesSortData",tbs); } @@ -70,7 +75,7 @@ This page displays a list of running jobs. String sortedColumn=request.getParameter(Constants.COLUMN_PARAM); String sortedHarvest=request.getParameter(Constants.HARVEST_PARAM); - if( sortedColumn != null && sortedHarvest != null) { + if (sortedColumn != null && sortedHarvest != null) { tbs.sortByHarvestName(sortedHarvest,Integer.parseInt(sortedColumn)) ; } @@ -107,6 +112,8 @@ This page displays a list of running jobs. +TODO testing here: <%=allParams%> +
@@ -164,12 +171,12 @@ This page displays a list of running jobs. String columnId; %> -  - +  +  <%=harvestName %> -  +  <% sortLink=sortBaseLink @@ -205,7 +212,7 @@ This page displays a list of running jobs. TODO urls.. - TODO in seedlist.. + @@ -256,7 +263,6 @@ This page displays a list of running jobs. <% - int rowcount = 0; //get list @@ -297,10 +303,10 @@ This page displays a list of running jobs. TableSort.SortOrder order = tbs.getSortOrderByHarvestName(harvestName); - if( order == TableSort.SortOrder.INCR){ + if (order == TableSort.SortOrder.INCR){ Collections.sort(infoList); } - if( order == TableSort.SortOrder.DESC){ + if (order == TableSort.SortOrder.DESC){ Collections.sort(infoList, Collections.reverseOrder()); } } @@ -311,6 +317,17 @@ This page displays a list of running jobs. String jobDetailsLink = "Harveststatus-running-jobdetails.jsp?" + Constants.JOB_PARAM + "=" + jobId; + // TODO Find out whether searched domain is in the seedlist for job with jobId + Job job = JobDAO.getInstance().read(jobId); + String seedList = job.getSeedListAsString(); + String linesOfSeedlist[] = seedList.split("\\r?\\n"); + + for (String seed : linesOfSeedlist) { + // TODO is _searched domain_ equal to line? + + } + + String domainIsInSeedlist = "y"; // TODO replace %> <%=jobId%> @@ -340,7 +357,6 @@ This page displays a list of running jobs. altStatus = "table.running.jobs.status.crawlFinished"; bullet = "greybullet.png"; break; - } %> <%=I18N.getString(request.getLocale(), altStatus)%> @@ -350,7 +366,7 @@ This page displays a list of running jobs. <%=StringUtils.formatPercentage(info.getProgress())%> <%=info.getElapsedTime()%> TODO.. - TODO.. + <%=domainIsInSeedlist%> <%=info.getQueuedFilesCount()%> <%=info.getTotalQueuesCount()%> <%=info.getActiveQueuesCount()%>