diff --git a/modules/src/main/java/org/archive/modules/DefaultProcessorURI.java b/modules/src/main/java/org/archive/modules/DefaultProcessorURI.java
index 3f4f878a..a50efbd9 100644
--- a/modules/src/main/java/org/archive/modules/DefaultProcessorURI.java
+++ b/modules/src/main/java/org/archive/modules/DefaultProcessorURI.java
@@ -125,7 +125,7 @@ implements ProcessorURI {
}
public UURI getBaseURI() {
- return base;
+ return base != null ? base : getUURI();
}
public long getContentLength() {
diff --git a/modules/src/main/java/org/archive/modules/extractor/Link.java b/modules/src/main/java/org/archive/modules/extractor/Link.java
index 7a8e1101..3affdfe0 100644
--- a/modules/src/main/java/org/archive/modules/extractor/Link.java
+++ b/modules/src/main/java/org/archive/modules/extractor/Link.java
@@ -132,7 +132,7 @@ public class Link implements Serializable {
public static void addRelativeToBase(ProcessorURI uri, int max,
String newUri, LinkContext context, Hop hop) throws URIException {
- UURI dest = UURIFactory.getInstance(uri.getUURI(), newUri);
+ UURI dest = UURIFactory.getInstance(uri.getBaseURI(), newUri);
add2(uri, max, dest, context, hop);
}
diff --git a/modules/src/test/java/org/archive/modules/extractor/ExtractorHTMLTest.java b/modules/src/test/java/org/archive/modules/extractor/ExtractorHTMLTest.java
index 66fa8ab9..c19f88af 100644
--- a/modules/src/test/java/org/archive/modules/extractor/ExtractorHTMLTest.java
+++ b/modules/src/test/java/org/archive/modules/extractor/ExtractorHTMLTest.java
@@ -271,6 +271,7 @@ public class ExtractorHTMLTest extends StringExtractorTestBase {
}));
}
+
/**
* test to see if embedded which writes script TYPE
* creates any outlinks, e.g. "type='text/javascript'".
@@ -296,4 +297,25 @@ public class ExtractorHTMLTest extends StringExtractorTestBase {
assertTrue("outlinks should be empty",curi.getOutLinks().isEmpty());
}
+
+ public void testOutLinksWithBaseHref() throws URIException {
+ DefaultProcessorURI puri = new DefaultProcessorURI(UURIFactory
+ .getInstance("http://www.example.com/abc/index.html"),null);
+ puri.setBaseURI(puri.getUURI());
+ CharSequence cs =
+ "" +
+ "" +
+ "";
+ ExtractorHTML extractor = (ExtractorHTML)makeExtractor();
+ extractor.extract(puri, cs);
+ Link[] links = puri.getOutLinks().toArray(new Link[0]);
+ String dest1 = "http://www.example.com/def/another1.html";
+ String dest2 = "http://www.example.com/ghi/another2.html";
+ // ensure outlink from base href
+ assertEquals("outlink1 from base href",dest1,
+ links[1].getDestination().toString());
+ assertEquals("outlink2 from base href",dest2,
+ links[2].getDestination().toString());
+ }
+
}