From 13e1f9d64deff3faa8d68db7cffac27c0ae9597c Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Thu, 15 Nov 2012 14:01:01 -0800 Subject: [PATCH] * ExtractorMultipleRegex.java fix omission from last commit, uriRegex --- .../modules/extractor/ExtractorMultipleRegex.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/src/main/java/org/archive/modules/extractor/ExtractorMultipleRegex.java b/modules/src/main/java/org/archive/modules/extractor/ExtractorMultipleRegex.java index 3ed0c7c5..f05a911f 100644 --- a/modules/src/main/java/org/archive/modules/extractor/ExtractorMultipleRegex.java +++ b/modules/src/main/java/org/archive/modules/extractor/ExtractorMultipleRegex.java @@ -93,6 +93,11 @@ public class ExtractorMultipleRegex extends Extractor { add(new GroupList(matcher.toMatchResult())); } } + public MatchList(GroupList... groupList) { + for (GroupList x: groupList) { + add(x); + } + } }; protected class GroupList extends LinkedList { private static final long serialVersionUID = 1L; @@ -111,8 +116,8 @@ public class ExtractorMultipleRegex extends Extractor { // uri regex Matcher matcher = TextUtils.getMatcher(getUriRegex(), curi.getURI()); if (matcher.matches()) { - matchLists = new LinkedHashMap(); - // XXX matchLists.put("uriRegex", ); + matchLists = new LinkedHashMap(); + matchLists.put("uriRegex", new MatchList(new GroupList(matcher))); } else { return; // if uri regex doesn't match, we're done }