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

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 04c03b94..70d512c1 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -31,10 +31,12 @@ eDVBService &eDVBService::operator=(const eDVBService &s)
 
 RESULT eDVBService::getName(const eServiceReference &ref, std::string &name)
 {
-	if ( ref.name.length() )
+	if (!ref.name.empty())
 		name = ref.name;
-	else
+	else if (!m_service_name.empty())
 		name = m_service_name;
+	else
+		name = "(...)";
 	return 0;
 }
 
@@ -155,8 +157,6 @@ void eDVBDB::load()
 				sat.fec = fec;
 				sat.orbital_position = orbital_position;
 				sat.inversion = inversion;
-				// ...
-//				t.setSatellite(frequency, symbol_rate, polarisation, fec, sat, inversion);
 				feparm->setDVBS(sat);
 			} else if (line[1]=='t')
 			{
@@ -221,7 +221,13 @@ void eDVBDB::load()
 		s->m_service_name = line;
 		s->m_service_name_sort = removeDVBChars(line);
 		makeUpper(s->m_service_name_sort);
-
+		while ((!s->m_service_name_sort.empty()) && s->m_service_name_sort[0] == ' ')
+			s->m_service_name_sort.erase(0, 1);
+		
+			/* put unnamed services at the end, not at the beginning. */
+		if (s->m_service_name_sort.empty())
+			s->m_service_name_sort = "\xFF";
+		
 		fgets(line, 256, f);
 		if (strlen(line))
 			line[strlen(line)-1]=0;
@@ -685,7 +691,7 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
 			/* we had only one sub expression */
 		if (end_of_exp == end)
 		{
-			eDebug("only one sub expression");
+//			eDebug("only one sub expression");
 			return 0;
 		}
 		
@@ -783,7 +789,7 @@ RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 	std::string current_token;
 	std::string bouquet_name;
 
-	eDebug("splitting %s....", query.c_str());
+//	eDebug("splitting %s....", query.c_str());
 	unsigned int i = 0;
 	const char *splitchars="()";
 	int quotemode = 0, lastsplit = 0, lastalnum = 0;
@@ -867,7 +873,7 @@ RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 		return -1;
 	}
 	
-	eDebug("sort by %d", sort);
+//	eDebug("sort by %d", sort);
 	
 		/* now we recursivly parse that. */
 	int r = parseExpression(res, tokens.begin(), tokens.end());
@@ -878,7 +884,7 @@ RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 		res->m_bouquet_name = bouquet_name;
 	}
 
-	eDebug("return: %d", r);
+//	eDebug("return: %d", r);
 	return r;
 }