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;
}
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')
{
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;
/* we had only one sub expression */
if (end_of_exp == end)
{
- eDebug("only one sub expression");
+// eDebug("only one sub expression");
return 0;
}
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;
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());
res->m_bouquet_name = bouquet_name;
}
- eDebug("return: %d", r);
+// eDebug("return: %d", r);
return r;
}