callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #269413 - Search treats "4 weeks" and "1 month" as synonymous

Browse Source
This commit is contained in:
Milan Crha
2011-06-20 13:57:48 +02:00
parent 1524e8f234
commit d3f72293ce
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
filter/e-filter-datespec.c
View File

@ -432,12 +432,30 @@ filter_datespec_format_sexp (EFilterElement *element,
g_string_append_printf (out, "%d", (gint) fds->value);
break;
case FDST_X_AGO:
g_string_append_printf (
out, "(- (get-current-date) %d)", (gint) fds->value);
switch (get_best_span (fds->value)) {
case 5: /* months */
g_string_append_printf (out, "(get-relative-months (- 0 %d))", (gint) (fds->value / timespans[5].seconds));
break;
case 6: /* years */
g_string_append_printf (out, "(get-relative-months (- 0 %d))", (gint) (12 * fds->value / timespans[6].seconds));
break;
default:
g_string_append_printf (out, "(- (get-current-date) %d)", (gint) fds->value);
break;
}
break;
case FDST_X_FUTURE:
g_string_append_printf (
out, "(+ (get-current-date) %d)", (gint) fds->value);
switch (get_best_span (fds->value)) {
case 5: /* months */
g_string_append_printf (out, "(get-relative-months %d)", (gint) (fds->value / timespans[5].seconds));
break;
case 6: /* years */
g_string_append_printf (out, "(get-relative-months %d)", (gint) (12 * fds->value / timespans[6].seconds));
break;
default:
g_string_append_printf (out, "(+ (get-current-date) %d)", (gint) fds->value);
break;
}
break;
}
}