Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now ignores the ending of ordered numbers (1st, 2nd, 3rd, ...).

Browse Source 
Added the "week[s]" keyword to accept strings like "5 weeks", doesn't work
right yet in the "next/last week" case - that extra case should be added to
computeRelativeUnit().
Removed an unused variable.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4384 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2003-08-27 01:12:51 +00:00
parent c1b7aba392
commit d7ef3fc59c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/kernel/libroot/os/parsedate.cpp
View File

@ -184,6 +184,7 @@ static const known_identifier kIdentifiers[] = {
{"years", "year", TYPE_UNIT, FLAG_RELATIVE, UNIT_YEAR, 1},
{"months", "month",TYPE_UNIT, FLAG_RELATIVE, UNIT_MONTH, 1},
{"weeks", "week", TYPE_UNIT, FLAG_RELATIVE, UNIT_DAY, 7},
{"days", "day", TYPE_UNIT, FLAG_RELATIVE, UNIT_DAY, 1},
{"hour", NULL, TYPE_UNIT, FLAG_RELATIVE, UNIT_SECOND, 1 * 60 * 60},
{"hours", "hrs", TYPE_UNIT, FLAG_RELATIVE, UNIT_SECOND, 1 * 60 * 60},
@ -384,6 +385,18 @@ preparseDate(const char *dateString, parsed_element *elements)
// skip number
while (isdigit(dateString[1]))
dateString++;
// check for "1st", "2nd, "3rd", "4th", ...
const char *suffixes[] = {"th", "st", "nd", "rd"};
const char *validSuffix = elements[index].value > 3 ? "th" : suffixes[elements[index].value];
if (!strncasecmp(dateString + 1, validSuffix, 2)
&& !isalpha(dateString[3])) {
// for now, just ignore the suffix - but we might be able
// to deduce some meaning out of it, since it's not really
// possible to put it in anywhere
dateString += 2;
}
} else if (isalpha(c)) {
// fetch whole string
@ -536,7 +549,6 @@ computeDate(const char *format, bool *optional, parsed_element *elements, time_t
parsed_element *element = elements;
uint32 position = 0;
struct tm tm;
bool relative = false;
if (now == -1)
now = time(NULL);