X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b32851030de5d3706883afa87598cba8a8226f5d..aa9f2235e7298a65c143678a8b75eaf6ed842462:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index eb62f1fb..eb0221a3 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -455,7 +455,7 @@ void eDVBDB::reloadServicelist()
 				} else if (p == 'c')
 				{
 					int cid, val;
-					sscanf(v.c_str(), "%02d%04x", &cid, &val);
+					sscanf(v.c_str(), "%02d%x", &cid, &val);
 					s->setCacheEntry((eDVBService::cacheID)cid,val);
 				} else if (p == 'C')
 				{
@@ -1015,21 +1015,43 @@ eDVBDBQueryBase::eDVBDBQueryBase(eDVBDB *db, const eServiceReference &source, eD
 int eDVBDBQueryBase::compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b)
 {
 	ePtr<eDVBService> a_service, b_service;
-	
 	int sortmode = m_query ? m_query->m_sort : eDVBChannelQuery::tName;
 	
 	if ((sortmode == eDVBChannelQuery::tName) || (sortmode == eDVBChannelQuery::tProvider))
 	{
-		if (m_db->getService(a, a_service))
+		if (a.name.empty() && m_db->getService(a, a_service))
 			return 1;
-		if (m_db->getService(b, b_service))
+		if (b.name.empty() && m_db->getService(b, b_service))
 			return 1;
 	}
 	
 	switch (sortmode)
 	{
 	case eDVBChannelQuery::tName:
-		return a_service->m_service_name_sort < b_service->m_service_name_sort;
+		if (a_service)
+		{
+			if (b_service)
+				return a_service->m_service_name_sort < b_service->m_service_name_sort;
+			else
+			{
+				std::string str = b.name;
+				makeUpper(str);
+				return a_service->m_service_name_sort < str;
+			}
+		}
+		else if (b_service)
+		{
+			std::string str = a.name;
+			makeUpper(str);
+			return str < b_service->m_service_name_sort;
+		}
+		else
+		{
+			std::string aa = a.name, bb = b.name;
+			makeUpper(aa);
+			makeUpper(bb);
+			return aa < bb;
+		}
 	case eDVBChannelQuery::tProvider:
 		return a_service->m_provider_name < b_service->m_provider_name;
 	case eDVBChannelQuery::tType:
@@ -1126,12 +1148,16 @@ int eDVBDBListQuery::compareLessEqual(const eServiceReferenceDVB &a, const eServ
 			y -= 3600;
 		return x < y;
 	}
-	return a.name < b.name;
+	std::string aa = a.name, bb = b.name;
+	makeUpper(aa);
+	makeUpper(bb);
+	return aa < bb;
 }
 
 eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
 	:eDVBDBListQuery(db, source, query)
 {
+	std::set<unsigned int> found;
 	for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_db->m_services.begin());
 		it != m_db->m_services.end(); ++it)
 	{
@@ -1139,15 +1165,9 @@ eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference
 		if (res)
 		{
 			unsigned int dvbnamespace = it->first.getDVBNamespace().get()&0xFFFF0000;
-			bool found=0;
-			for (std::list<eServiceReferenceDVB>::iterator i(m_list.begin()); i != m_list.end(); ++i)
-				if ( (i->getDVBNamespace().get()&0xFFFF0000) == dvbnamespace )
-				{
-					found=true;
-					break;
-				}
-			if (!found)
+			if (found.find(dvbnamespace) == found.end())
 			{
+				found.insert(dvbnamespace);
 				eServiceReferenceDVB ref;
 				ref.setDVBNamespace(dvbnamespace);
 				ref.flags=eServiceReference::flagDirectory;
@@ -1184,26 +1204,19 @@ eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference
 eDVBDBProvidersQuery::eDVBDBProvidersQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
 	:eDVBDBListQuery(db, source, query)
 {
+	std::set<std::string> found;
 	for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_db->m_services.begin());
 		it != m_db->m_services.end(); ++it)
 	{
 		int res = it->second->checkFilter(it->first, *query);
 		if (res)
 		{
-			bool found=0;
-
 			const char *provider_name = it->second->m_provider_name.length() ?
 				it->second->m_provider_name.c_str() :
 				"Unknown";
-
-			for (std::list<eServiceReferenceDVB>::iterator i(m_list.begin()); i != m_list.end(); ++i)
-				if (i->name == provider_name)
-				{
-					found=true;
-					break;
-				}
-			if (!found)
+			if (found.find(std::string(provider_name)) == found.end())
 			{
+				found.insert(std::string(provider_name));
 				eServiceReferenceDVB ref;
 				char buf[64];
 				ref.name=provider_name;