Repository: any23 Updated Branches: refs/heads/master c0db95e7c -> 53e9cdd69
ANY23-334 fixed: default language was a UUID Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/53e9cdd6 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/53e9cdd6 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/53e9cdd6 Branch: refs/heads/master Commit: 53e9cdd69632c1b73fb4a1eb3348352a5e241b82 Parents: c0db95e Author: Hans <[email protected]> Authored: Fri Apr 13 11:47:03 2018 -0500 Committer: Hans <[email protected]> Committed: Fri Apr 13 11:47:03 2018 -0500 ---------------------------------------------------------------------- .../extractor/SingleDocumentExtraction.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/53e9cdd6/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtraction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtraction.java b/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtraction.java index 9cee7a4..028b518 100644 --- a/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtraction.java +++ b/core/src/main/java/org/apache/any23/extractor/SingleDocumentExtraction.java @@ -250,8 +250,9 @@ public class SingleDocumentExtraction { try { output.setContentLength(in.getContentLength()); // Create the document context. + final String documentLanguage; try { - final String documentLanguage = extractDocumentLanguage(extractionParameters); + documentLanguage = extractDocumentLanguage(extractionParameters); for (ExtractorFactory<?> factory : matchingExtractors) { @SuppressWarnings("rawtypes") final Extractor extractor = factory.createExtractor(); @@ -273,9 +274,9 @@ public class SingleDocumentExtraction { final ExtractionContext consolidationContext; if(extractionParameters.getFlag(ExtractionParameters.METADATA_NESTING_FLAG)) { // Consolidation with nesting. - consolidationContext = consolidateResources(resourceRoots, propertyPaths, addDomainTriples, output); + consolidationContext = consolidateResources(resourceRoots, propertyPaths, addDomainTriples, output, documentLanguage); } else { - consolidationContext = consolidateResources(resourceRoots, addDomainTriples, output); + consolidationContext = consolidateResources(resourceRoots, addDomainTriples, output, documentLanguage); } // Adding time/size meta triples. @@ -645,10 +646,11 @@ public class SingleDocumentExtraction { /** * @return an extraction context specific for consolidation triples. */ - private ExtractionContext createExtractionContext() { + private ExtractionContext createExtractionContext(String defaultLanguage) { return new ExtractionContext( "consolidation-extractor", documentIRI, + defaultLanguage, UUID.randomUUID().toString() ); } @@ -712,9 +714,10 @@ public class SingleDocumentExtraction { List<ResourceRoot> resourceRoots, List<PropertyPath> propertyPaths, boolean addDomainTriples, - TripleHandler output + TripleHandler output, + String defaultLanguage ) throws ExtractionException { - final ExtractionContext context = createExtractionContext(); + final ExtractionContext context = createExtractionContext(defaultLanguage); try { output.openContext(context); @@ -760,9 +763,10 @@ public class SingleDocumentExtraction { private ExtractionContext consolidateResources( List<ResourceRoot> resourceRoots, boolean addDomainTriples, - TripleHandler output + TripleHandler output, + String defaultLanguage ) throws ExtractionException { - final ExtractionContext context = createExtractionContext(); + final ExtractionContext context = createExtractionContext(defaultLanguage); try { output.openContext(context);
