mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

-add compare bouquetname withoutspace

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@828 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-10-09 13:15:42 +00:00
parent b2cc927d19
commit d3580c9064
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/zapit/src/bouquets.cpp
View File

@@ -530,16 +530,32 @@ void CBouquetManager::deleteBouquet(const CZapitBouquet* bouquet)
} }
} }
} }
int str_compare_withoutspace(char const *s1, char const *s2)
{
int cmp_result = 0;
while(isspace(*s1)) ++s1;
while(isspace(*s2)) ++s2;
while(!cmp_result && *s1++ && *s2++){
while(isspace(*s1)) ++s1;
while(isspace(*s2)) ++s2;
cmp_result = tolower(*s1) - tolower(*s2);
}
return cmp_result;
}
// -- Find Bouquet-Name, if BQ exists (2002-04-02 rasc) // -- Find Bouquet-Name, if BQ exists (2002-04-02 rasc)
// -- Return: Bouqet-ID (found: 0..n) or -1 (Bouquet does not exist) // -- Return: Bouqet-ID (found: 0..n) or -1 (Bouquet does not exist)
int CBouquetManager::existsBouquet(char const * const name) int CBouquetManager::existsBouquet(char const * const name)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < Bouquets.size(); i++) { for (i = 0; i < Bouquets.size(); i++) {
if (Bouquets[i]->Name == name) if (Bouquets[i]->Name == name)
{
return (int)i; return (int)i;
else if (strcasecmp(Bouquets[i]->Name.c_str(), name)==0){ }
else if (strcasecmp(Bouquets[i]->Name.c_str(), name)==0)
{
int lower1 = 0, lower2 = 0; int lower1 = 0, lower2 = 0;
int upper1 = 0 ,upper2 = 0; int upper1 = 0 ,upper2 = 0;
std::string str2 = name; std::string str2 = name;
@@ -568,6 +584,12 @@ int CBouquetManager::existsBouquet(char const * const name)
Bouquets[i]->Name = str2; Bouquets[i]->Name = str2;
} }
return (int)i; return (int)i;
}else if(!(str_compare_withoutspace(Bouquets[i]->Name.c_str(), name)) )
{
if(strlen(name) > Bouquets[i]->Name.length()){
Bouquets[i]->Name = name;
}
return (int)i;
} }
} }
return -1; return -1;