diff --git a/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js b/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js index f9a1ebc8b..66f995dd5 100644 --- a/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js +++ b/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js @@ -834,7 +834,7 @@ SchemaAlignmentDialog._initField = function(inputContainer, mode, initialValue, fixSuggestInput(input); } else if (mode === "time") { - input.attr("placeholder", "YYYY(-MM(-DD))..."); + input.attr("placeholder", "YYYY(-MM(-DD))"); var propagateValue = function(val) { // TODO add validation here inputContainer.data("jsonValue", { @@ -848,7 +848,7 @@ SchemaAlignmentDialog._initField = function(inputContainer, mode, initialValue, changedCallback(); }); - SchemaAlignmentDialog.setupStringInputValidation(input, /^\d{4}(-[0-1]\d(-[0-3]\d(T[0-2]\d(:[0-5]\d(:[0-5]\dZ)?)?)?)?)?$/); + SchemaAlignmentDialog.setupStringInputValidation(input, /^\d{4}(-[0-1]\d(-[0-3]\d)?)?$/); } else if (mode === "globe-coordinate") { input.attr("placeholder", "lat,lon"); var propagateValue = function(val) { diff --git a/extensions/wikidata/src/org/openrefine/wikidata/schema/WbDateConstant.java b/extensions/wikidata/src/org/openrefine/wikidata/schema/WbDateConstant.java index a6b297601..8c7909bad 100644 --- a/extensions/wikidata/src/org/openrefine/wikidata/schema/WbDateConstant.java +++ b/extensions/wikidata/src/org/openrefine/wikidata/schema/WbDateConstant.java @@ -60,10 +60,7 @@ public class WbDateConstant implements WbExpression { .put(new SimpleDateFormat("yyyy"), 9) .put(new SimpleDateFormat("yyyy-MM"), 10) .put(new SimpleDateFormat("yyyy-MM-dd"), 11) - .put(new SimpleDateFormat("yyyy-MM-dd'T'HH"), 12) - .put(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm"), 13) - .put(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'"), 13) - .put(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"), 14).build(); + .build(); private TimeValue parsed; private String origDatestamp; @@ -100,25 +97,29 @@ public class WbDateConstant implements WbExpression { */ public static TimeValue parse(String datestamp) throws ParseException { - Date date = null; - int precision = 9; // default precision (will be overridden) + Date bestDate = null; + int precision = 0; // default precision (will be overridden if successfully parsed) + int maxLength = 0; // the maximum length parsed for (Entry entry : acceptedFormats.entrySet()) { ParsePosition position = new ParsePosition(0); String trimmedDatestamp = datestamp.trim(); - date = entry.getKey().parse(trimmedDatestamp, position); + Date date = entry.getKey().parse(trimmedDatestamp, position); // Ignore parses which failed or do not consume all the input - if (date != null && position.getIndex() == trimmedDatestamp.length()) { + if (date != null && position.getIndex() > maxLength + // only allow to partially consume the input if the precision is more than a year + && (entry.getValue() > 9 || position.getIndex() == trimmedDatestamp.length())) { precision = entry.getValue(); - break; + bestDate = date; + maxLength = position.getIndex(); } } - if (date == null) { + if (bestDate == null || precision == 0) { throw new ParseException("Invalid date.", 0); } else { Calendar calendar = Calendar.getInstance(); calendar = Calendar.getInstance(); - calendar.setTime(date); + calendar.setTime(bestDate); return Datamodel.makeTimeValue(calendar.get(Calendar.YEAR), (byte) (calendar.get(Calendar.MONTH) + 1), (byte) calendar.get(Calendar.DAY_OF_MONTH), (byte) calendar.get(Calendar.HOUR_OF_DAY), (byte) calendar.get(Calendar.MINUTE), (byte) calendar.get(Calendar.SECOND), (byte) precision, 0, 0, diff --git a/extensions/wikidata/src/org/openrefine/wikidata/schema/WbDateVariable.java b/extensions/wikidata/src/org/openrefine/wikidata/schema/WbDateVariable.java index 355bbd99c..8de86d7ad 100644 --- a/extensions/wikidata/src/org/openrefine/wikidata/schema/WbDateVariable.java +++ b/extensions/wikidata/src/org/openrefine/wikidata/schema/WbDateVariable.java @@ -54,7 +54,7 @@ public class WbDateVariable extends WbVariableExpr { public TimeValue fromCell(Cell cell, ExpressionContext ctxt) throws SkipSchemaExpressionException { try { - // TODO accept parsed dates (without converting them to strings) + // parsed dates are accepted by converting them to strings return WbDateConstant.parse(cell.value.toString()); } catch (ParseException e) { if(!cell.value.toString().isEmpty()) { diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateConstantTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateConstantTest.java index d7d31c92b..d7d777034 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateConstantTest.java +++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateConstantTest.java @@ -37,7 +37,8 @@ public class WbDateConstantTest extends WbExpressionTest { private WbDateConstant month = new WbDateConstant("2018-02"); private WbDateConstant day = new WbDateConstant("2018-02-27"); private WbDateConstant whitespace = new WbDateConstant(" 2018-02-27 "); - private WbDateConstant hour = new WbDateConstant("2018-02-27T13"); + private WbDateConstant second = new WbDateConstant("2017-01-03T04:12:45"); + private WbDateConstant secondz = new WbDateConstant("2017-01-03T04:12:45Z"); @Test public void testSerialize() { @@ -62,8 +63,10 @@ public class WbDateConstantTest extends WbExpressionTest { TimeValue.CM_GREGORIAN_PRO), month); evaluatesTo(Datamodel.makeTimeValue(2018, (byte) 2, (byte) 27, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO), day); - evaluatesTo(Datamodel.makeTimeValue(2018, (byte) 2, (byte) 27, (byte) 13, (byte) 0, (byte) 0, (byte) 12, 0, 0, - 0, TimeValue.CM_GREGORIAN_PRO), hour); + evaluatesTo(Datamodel.makeTimeValue(2017, (byte) 1, (byte) 3, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0, + TimeValue.CM_GREGORIAN_PRO), second); + evaluatesTo(Datamodel.makeTimeValue(2017, (byte) 1, (byte) 3, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0, + TimeValue.CM_GREGORIAN_PRO), secondz); evaluatesTo(Datamodel.makeTimeValue(2018, (byte) 2, (byte) 27, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO), whitespace); diff --git a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateVariableTest.java b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateVariableTest.java index 9238624ee..2150afc1e 100644 --- a/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateVariableTest.java +++ b/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateVariableTest.java @@ -36,7 +36,7 @@ public class WbDateVariableTest extends WbVariableTest { 0, 0, 0, TimeValue.CM_GREGORIAN_PRO); private TimeValue day = Datamodel.makeTimeValue(2018, (byte) 2, (byte) 27, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO); - private TimeValue minute = Datamodel.makeTimeValue(2001, (byte) 2, (byte) 3, (byte)4, (byte)5, (byte)0, (byte)13, (byte)0, (byte)0, (byte)0, TimeValue.CM_GREGORIAN_PRO); + private TimeValue minute = Datamodel.makeTimeValue(2001, (byte) 2, (byte) 3, (byte)0, (byte)0, (byte)0, (byte)11, (byte)0, (byte)0, (byte)0, TimeValue.CM_GREGORIAN_PRO); @Override @@ -71,6 +71,7 @@ public class WbDateVariableTest extends WbVariableTest { @Test public void testMinutesISO() { + // Wikidata currently only supports up to day precision evaluatesTo(minute, "2001-02-03T04:05Z"); }