lee/heritrix3
1
0
Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-09-26 07:35:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fetchhttp-hc

Browse Source
This commit is contained in:
Noah Levitt
2012-09-04 17:54:03 -07:00
parent baaf4f8092 b704f4eeb7
commit cd0c169a4d
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/src/main/java/org/archive/modules/CrawlURI.java
+6 -5
View File
@@ -68,6 +68,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -647,12 +648,12 @@ implements Reporter, Serializable, OverlayContext {
*/
public Collection<String> getAnnotations() {
@SuppressWarnings("unchecked")
List<String> list = (List<String>)getData().get(A_ANNOTATIONS);
if (list == null) {
list = new ArrayList<String>();
getData().put(A_ANNOTATIONS, list);
Collection<String> annotations = (Collection<String>)getData().get(A_ANNOTATIONS);
if (annotations == null) {
annotations = new LinkedHashSet<String>();
getData().put(A_ANNOTATIONS, annotations);
}
return list;
return annotations;
}
/**
modules/src/main/java/org/archive/modules/extractor/Link.java
+7 -6
View File
@@ -133,19 +133,20 @@ public class Link implements Serializable, Comparable<Link> {
}
public static void addRelativeToVia(CrawlURI uri, int max,
String newUri, LinkContext context, Hop hop) throws URIException {
public static void addRelativeToVia(CrawlURI uri, int max, String newUri,
LinkContext context, Hop hop) throws URIException {
UURI relTo = uri.getVia();
if(relTo==null) {
LOGGER.info("no via where expected; using base instead: "+uri);
uri.getAnnotations().add("usedBaseForVia");
if (relTo == null) {
if (!uri.getAnnotations().contains("usedBaseForVia")) {
LOGGER.info("no via where expected; using base instead: " + uri);
uri.getAnnotations().add("usedBaseForVia");
}
relTo = uri.getBaseURI();
}
UURI dest = UURIFactory.getInstance(relTo, newUri);
add2(uri, max, dest, context, hop);
}
public static void add(CrawlURI uri, int max, String newUri,
LinkContext context, Hop hop) throws URIException {
UURI dest = UURIFactory.getInstance(newUri);