From 4dd46e6af89a1de47540b47a7ff3f9f72dfc3695 Mon Sep 17 00:00:00 2001 From: Kenji Nagahashi Date: Mon, 1 Apr 2013 23:45:22 -0700 Subject: [PATCH] quick fix to ClassCastException in ToePool.shortReportLineTo(). fixed a typo in Job.ftl. --- .../archive/crawler/framework/ToePool.java | 48 ++++++++++--------- .../org/archive/crawler/restlet/Job.ftl | 2 +- 2 files changed, 26 insertions(+), 24 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 8097337d..808553f4 100644 --- a/engine/src/main/java/org/archive/crawler/framework/ToePool.java +++ b/engine/src/main/java/org/archive/crawler/framework/ToePool.java @@ -283,30 +283,32 @@ public class ToePool extends ThreadGroup implements Reporter { w.print(map.get("toeCount")); w.print(" threads: "); - TreeSet> sortedSteps = (TreeSet>) map.get("steps"); - if(sortedSteps.size()==0) { - return; + LinkedList sortedSteps = (LinkedList)map.get("steps"); + { + Iterator iter = sortedSteps.iterator(); + if (!iter.hasNext()) { + return; + } + w.print(iter.next()); + if (iter.hasNext()) { + w.print(", "); + w.print(iter.next()); + if (iter.hasNext()) { + w.print(", etc..."); + } + } + w.print("; "); } - w.print(Histotable.entryString(sortedSteps.first())); - if(sortedSteps.size()>1) { - Iterator> iter = sortedSteps.iterator(); - iter.next(); - w.print(", "); - w.print(Histotable.entryString(iter.next())); - } - if(sortedSteps.size()>2) { - w.print(", etc..."); - } - w.print("; "); - TreeSet> sortedProcessors = (TreeSet>) map.get("processors"); - w.print(Histotable.entryString(sortedProcessors.first())); - if(sortedProcessors.size()>1) { - Iterator> iter = sortedProcessors.iterator(); - iter.next(); - while(iter.hasNext()) { - w.print(", "); - w.print(Histotable.entryString(iter.next())); - } + LinkedList sortedProcesses = (LinkedList)map.get("processors"); + { + Iterator iter = sortedProcesses.iterator(); + if (iter.hasNext()) { + w.print(iter.next()); + while (iter.hasNext()) { + w.print(", "); + w.print(iter.next()); + } + } } } 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 63be2bd1..3ca34f60 100644 --- a/engine/src/main/resources/org/archive/crawler/restlet/Job.ftl +++ b/engine/src/main/resources/org/archive/crawler/restlet/Job.ftl @@ -164,7 +164,7 @@ ${line?html}

Files

-

Browser Job Directory

+

Browse Job Directory

Configuration-referenced Paths

<#assign configRefPaths=job.configFiles! /> <#if !configRefPaths?has_content >