frodovdr/vdr-plugin-tvguide
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git synced 2023-10-05 15:01:48 +02:00
Code Issues Releases Wiki Activity

Fixed a bug when epgsearch search string contains a colon

Browse Source
This commit is contained in:
louis 2013-07-23 18:50:33 +02:00
parent ff51b1ffa4
commit 8578af3668
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
recmanager.c
View File

@ -386,14 +386,18 @@ std::vector<TVGuideEPGSearchTemplate> cRecManager::ReadEPGSearchTemplates(void)
} }
std::string cRecManager::BuildEPGSearchString(cString searchString, std::string templValue) { std::string cRecManager::BuildEPGSearchString(cString searchString, std::string templValue) {
std::string strSearchString = *searchString;
std::replace(strSearchString.begin(), strSearchString.end(), ':', '|');
std::stringstream searchTimerString; std::stringstream searchTimerString;
searchTimerString << "0:"; searchTimerString << "0:";
searchTimerString << *searchString; searchTimerString << strSearchString;
searchTimerString << templValue; searchTimerString << templValue;
return searchTimerString.str(); return searchTimerString.str();
} }
std::string cRecManager::BuildEPGSearchString(cString searchString, cRecMenu *menu) { std::string cRecManager::BuildEPGSearchString(cString searchString, cRecMenu *menu) {
std::string strSearchString = *searchString;
std::replace(strSearchString.begin(), strSearchString.end(), ':', '|');
int searchMode = menu->GetIntValue(0); int searchMode = menu->GetIntValue(0);
bool useTitle = menu->GetBoolValue(1); bool useTitle = menu->GetBoolValue(1);
bool useSubTitle = menu->GetBoolValue(2); bool useSubTitle = menu->GetBoolValue(2);
@ -417,7 +421,7 @@ std::string cRecManager::BuildEPGSearchString(cString searchString, cRecMenu *me
//1 - unique search timer id //1 - unique search timer id
searchTimerString << "0:"; searchTimerString << "0:";
//2 - the search term //2 - the search term
searchTimerString << *searchString; searchTimerString << strSearchString;
//3 - use time? 0/1 //3 - use time? 0/1
//4 - start time in HHMM //4 - start time in HHMM
//5 - stop time in HHMM //5 - stop time in HHMM
@ -538,7 +542,7 @@ std::string cRecManager::BuildEPGSearchString(cString searchString, cRecMenu *me
54 - compare date when testing for a repeat? (0=no, 1=same day, 2=same week, 3=same month) */ 54 - compare date when testing for a repeat? (0=no, 1=same day, 2=same week, 3=same month) */
searchTimerString << "0::::0:::0::0:::::::::0"; searchTimerString << "0::::0:::0::0:::::::::0";
//esyslog("tvguide: epgsearch String: %s", searchTimerString.str().c_str()); esyslog("tvguide: epgsearch String: %s", searchTimerString.str().c_str());
return searchTimerString.str(); return searchTimerString.str();
} }
@ -609,6 +613,8 @@ const cEvent **cRecManager::PerformSearch(cRecMenu *menu, bool withOptions, int
if (epgSearchPlugin->Service("Epgsearch-searchresults-v1.0", &data)) { if (epgSearchPlugin->Service("Epgsearch-searchresults-v1.0", &data)) {
cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *list = data.pResultList; cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *list = data.pResultList;
if (!list)
return NULL;
int numElements = list->Count(); int numElements = list->Count();
const cEvent **searchResults = NULL; const cEvent **searchResults = NULL;
if (numElements > 0) { if (numElements > 0) {