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 2014/11/10 19:27:20 UTC
marmotta git commit: KiWi: - fix loader for date literals
(MARMOTTA-565)
Repository: marmotta
Updated Branches:
refs/heads/develop 20c6dca47 -> a10c6efc8
KiWi:
- fix loader for date literals (MARMOTTA-565)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/a10c6efc
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/a10c6efc
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/a10c6efc
Branch: refs/heads/develop
Commit: a10c6efc81ea76f762f2c7ce9cac8f4902469cd5
Parents: 20c6dca
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Nov 10 19:27:59 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Nov 10 19:27:59 2014 +0100
----------------------------------------------------------------------
.../marmotta/kiwi/loader/csv/SQLTimestampProcessor.java | 12 +++++-------
.../marmotta/kiwi/loader/mysql/MySQLLoadUtil.java | 5 +++--
.../apache/marmotta/kiwi/loader/pgsql/PGCopyUtil.java | 5 +++--
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a10c6efc/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLTimestampProcessor.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLTimestampProcessor.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLTimestampProcessor.java
index 531dca9..d1ed046 100644
--- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLTimestampProcessor.java
+++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/csv/SQLTimestampProcessor.java
@@ -16,14 +16,13 @@
*/
package org.apache.marmotta.kiwi.loader.csv;
+import org.joda.time.DateTime;
+import org.joda.time.format.ISODateTimeFormat;
import org.supercsv.cellprocessor.CellProcessorAdaptor;
import org.supercsv.cellprocessor.ift.DateCellProcessor;
import org.supercsv.exception.SuperCsvCellProcessorException;
import org.supercsv.util.CsvContext;
-import java.sql.Timestamp;
-import java.util.Date;
-
/**
* Add file description here!
*
@@ -42,11 +41,10 @@ public class SQLTimestampProcessor extends CellProcessorAdaptor implements DateC
return null;
}
- if( !(value instanceof Date) ) {
- throw new SuperCsvCellProcessorException(Date.class, value, context, this);
+ if( !(value instanceof DateTime) ) {
+ throw new SuperCsvCellProcessorException(DateTime.class, value, context, this);
}
- Timestamp date = new Timestamp(((Date)value).getTime());
- return date.toString();
+ return ISODateTimeFormat.dateTime().withZoneUTC().print((DateTime)value);
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a10c6efc/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/mysql/MySQLLoadUtil.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/mysql/MySQLLoadUtil.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/mysql/MySQLLoadUtil.java
index 85d1343..01b388f 100644
--- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/mysql/MySQLLoadUtil.java
+++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/mysql/MySQLLoadUtil.java
@@ -21,6 +21,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.marmotta.kiwi.loader.csv.*;
import org.apache.marmotta.kiwi.model.rdf.*;
+import org.joda.time.DateTime;
import org.openrdf.model.URI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -150,7 +151,7 @@ public class MySQLLoadUtil {
createNodeList(rowArray, l.getId(), l.getClass(), l.getContent(), null, null, null, null, l.booleanValue(), l.getDatatype(), l.getLocale(), l.getCreated());
} else if(n instanceof KiWiDateLiteral) {
KiWiDateLiteral l = (KiWiDateLiteral)n;
- createNodeList(rowArray, l.getId(), l.getClass(), l.getContent(), null, null, l.getDateContent().toDate(), l.getDateContent().getZone().getOffset(l.getDateContent()), null, l.getDatatype(), l.getLocale(), l.getCreated());
+ createNodeList(rowArray, l.getId(), l.getClass(), l.getContent(), null, null, l.getDateContent(), l.getDateContent().getZone().getOffset(l.getDateContent()), null, l.getDatatype(), l.getLocale(), l.getCreated());
} else if(n instanceof KiWiStringLiteral) {
KiWiStringLiteral l = (KiWiStringLiteral)n;
@@ -176,7 +177,7 @@ public class MySQLLoadUtil {
return IOUtils.toInputStream(out.toString());
}
- private static void createNodeList(Object[] a, Long id, Class type, String content, Double dbl, Long lng, Date date, Integer tzoffset, Boolean bool, URI dtype, Locale lang, Date created) {
+ private static void createNodeList(Object[] a, Long id, Class type, String content, Double dbl, Long lng, DateTime date, Integer tzoffset, Boolean bool, URI dtype, Locale lang, Date created) {
a[0] = id;
a[1] = type;
a[2] = content;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a10c6efc/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 3a38196..cd2495c 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
@@ -19,6 +19,7 @@ package org.apache.marmotta.kiwi.loader.pgsql;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.marmotta.kiwi.loader.csv.*;
import org.apache.marmotta.kiwi.model.rdf.*;
+import org.joda.time.DateTime;
import org.openrdf.model.URI;
import org.postgresql.PGConnection;
import org.slf4j.Logger;
@@ -161,7 +162,7 @@ public class PGCopyUtil {
createNodeList(rowArray, l.getId(), l.getClass(), l.getContent(), null, null, null, null, l.booleanValue(), l.getDatatype(), l.getLocale(), l.getCreated());
} else if(n instanceof KiWiDateLiteral) {
KiWiDateLiteral l = (KiWiDateLiteral)n;
- createNodeList(rowArray, l.getId(), l.getClass(), l.getContent(), null, null, l.getDateContent().toDate(), l.getDateContent().getZone().getOffset(l.getDateContent()), null, l.getDatatype(), l.getLocale(), l.getCreated());
+ createNodeList(rowArray, l.getId(), l.getClass(), l.getContent(), null, null, l.getDateContent(), l.getDateContent().getZone().getOffset(l.getDateContent()), null, l.getDatatype(), l.getLocale(), l.getCreated());
} else if(n instanceof KiWiStringLiteral) {
KiWiStringLiteral l = (KiWiStringLiteral)n;
@@ -185,7 +186,7 @@ public class PGCopyUtil {
writer.close();
}
- private static void createNodeList(Object[] a, Long id, Class type, String content, Double dbl, Long lng, Date date, Integer tzoffset, Boolean bool, URI dtype, Locale lang, Date created) {
+ private static void createNodeList(Object[] a, Long id, Class type, String content, Double dbl, Long lng, DateTime date, Integer tzoffset, Boolean bool, URI dtype, Locale lang, Date created) {
a[0] = id;
a[1] = type;
a[2] = content;