From 12ed3b7435f07745175eddb297c020c3367b26d5 Mon Sep 17 00:00:00 2001 From: elkrieg Date: Mon, 7 Aug 2017 17:19:38 +0400 Subject: [PATCH 1/2] WA/issue #103 --- src/main/java/net/atomique/ksar/AllParser.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/atomique/ksar/AllParser.java b/src/main/java/net/atomique/ksar/AllParser.java index 85fc72db..8ab39f15 100644 --- a/src/main/java/net/atomique/ksar/AllParser.java +++ b/src/main/java/net/atomique/ksar/AllParser.java @@ -25,13 +25,16 @@ public abstract class AllParser { { put("^\\d{8}$", "yyyyMMdd"); put("^\\d{1,2}-\\d{1,2}-\\d{4}$", "dd-MM-yyyy"); - put("^\\d{4}-\\d{1,2}-\\d{1,2}$", "yyyy-MM-dd"); - put("^\\d{1,2}/\\d{1,2}/\\d{4}$", "MM/dd/yyyy"); + put("^\\d{4}-\\d{1,2}-\\d{1,2}$", "yyyy-MM-dd"); put("^\\d{4}/\\d{1,2}/\\d{1,2}$", "yyyy/MM/dd"); put("^\\d{1,2}\\s[a-z]{3}\\s\\d{4}$", "dd MMM yyyy"); put("^\\d{1,2}\\s[a-z]{4,}\\s\\d{4}$", "dd MMMM yyyy"); put("^\\d{1,2}-\\d{1,2}-\\d{2}$", "dd-MM-yy"); - put("^\\d{1,2}/\\d{1,2}/\\d{2}$", "MM/dd/yy"); + //try to catch "London's" issue + put("^(0[1-9]|[1-9][1-2]*)/\\d{1,2}/\\d{2}$", "MM/dd/yy"); + put("^\\d{1,2}/(0[1-9]|[1-9][1-2]*)/\\d{2}$", "dd/MM/yy"); + put("^(0[1-9]|[1-9][1-2]*)/\\d{1,2}/\\d{4}$", "MM/dd/yyyy"); + put("^\\d{1,2}/(0[1-9]|[1-9][1-2]*)/\\d{4}$", "dd/MM/yyyy"); } }; From 727912c07e3940d059bb2a7aea4a13551fc10c55 Mon Sep 17 00:00:00 2001 From: elkrieg Date: Mon, 7 Aug 2017 17:23:47 +0400 Subject: [PATCH 2/2] Update AllParser.java --- src/main/java/net/atomique/ksar/AllParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/atomique/ksar/AllParser.java b/src/main/java/net/atomique/ksar/AllParser.java index 8ab39f15..6c9bab1a 100644 --- a/src/main/java/net/atomique/ksar/AllParser.java +++ b/src/main/java/net/atomique/ksar/AllParser.java @@ -25,8 +25,8 @@ public abstract class AllParser { { put("^\\d{8}$", "yyyyMMdd"); put("^\\d{1,2}-\\d{1,2}-\\d{4}$", "dd-MM-yyyy"); - put("^\\d{4}-\\d{1,2}-\\d{1,2}$", "yyyy-MM-dd"); put("^\\d{4}/\\d{1,2}/\\d{1,2}$", "yyyy/MM/dd"); + put("^\\d{4}-\\d{1,2}-\\d{1,2}$", "yyyy-MM-dd"); put("^\\d{1,2}\\s[a-z]{3}\\s\\d{4}$", "dd MMM yyyy"); put("^\\d{1,2}\\s[a-z]{4,}\\s\\d{4}$", "dd MMMM yyyy"); put("^\\d{1,2}-\\d{1,2}-\\d{2}$", "dd-MM-yy");