lookupEvent returns one entry for every service event though no event in

[enigma2.git] / lib / dvb / epgcache.cpp

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 57501d8d39e9b2c385eea477a261cc37da5e05c3..e08d81a51f8ea2bb63592b9858c7e31365ddeb79 100644 (file)
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -372,8 +372,9 @@ void eEPGCache::DVBChannelStateChanged(iDVBChannel *chan)
        }
 }
 
        }
 }
 

-void eEPGCache::FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service)
+bool eEPGCache::FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service)

 {
 {

+       bool ret = false;

        timeMap::iterator tmp = tm_it;
        while ((tmp->first+tmp->second->getDuration()-300) > TM)
        {
        timeMap::iterator tmp = tm_it;
        while ((tmp->first+tmp->second->getDuration()-300) > TM)
        {


@@ -406,6 +407,7 @@ void eEPGCache::FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t T
                        }
                        else
                                servicemap.second.erase(tmp--);
                        }
                        else
                                servicemap.second.erase(tmp--);

+                       ret = true;

                }
                else
                {
                }
                else
                {


@@ -434,12 +436,14 @@ void eEPGCache::FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t T
 #endif
                        delete tmp->second;
                        servicemap.second.erase(tmp++);
 #endif
                        delete tmp->second;
                        servicemap.second.erase(tmp++);

+                       ret = true;

                }
                else
                        ++tmp;
                if (tmp == servicemap.second.end())
                        break;
        }
                }
                else
                        ++tmp;
                if (tmp == servicemap.second.end())
                        break;
        }

+       return ret;

 }
 
 void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
 }
 
 void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)


@@ -523,7 +527,11 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
                                                eventData *tmp = ev_it->second;
                                                ev_it->second = tm_it_tmp->second =
                                                        new eventData(eit_event, eit_event_size, source);
                                                eventData *tmp = ev_it->second;
                                                ev_it->second = tm_it_tmp->second =
                                                        new eventData(eit_event, eit_event_size, source);

-                                               FixOverlapping(servicemap, TM, duration, tm_it_tmp, service);
+                                               if (FixOverlapping(servicemap, TM, duration, tm_it_tmp, service))
+                                               {
+                                                       prevEventIt = servicemap.first.end();
+                                                       prevTimeIt = servicemap.second.end();
+                                               }

                                                delete tmp;
                                                goto next;
                                        }
                                                delete tmp;
                                                goto next;
                                        }


@@ -596,8 +604,6 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
                                tm_it=prevTimeIt=servicemap.second.insert( prevTimeIt, std::pair<const time_t, eventData*>( TM, evt ) );
                        }
 
                                tm_it=prevTimeIt=servicemap.second.insert( prevTimeIt, std::pair<const time_t, eventData*>( TM, evt ) );
                        }
 

-                       FixOverlapping(servicemap, TM, duration, tm_it, service);
-

 #ifdef EPG_DEBUG
                        if ( consistencyCheck )
                        {
 #ifdef EPG_DEBUG
                        if ( consistencyCheck )
                        {


@@ -617,6 +623,11 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
                                                ev_it->first, event_id );
                        }
 #endif
                                                ev_it->first, event_id );
                        }
 #endif

+                       if (FixOverlapping(servicemap, TM, duration, tm_it, service))
+                       {
+                               prevEventIt = servicemap.first.end();
+                               prevTimeIt = servicemap.second.end();
+                       }

                }
 next:
 #ifdef EPG_DEBUG
                }
 next:
 #ifdef EPG_DEBUG


@@ -1531,13 +1542,13 @@ RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin,
                }
 
                if (minutes != -1)
                }
 
                if (minutes != -1)

-                       m_timemap_end = It->second.second.upper_bound(begin+minutes*60);
+                       m_timemap_end = It->second.second.lower_bound(begin+minutes*60);

                else
                        m_timemap_end = It->second.second.end();
 
                currentQueryTsidOnid = (ref.getTransportStreamID().get()<<16) | ref.getOriginalNetworkID().get();
                Unlock();
                else
                        m_timemap_end = It->second.second.end();
 
                currentQueryTsidOnid = (ref.getTransportStreamID().get()<<16) | ref.getOriginalNetworkID().get();
                Unlock();

-               return 0;
+               return -(m_timemap_cursor == m_timemap_end);

        }
        Unlock();
        return -1;
        }
        Unlock();
        return -1;


@@ -1874,6 +1885,8 @@ PyObject *eEPGCache::lookupEvent(ePyObject list, ePyObject convertFunc)
                                                }
                                        }
                                }
                                                }
                                        }
                                }

+                               else
+                                       handleEvent(0, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs);

                                Unlock();
                        }
                        else
                                Unlock();
                        }
                        else


@@ -2254,6 +2267,11 @@ PyObject *eEPGCache::search(ePyObject arg)
                                                {
                                                        if (lookupEventId(ref, evid, ev))
                                                                eDebug("event not found !!!!!!!!!!!");
                                                {
                                                        if (lookupEventId(ref, evid, ev))
                                                                eDebug("event not found !!!!!!!!!!!");

+                                                       else
+                                                       {
+                                                               const eServiceReferenceDVB &dref = (const eServiceReferenceDVB&)ref;
+                                                               ptr.parseFrom(ev, (dref.getTransportStreamID().get()<<16)|dref.getOriginalNetworkID().get());
+                                                       }

                                                }
                                        // create service name
                                                if (!service_name)
                                                }
                                        // create service name
                                                if (!service_name)


@@ -2485,7 +2503,7 @@ void eEPGCache::privateSectionRead(const uniqueEPGKey &current_service, const __
                                int sid = data[ptr++] << 8;
                                sid |= data[ptr++];
 
                                int sid = data[ptr++] << 8;
                                sid |= data[ptr++];
 

-// WORKAROUND for wrong transmitted epg data (01.08.2006)
+// WORKAROUND for wrong transmitted epg data (01.10.2007)

                                if ( onid == 0x85 )
                                {
                                        switch( (tsid << 16) | sid )
                                if ( onid == 0x85 )
                                {
                                        switch( (tsid << 16) | sid )


@@ -2496,6 +2514,7 @@ void eEPGCache::privateSectionRead(const uniqueEPGKey &current_service, const __
                                                case 0x0300f5: sid = 0xdc; break;
                                                case 0x0400d2: sid = 0xe2; tsid = 0x11; break;
                                                case 0x1100d3: sid = 0xe3; break;
                                                case 0x0300f5: sid = 0xdc; break;
                                                case 0x0400d2: sid = 0xe2; tsid = 0x11; break;
                                                case 0x1100d3: sid = 0xe3; break;

+                                               case 0x0100d4: sid = 0xe4; tsid = 4; break;

                                        }
                                }
 ////////////////////////////////////////////
                                        }
                                }
 ////////////////////////////////////////////