From dcbbec4bbb5c20b426ed40a1ebba412da44375f9 Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Fri, 29 Mar 2013 12:16:07 -0700
Subject: [PATCH] fix for HER-2035 xml representation of job url can be invalid

---
 .../org/archive/crawler/framework/ToePool.java    | 15 +++++++++++++--
 .../resources/org/archive/crawler/restlet/Job.ftl |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

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<String,Object> data = new LinkedHashMap<String, Object>();
 
         data.put("toeCount", getToeCount());
-        data.put("steps", steps.getSortedByCounts());
-        data.put("processors", processors.getSortedByCounts());
+        
+        LinkedList<String> unwound = new LinkedList<String>(); 
+        for (Entry<?, Long> step: steps.getSortedByCounts()) {
+            unwound.add(step.getValue() + " " + step.getKey());
+        }
+        data.put("steps", unwound);
+
+        unwound = new LinkedList<String>(); 
+        for (Entry<?, Long> 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??><i>n/a</i>
 				<#else>
 				${job.threadReport.toeCount} threads: 
-				<#list job.threadReport.steps as step>${step.value} ${step.key}<#if step_has_next>, </#if></#list>;
-				<#list job.threadReport.processors as proc>${proc.value} ${proc.key}<#if proc_has_next>, </#if></#list>
+				<#list job.threadReport.steps as step>${step}<#if step_has_next>, </#if></#list>;
+				<#list job.threadReport.processors as proc>${proc}<#if proc_has_next>, </#if></#list>
 				</#if>
 			</dd>
 			<dt><a href="report/FrontierSummaryReport">Frontier</a></dt>