From c891a0b278422e07e75af495d8385600a1a2df64 Mon Sep 17 00:00:00 2001 From: szznax Date: Thu, 14 May 2009 23:55:45 +0000 Subject: [PATCH] copy to h3 --- .../archive/modules/DefaultProcessorURI.java | 2 +- .../org/archive/modules/extractor/Link.java | 2 +- .../modules/extractor/ExtractorHTMLTest.java | 22 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) 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