From 1c8ae68620543c5a5d8fbe313f02a92e1dde4f06 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Mon, 13 Jun 2011 14:12:17 +0200 Subject: turned 'compare expression' in 'compare date' for easier handling in OSD --- epgsearchtools.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'epgsearchtools.c') diff --git a/epgsearchtools.c b/epgsearchtools.c index 7beaed6..b403656 100644 --- a/epgsearchtools.c +++ b/epgsearchtools.c @@ -806,7 +806,7 @@ void PrepareTimerFile(const cEvent* event, cTimer* timer) } } -bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, int compareSubtitle, bool compareSummary, const char* compareExpression, unsigned long catvaluesAvoidRepeat, int matchLimit) +bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, int compareSubtitle, bool compareSummary, int compareDate, unsigned long catvaluesAvoidRepeat, int matchLimit) { if (!event1 || !event2) return false; if (event1 == event2) return true; @@ -834,6 +834,10 @@ bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, std::transform(Subtitle1.begin(), Subtitle1.end(), Subtitle1.begin(), tolower); std::transform(Subtitle2.begin(), Subtitle2.end(), Subtitle2.begin(), tolower); } + string compareExpression = ""; + if (compareDate == 1) compareExpression = "%date%"; + if (compareDate == 2) compareExpression = "%year%-%week%"; + if (compareDate == 3) compareExpression = "%year%-%month%"; bool match = false; if ((!compareTitle || Title1 == Title2) && @@ -850,7 +854,7 @@ bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, free(rawDescr2); if (!match) return false; } - if (compareExpression != NULL && strlen(compareExpression) > 0) + if (compareExpression.size() > 0) { cVarExpr varExpr(compareExpression); string resEvent1 = varExpr.Evaluate(event1); -- cgit v1.2.3