From 763b59bfa1c47ee7436d079eda8eb70a896f16a8 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Fri, 25 May 2007 11:31:59 +0000 Subject: - search for repeats in what'on and schedule, if epgsearch is present --- pages/schedule.ecpp | 7 ++++++- pages/searchresults.ecpp | 14 ++++++++++++++ pages/whats_on.ecpp | 3 +++ 3 files changed, 23 insertions(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index 9051a04..60bd23c 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -106,7 +106,12 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); % current_day = day; % } "> - <& pageelems.event_timer channelid=(channel_id) eventid=(event) &> + <& pageelems.event_timer channelid=(channel_id) eventid=(event) &> +% if (LiveSetup().HaveEPGSearch()) { + > +% } + + <$ start $> - <$ end $> % if(Event == PresentEvent) { diff --git a/pages/searchresults.ecpp b/pages/searchresults.ecpp index 65ae2da..99bebf6 100644 --- a/pages/searchresults.ecpp +++ b/pages/searchresults.ecpp @@ -15,6 +15,7 @@ using namespace std; // input parameters string searchtimerid; string searchtimerquery; + string searchplain; <%session scope="global"> bool logged_in(false); @@ -30,6 +31,19 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); results.GetByID(lexical_cast< int >(searchtimerid)); if (!searchtimerquery.empty()) results.GetByQuery(SearchResults::PopQuery(searchtimerquery)); + if (!searchplain.empty()) + { + string query = searchplain; + StringReplace(query, "&", "&"); + SearchTimer s; + s.SetId(0); + s.SetSearch(query); + s.SetSearchMode(0); + s.SetUseTitle(true); + s.SetUseSubtitle(false); + s.SetUseDescription(false); + results.GetByQuery(s.ToText()); + } <& pageelems.doc_type &> diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 2e81e23..7c91393 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -79,6 +79,9 @@ if (type == "now") { % if (type == "now") { <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channel_id) image="zap.png" alt="" &> % } +% if (LiveSetup().HaveEPGSearch()) { + > +% }
<$ (epgEvent->StartTime(tr("%I:%M %p"))) $> - <$ (epgEvent->EndTime(tr("%I:%M %p"))) $>
-- cgit v1.2.3