Repository: marmotta Updated Branches: refs/heads/develop fba6e941b -> 228ab09f8
set lang column to "" in case the language of a literal is null (compatibility with SPARQL) Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/960c4048 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/960c4048 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/960c4048 Branch: refs/heads/develop Commit: 960c40485e45ed94ae99e1d1794ecc3f4920e468 Parents: fba6e94 Author: Sebastian Schaffert <[email protected]> Authored: Thu Sep 25 12:06:27 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Thu Sep 25 12:06:27 2014 +0200 ---------------------------------------------------------------------- .../apache/marmotta/kiwi/loader/csv/LanguageProcessor.java | 8 +++----- .../org/apache/marmotta/kiwi/loader/pgsql/PGCopyUtil.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/960c4048/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/LanguageProcessor.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/LanguageProcessor.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/LanguageProcessor.java index 3933db8..54325b7 100644 --- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/LanguageProcessor.java +++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/LanguageProcessor.java @@ -21,8 +21,6 @@ import org.supercsv.cellprocessor.ift.CellProcessor; import org.supercsv.exception.SuperCsvCellProcessorException; import org.supercsv.util.CsvContext; -import java.util.Locale; - /** * Add file description here! * @@ -55,10 +53,10 @@ public class LanguageProcessor extends CellProcessorAdaptor implements CellProce public Object execute(Object value, CsvContext context) { validateInputNotNull(value, context); - if( !(value instanceof Locale) ) { - throw new SuperCsvCellProcessorException(Locale.class, value, context, this); + if( !(value instanceof String) ) { + throw new SuperCsvCellProcessorException(String.class, value, context, this); } - return ((Locale)value).getLanguage(); + return value; } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/960c4048/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/pgsql/PGCopyUtil.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/pgsql/PGCopyUtil.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/pgsql/PGCopyUtil.java index 389a0dd..31936cc 100644 --- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/pgsql/PGCopyUtil.java +++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/pgsql/PGCopyUtil.java @@ -193,7 +193,7 @@ public class PGCopyUtil { a[5] = date; a[6] = bool; a[7] = dtype; - a[8] = lang; + a[8] = lang != null ? lang.getLanguage() : ""; a[9] = created; } }
