Fix relative parsing

This commit is contained in:
Jesse Gumm 2016-03-07 05:48:56 +00:00
parent 3564470578
commit bb934b522f

View file

@ -656,9 +656,12 @@ range_years(Interval, Start, Finish) ->
parse_relative({relative, Date, Relation}) when is_atom(Relation) -> parse_relative({relative, Date, Relation}) when is_atom(Relation) ->
parse_relative({relative, Date, atom_to_list(Relation)}); parse_relative({relative, Date, atom_to_list(Relation)});
parse_relative({relative, Date, Relation}) when is_list(Relation); is_binary(Relation) -> parse_relative({relative, Date, Relation}) when is_list(Relation); is_binary(Relation) ->
{OpStr, NumStr, UnitStr} = parse_actual_relation(Relation), case parse_actual_relation(Relation) of
{Num, Unit} = normalize_relative_matches(OpStr, NumStr, UnitStr), undefined -> undefined;
add_unit(Unit, Num, Date); {OpStr, NumStr, UnitStr} ->
{Num, Unit} = normalize_relative_matches(OpStr, NumStr, UnitStr),
add_unit(Unit, Num, Date)
end;
parse_relative(now) -> parse_relative(now) ->
unixtime(); unixtime();
parse_relative("now") -> parse_relative("now") ->