Skip to content

Commit

Permalink
Added missing file for fix of NAS-2506
Browse files Browse the repository at this point in the history
  • Loading branch information
svcarlsen committed May 22, 2017
1 parent 17a4a25 commit 9b0ea76
Showing 1 changed file with 19 additions and 1 deletion.
Expand Up @@ -28,6 +28,7 @@
import java.util.Date;
import java.util.Iterator;
import java.util.List;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -46,6 +47,7 @@
import dk.netarkivet.harvester.datamodel.Job;
import dk.netarkivet.harvester.datamodel.PartialHarvest;
import dk.netarkivet.harvester.datamodel.Schedule;
import dk.netarkivet.harvester.datamodel.SeedList;
import dk.netarkivet.harvester.datamodel.TemplateDAO;
import dk.netarkivet.harvester.datamodel.eav.EAV;

Expand Down Expand Up @@ -183,7 +185,7 @@ public boolean canAccept(Job job, DomainConfiguration cfg, DomainConfiguration p
}
return checkSpecificAcceptConditions(job, cfg);
}

/**
* Called by {@link JobGenerator#canAccept(Job, DomainConfiguration, DomainConfiguration)}. Tests the implementation-specific conditions to accept
* the given {@link DomainConfiguration} in the given {@link Job}. It is assumed that
Expand Down Expand Up @@ -256,4 +258,20 @@ private HeritrixTemplate loadOrderXMLdoc(String orderXmlName) {
GlobalCrawlerTrapListDAO.getInstance().addGlobalCrawlerTraps(orderXMLdoc);
return orderXMLdoc;
}

@Override
public boolean ignoreConfiguration(DomainConfiguration cfg) {
boolean noValidSeeds = true;
Iterator<SeedList> lists = cfg.getSeedLists();
while (noValidSeeds && lists.hasNext() ) {
SeedList sList = lists.next();
for (String seed: sList.getSeeds()) {
if (!seed.startsWith("#")) {
return false; // At least one valid seed in config. Don't ignore this config
}
}
}
return noValidSeeds;
}

}

0 comments on commit 9b0ea76

Please sign in to comment.