duckduckgo
/
zeroclickinfo-goodies
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WorkdaysBetween: Don't parse MM/DD and DD/MM in the same query 

If either date requires the DD/MM/YYYY format, all XX/XX/XXXX dates in
the query will be formatted using the DD/MM/YYYY.
master
Matt Garriott 2014-01-16 21:26:52 -07:00
parent a49307abe3
commit edac815f85
2 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/DDG/Goodie/WorkdaysBetween.pm
View File

@ -84,30 +84,57 @@ handle remainder => sub {
sub get_dates {
my @date_strings = $_ =~ m#(\d{1,2}/\d{1,2}/\d{4}|\w{3} \d{1,2},? \d{4})#g;
# A list of date formats to try sequentially.
my @date_formats = ( "%m/%d/%Y", "%d/%m/%Y", "%b %d %Y", "%b %d, %Y" );
# If we don't have two dates matching the correct format, return nothing.
if (scalar(@date_strings) != 2) {
return;
}
# A list of date formats to try sequentially.
my $day_first_format = "%d/%m/%Y";
my @date_formats = ( "%m/%d/%Y", $day_first_format, "%b %d %Y", "%b %d, %Y" );
# Flag that determines if we are using the DD/MM/YYYY format
my $day_is_first = 0;
# Populate the @dates array. With Time::Piece
my @dates;
foreach (@date_strings) {
my $date_string = $_;
for (my $i = 0; $i < scalar(@date_strings); $i++) {
my $date_string = $date_strings[$i];
foreach (@date_formats) {
local $@;
my $time;
eval {
# Attempt to parse the date here.
my $time = Time::Piece->strptime($date_string, $_);
$time = Time::Piece->strptime($date_string, $_);
};
# If we didn't get an error parsing the time...
unless ($@) {
# If a date matches the DD/MM/YYYY format we want to ensure
# that all the XX/XX/XXXX dates match that specific format.
# Therefore, we remove the MM/DD/YYYY format from the
# dates_format array, clear the dates array, and restart the
# loop. This way all XX/XX/XXXX dates will match only the
# DD/MM/YYYY format.
if ( $_ eq $day_first_format && !$day_is_first ) {
# Set the flag indicating that we are using DD/MM/YYYY
$day_is_first = 1;
# Remove the MM/DD/YYYY format from the date_formats array
shift(@date_formats);
# Empty the @dates array
undef @dates;
# Reset the loop index
$i = -1;
# Restart the loop iteration
next;
}
# If the format was acceptable, add the date to the @dates array
push(@dates, $time);
};
# Break the loop unless we had an eval error
unless ($@) { last; }
last;
}
}
}

4
t/WorkdaysBetween.t
View File

@ -78,6 +78,10 @@ ddg_goodie_test(
# Month and Date are backwards
'workdays between 16/06/2014 20/06/2014' =>
test_zci("There are 4 workdays between $JUN_ABBREV 16, 2014 and $JUN_ABBREV 20, 2014."),
'workdays between 5/06/2014 20/06/2014' =>
test_zci("There are 11 workdays between $JUN_ABBREV 05, 2014 and $JUN_ABBREV 20, 2014."),
'workdays between 20/06/2014 5/06/2014' =>
test_zci("There are 11 workdays between $JUN_ABBREV 05, 2014 and $JUN_ABBREV 20, 2014."),
# Single digit days and months
'workdays between 1/6/2014 1/10/2014' =>