Repository: any23 Updated Branches: refs/heads/master d82e0e501 -> b7693a5eb
Minor refactor of MicrodataExtractor Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/b7693a5e Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/b7693a5e Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/b7693a5e Branch: refs/heads/master Commit: b7693a5eb12bbd9331265d216804bff10d717c86 Parents: d82e0e5 Author: Hans <[email protected]> Authored: Thu Apr 5 20:27:01 2018 -0500 Committer: Hans <[email protected]> Committed: Thu Apr 5 20:41:25 2018 -0500 ---------------------------------------------------------------------- .../any23/extractor/microdata/MicrodataExtractor.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/b7693a5e/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java b/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java index 42d9133..358a0f9 100644 --- a/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java +++ b/core/src/main/java/org/apache/any23/extractor/microdata/MicrodataExtractor.java @@ -438,12 +438,9 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor { ) throws ExtractionException { Resource subject = mappings.computeIfAbsent(itemScope, scope -> createSubjectForItemId(scope.getItemId())); - // ItemScope.type could be null, but surely it's a valid URL - IRI itemScopeType = null; - if (itemScope.getType() != null) { - String itemType = itemScope.getType().toString(); - out.writeTriple(subject, RDF.TYPE, RDFUtils.iri(itemType)); - itemScopeType = RDFUtils.iri(itemScope.getType().toString()); + IRI itemScopeType = getType(itemScope); + if (itemScopeType != null) { + out.writeTriple(subject, RDF.TYPE, itemScopeType); } for (String propName : itemScope.getProperties().keySet()) { List<ItemProp> itemProps = itemScope.getProperties().get(propName); @@ -469,6 +466,11 @@ public class MicrodataExtractor implements Extractor.TagSoupDOMExtractor { return subject; } + private static IRI getType(ItemScope scope) { + URL type = scope.getType(); + return type == null ? null : RDFUtils.iri(type.toString()); + } + private static Resource createSubjectForItemId(String itemId) { if (itemId != null) { try {
