diff --git a/engine/src/main/java/org/archive/crawler/framework/ToePool.java b/engine/src/main/java/org/archive/crawler/framework/ToePool.java index d3cb9a01..8097337d 100644 --- a/engine/src/main/java/org/archive/crawler/framework/ToePool.java +++ b/engine/src/main/java/org/archive/crawler/framework/ToePool.java @@ -22,6 +22,7 @@ package org.archive.crawler.framework; import java.io.PrintWriter; import java.util.Iterator; import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.Map; import java.util.Map.Entry; import java.util.TreeSet; @@ -259,8 +260,18 @@ public class ToePool extends ThreadGroup implements Reporter { Map data = new LinkedHashMap(); data.put("toeCount", getToeCount()); - data.put("steps", steps.getSortedByCounts()); - data.put("processors", processors.getSortedByCounts()); + + LinkedList unwound = new LinkedList(); + for (Entry step: steps.getSortedByCounts()) { + unwound.add(step.getValue() + " " + step.getKey()); + } + data.put("steps", unwound); + + unwound = new LinkedList(); + for (Entry proc: processors.getSortedByCounts()) { + unwound.add(proc.getValue() + " " + proc.getKey()); + } + data.put("processors", unwound); return data; } diff --git a/engine/src/main/resources/org/archive/crawler/restlet/Job.ftl b/engine/src/main/resources/org/archive/crawler/restlet/Job.ftl index d5c3095c..63be2bd1 100644 --- a/engine/src/main/resources/org/archive/crawler/restlet/Job.ftl +++ b/engine/src/main/resources/org/archive/crawler/restlet/Job.ftl @@ -128,8 +128,8 @@ <#if !job.threadReport??>n/a <#else> ${job.threadReport.toeCount} threads: - <#list job.threadReport.steps as step>${step.value} ${step.key}<#if step_has_next>, ; - <#list job.threadReport.processors as proc>${proc.value} ${proc.key}<#if proc_has_next>, + <#list job.threadReport.steps as step>${step}<#if step_has_next>, ; + <#list job.threadReport.processors as proc>${proc}<#if proc_has_next>,
Frontier