From 5027fb9aa0204de9ce72f0847fe1de470c3567e2 Mon Sep 17 00:00:00 2001 From: gojomo Date: Tue, 28 Jul 2009 22:47:01 +0000 Subject: [PATCH] * AbstractFrontier.java, WrokQueueFrontier.java remove outdated comments; use isEmpty() --- .../java/org/archive/crawler/frontier/AbstractFrontier.java | 6 +++--- .../org/archive/crawler/frontier/WorkQueueFrontier.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java b/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java index ac3ff46f..8ac1acb9 100644 --- a/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java +++ b/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java @@ -58,6 +58,7 @@ import java.util.logging.Logger; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.URIException; +import org.apache.commons.lang.StringUtils; import org.archive.checkpointing.CheckpointRecovery; import org.archive.crawler.datamodel.CrawlURI; import org.archive.crawler.datamodel.SchedulingConstants; @@ -1440,9 +1441,8 @@ public abstract class AbstractFrontier assert KeyedProperties.overridesActiveFrom(curi); String queueKey = getForceQueueAssignment(); - if ("".equals(queueKey)) { - // Typical case, barring overrides - //TODO:SPRINGY set overrides based on cauri? + if (StringUtils.isEmpty(queueKey)) { + // Typical case, barring explicit override queueKey = getQueueAssignmentPolicy().getClassKey(curi); } return queueKey; diff --git a/engine/src/main/java/org/archive/crawler/frontier/WorkQueueFrontier.java b/engine/src/main/java/org/archive/crawler/frontier/WorkQueueFrontier.java index bbe1d910..826b0ad1 100644 --- a/engine/src/main/java/org/archive/crawler/frontier/WorkQueueFrontier.java +++ b/engine/src/main/java/org/archive/crawler/frontier/WorkQueueFrontier.java @@ -377,8 +377,7 @@ ApplicationContextAware { super.prepForFrontier(caUri); // force cost to be calculated, pre-insert getCost(caUri); - // set - // TODO:SPRINGY set overrides by curi? + // set precedence value getUriPrecedencePolicy().uriScheduled(caUri); }