[browser] add exception handling.

[vuplus_dvbapp] / lib / service / event.cpp

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index e78ddc4..2a4cb0d 100644 (file)
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -86,9 +86,9 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
                                int table=encodingHandler.getCountryCodeDefaultMapping(cc);
                                if (lang.empty())
                                        lang = cc;  // use first found language
-                               if (cc == lang)
+                               if (!strncasecmp(lang.c_str(), cc.c_str(), 3))
                                {
-                                       m_event_name = convertDVBUTF8(sed->getEventName(), table, tsidonid);
+                                       m_event_name = convertDVBUTF8(replace_all(replace_all(sed->getEventName(), "\n", " "), "\t", " "), table, tsidonid);
                                        m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid);
                                        retval=1;
                                }
@@ -101,7 +101,7 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
                                int table=encodingHandler.getCountryCodeDefaultMapping(cc);
                                if (lang.empty())
                                        lang = cc;  // use first found language
-                               if (cc == lang)
+                               if (!strncasecmp(lang.c_str(), cc.c_str(), 3))
                                {
                                        m_extended_description += convertDVBUTF8(eed->getText(), table, tsidonid);
                                        retval=1;
@@ -154,7 +154,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;