res = 0;
break;
case eDVBChannelQuery::tSatellitePosition:
- res = (ref.getDVBNamespace().get() >> 16) == query.m_int;
+ res = ((unsigned int)ref.getDVBNamespace().get())>>16 == query.m_int;
break;
case eDVBChannelQuery::tChannelID:
{
case eDVBChannelQuery::tOR:
res = checkFilter(ref, *query.m_p1) || checkFilter(ref, *query.m_p2);
break;
+ case eDVBChannelQuery::tAny:
+ res = 1;
+ break;
}
if (query.m_inverse)
RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::const_iterator begin, std::list<std::string>::const_iterator end)
{
std::list<std::string>::const_iterator end_of_exp;
+
+ if (begin == end)
+ {
+ eDebug("empty expression!");
+ return 0;
+ }
+
if (*begin == "(")
{
end_of_exp = begin;
/* now we recursivly parse that. */
int r = parseExpression(res, tokens.begin(), tokens.end());
+ /* we have an empty (but valid!) expression */
+ if (!r && !res)
+ {
+ res = new eDVBChannelQuery();
+ res->m_inverse = 0;
+ res->m_type = eDVBChannelQuery::tAny;
+ }
+
if (res)
{
res->m_sort = sort;