You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2016/11/19 13:44:49 UTC
marmotta git commit: fix KiWiLoader for negative (BC) dates
Repository: marmotta
Updated Branches:
refs/heads/develop 8c130aef7 -> 08e6f79d5
fix KiWiLoader for negative (BC) dates
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/08e6f79d
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/08e6f79d
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/08e6f79d
Branch: refs/heads/develop
Commit: 08e6f79d595a3ce22d95e612825bfcbc3f9c6686
Parents: 8c130ae
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Sat Nov 19 14:44:41 2016 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Sat Nov 19 14:44:41 2016 +0100
----------------------------------------------------------------------
.../apache/marmotta/kiwi/loader/csv/SQLDateTimeProcessor.java | 6 +++++-
.../java/org/apache/marmotta/kiwi/loader/pgsql/PGCopyUtil.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/08e6f79d/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLDateTimeProcessor.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLDateTimeProcessor.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLDateTimeProcessor.java
index 93878a9..1ff2f5e 100644
--- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLDateTimeProcessor.java
+++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLDateTimeProcessor.java
@@ -46,6 +46,10 @@ public class SQLDateTimeProcessor extends CellProcessorAdaptor implements DateCe
throw new SuperCsvCellProcessorException(DateTime.class, value, context, this);
}
- return ISODateTimeFormat.dateTime().withZoneUTC().print((DateTime)value);
+ String r = ISODateTimeFormat.dateTime().withZoneUTC().print((DateTime)value);
+ if (r.startsWith("-")) {
+ return r.substring(1) + " BC";
+ }
+ return r;
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/08e6f79d/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 a749509..8569483 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
@@ -58,7 +58,7 @@ public class PGCopyUtil {
new NotNull(), // svalue
new Optional(), // dvalue
new Optional(), // ivalue
- new SQLDateTimeProcessor(), // tvalue
+ new SQLDateTimeProcessor(), // tvalue
new Optional(), // tzoffset
new Optional(new SQLBooleanProcessor()), // bvalue
new Optional(new NodeIDProcessor()), // ltype