Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WA/issue #103 #105

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WA/issue #103 #105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12ed3b7
WA/issue #103
elkrieg Aug 7, 2017
727912c
Update AllParser.java
elkrieg Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/net/atomique/ksar/AllParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if regexps are required at all.
Should ksar just try to parse the date and check which mask works better?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i agree, but for the moment we have this implementation of auto detection

}
};

Expand Down