service/event.cpp: convert country code to lower case before compare it

[enigma2.git] / lib / service / event.cpp

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index e15eebfc979a01a7e79567f302b54fe4462c68ce..85c8f5f68e625be1bc68dd78c1f8c3788c8f1291 100644 (file)
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -84,9 +84,11 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
                                const ShortEventDescriptor *sed = (ShortEventDescriptor*)*desc;
                                const std::string &cc = sed->getIso639LanguageCode();
                                int table=encodingHandler.getCountryCodeDefaultMapping(cc);
+                               std::string s2;
+                               std::transform(cc.begin(), cc.end(), s2.begin(), tolower);
                                if (lang.empty())
-                                       lang = cc;  // use first found language
-                               if (cc == lang)
+                                       lang = s2;  // use first found language
+                               if (lang == s2)
                                {
                                        m_event_name = convertDVBUTF8(replace_all(replace_all(sed->getEventName(), "\n", " "), "\t", " "), table, tsidonid);
                                        m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid);
@@ -99,9 +101,11 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
                                const ExtendedEventDescriptor *eed = (ExtendedEventDescriptor*)*desc;
                                const std::string &cc = eed->getIso639LanguageCode();
                                int table=encodingHandler.getCountryCodeDefaultMapping(cc);
+                               std::string s2;
+                               std::transform(cc.begin(), cc.end(), s2.begin(), tolower);
                                if (lang.empty())
-                                       lang = cc;  // use first found language
-                               if (cc == lang)
+                                       lang = s2;  // use first found language
+                               if (lang == s2)
                                {
                                        m_extended_description += convertDVBUTF8(eed->getText(), table, tsidonid);
                                        retval=1;
@@ -154,7 +158,7 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
                                                dvb_ref.setOriginalNetworkID(ld->getOriginalNetworkId());
                                                dvb_ref.setServiceID(ld->getServiceId());
                                                const PrivateDataByteVector *privateData = ld->getPrivateDataBytes();
-                                               dvb_ref.name = convertDVBUTF8((const unsigned char*)&((*privateData)[0]), privateData->size(), 0, tsidonid);
+                                               dvb_ref.name = convertDVBUTF8((const unsigned char*)&((*privateData)[0]), privateData->size(), 1, tsidonid);
                                                m_linkage_services.push_back(ref);
                                        }
                                        break;