better readable code
[enigma2.git] / lib / dvb / epgcache.cpp
index 350e90ed143562d6877cfd9aa74d1a0e0e3dd2d6..a744655a2b253511acb411a9c8fe380fcee3771f 100644 (file)
@@ -3,11 +3,17 @@
 
 #undef EPG_DEBUG  
 
 
 #undef EPG_DEBUG  
 
+#ifdef EPG_DEBUG
+#include <lib/service/event.h>
+#endif
+
 #include <time.h>
 #include <unistd.h>  // for usleep
 #include <sys/vfs.h> // for statfs
 // #include <libmd5sum.h>
 #include <lib/base/eerror.h>
 #include <time.h>
 #include <unistd.h>  // for usleep
 #include <sys/vfs.h> // for statfs
 // #include <libmd5sum.h>
 #include <lib/base/eerror.h>
+#include <lib/dvb/pmt.h>
+#include <lib/dvb/db.h>
 #include <Python.h>
 
 int eventData::CacheSize=0;
 #include <Python.h>
 
 int eventData::CacheSize=0;
@@ -64,7 +70,6 @@ const eit_event_struct* eventData::get() const
 {
        int pos = 12;
        int tmp = ByteSize-12;
 {
        int pos = 12;
        int tmp = ByteSize-12;
-
        memcpy(data, EITdata, 12);
        __u32 *p = (__u32*)(EITdata+12);
        while(tmp>0)
        memcpy(data, EITdata, 12);
        __u32 *p = (__u32*)(EITdata+12);
        while(tmp>0)
@@ -176,12 +181,11 @@ eEPGCache::eEPGCache()
 
 void eEPGCache::timeUpdated()
 {
 
 void eEPGCache::timeUpdated()
 {
-       if ( !thread_running() )
+       if (!sync())
        {
                eDebug("[EPGC] time updated.. start EPG Mainloop");
                run();
        {
                eDebug("[EPGC] time updated.. start EPG Mainloop");
                run();
-       }
-       else
+       } else
                messages.send(Message(Message::timeChanged));
 }
 
                messages.send(Message(Message::timeChanged));
 }
 
@@ -193,6 +197,9 @@ void eEPGCache::DVBChannelAdded(eDVBChannel *chan)
                channel_data *data = new channel_data(this);
                data->channel = chan;
                data->prevChannelState = -1;
                channel_data *data = new channel_data(this);
                data->channel = chan;
                data->prevChannelState = -1;
+#ifdef ENABLE_PRIVATE_EPG
+               data->m_PrivatePid = -1;
+#endif
                singleLock s(channel_map_lock);
                m_knownChannels.insert( std::pair<iDVBChannel*, channel_data* >(chan, data) );
                chan->connectStateChange(slot(*this, &eEPGCache::DVBChannelStateChanged), data->m_stateChangedConn);
                singleLock s(channel_map_lock);
                m_knownChannels.insert( std::pair<iDVBChannel*, channel_data* >(chan, data) );
                chan->connectStateChange(slot(*this, &eEPGCache::DVBChannelStateChanged), data->m_stateChangedConn);
@@ -242,7 +249,14 @@ void eEPGCache::DVBChannelRunning(iDVBChannel *chan)
                                        eDebug("[eEPGCache] couldnt initialize schedule other reader!!");
                                        return;
                                }
                                        eDebug("[eEPGCache] couldnt initialize schedule other reader!!");
                                        return;
                                }
-
+#ifdef ENABLE_PRIVATE_EPG
+                               res = demux->createSectionReader( this, data.m_PrivateReader );
+                               if ( res )
+                               {
+                                       eDebug("[eEPGCache] couldnt initialize private reader!!");
+                                       return;
+                               }
+#endif
                                messages.send(Message(Message::startChannel, chan));
                                // -> gotMessage -> changedService
                        }
                                messages.send(Message(Message::startChannel, chan));
                                // -> gotMessage -> changedService
                        }
@@ -287,6 +301,69 @@ 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)
+{
+       timeMap::iterator tmp = tm_it;
+       while ((tmp->first+tmp->second->getDuration()-300) > TM)
+       {
+               if(tmp->first != TM && tmp->second->type != PRIVATE)
+               {
+                       __u16 event_id = tmp->second->getEventID();
+                       servicemap.first.erase(event_id);
+#ifdef EPG_DEBUG
+                       Event evt((uint8_t*)tmp->second->get());
+                       eServiceEvent event;
+                       event.parseFrom(&evt, service.sid<<16|service.onid);
+                       eDebug("(1)erase no more used event %04x %d\n%s %s\n%s",
+                               service.sid, event_id,
+                               event.getBeginTimeString().c_str(),
+                               event.getEventName().c_str(),
+                               event.getExtendedDescription().c_str());
+#endif
+                       delete tmp->second;
+                       if (tmp == servicemap.second.begin())
+                       {
+                               servicemap.second.erase(tmp);
+                               break;
+                       }
+                       else
+                               servicemap.second.erase(tmp--);
+               }
+               else
+               {
+                       if (tmp == servicemap.second.begin())
+                               break;
+                       --tmp;
+               }
+       }
+
+       tmp = tm_it;
+       while(tmp->first < (TM+duration-300))
+       {
+               if (tmp->first != TM && tmp->second->type != PRIVATE)
+               {
+                       __u16 event_id = tmp->second->getEventID();
+                       servicemap.first.erase(event_id);
+#ifdef EPG_DEBUG  
+                       Event evt((uint8_t*)tmp->second->get());
+                       eServiceEvent event;
+                       event.parseFrom(&evt, service.sid<<16|service.onid);
+                       eDebug("(2)erase no more used event %04x %d\n%s %s\n%s",
+                               service.sid, event_id,
+                               event.getBeginTimeString().c_str(),
+                               event.getEventName().c_str(),
+                               event.getExtendedDescription().c_str());
+#endif
+                       delete tmp->second;
+                       servicemap.second.erase(tmp++);
+               }
+               else
+                       ++tmp;
+               if (tmp == servicemap.second.end())
+                       break;
+       }
+}
+
 void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
 {
        eit_t *eit = (eit_t*) data;
 void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
 {
        eit_t *eit = (eit_t*) data;
@@ -354,24 +431,24 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
                        if ( ev_it != servicemap.first.end() )
                        {
                                if ( source > ev_it->second->type )  // update needed ?
                        if ( ev_it != servicemap.first.end() )
                        {
                                if ( source > ev_it->second->type )  // update needed ?
-                                       goto next; // when not.. the skip this entry
+                                       goto next; // when not.. then skip this entry
 
                                // search this event in timemap
 
                                // search this event in timemap
-                               timeMap::iterator tm_it_tmp = 
+                               timeMap::iterator tm_it_tmp =
                                        servicemap.second.find(ev_it->second->getStartTime());
 
                                if ( tm_it_tmp != servicemap.second.end() )
                                {
                                        servicemap.second.find(ev_it->second->getStartTime());
 
                                if ( tm_it_tmp != servicemap.second.end() )
                                {
-                                       if ( tm_it_tmp->first == TM ) // correct eventData
+                                       if ( tm_it_tmp->first == TM ) // just update eventdata
                                        {
                                                // exempt memory
                                                delete ev_it->second;
                                        {
                                                // exempt memory
                                                delete ev_it->second;
-                                               evt = new eventData(eit_event, eit_event_size, source);
-                                               ev_it->second=evt;
-                                               tm_it_tmp->second=evt;
+                                               ev_it->second = tm_it_tmp->second =
+                                                       new eventData(eit_event, eit_event_size, source);
+                                               FixOverlapping(servicemap, TM, duration, tm_it_tmp, service);
                                                goto next;
                                        }
                                                goto next;
                                        }
-                                       else
+                                       else  // event has new event begin time
                                        {
                                                tm_erase_count++;
                                                // delete the found record from timemap
                                        {
                                                tm_erase_count++;
                                                // delete the found record from timemap
@@ -381,45 +458,44 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
                                }
                        }
 
                                }
                        }
 
-                       // search in timemap, for check of a case if new time has coincided with time of other event 
+                       // search in timemap, for check of a case if new time has coincided with time of other event
                        // or event was is not found in eventmap
                        timeMap::iterator tm_it =
                                servicemap.second.find(TM);
 
                        if ( tm_it != servicemap.second.end() )
                        {
                        // or event was is not found in eventmap
                        timeMap::iterator tm_it =
                                servicemap.second.find(TM);
 
                        if ( tm_it != servicemap.second.end() )
                        {
-                               // i think, if event is not found on eventmap, but found on timemap updating nevertheless demands
-#if 0
-                               if ( source > tm_it->second->type && tm_erase_count == 0 ) // update needed ?
-                                       goto next; // when not.. the skip this entry
-#endif
+                               // event with same start time but another event_id...
+                               if ( source > tm_it->second->type &&
+                                       ev_it == servicemap.first.end() )
+                                       goto next; // when not.. then skip this entry
 
                                // search this time in eventmap
 
                                // search this time in eventmap
-                               eventMap::iterator ev_it_tmp = 
+                               eventMap::iterator ev_it_tmp =
                                        servicemap.first.find(tm_it->second->getEventID());
 
                                if ( ev_it_tmp != servicemap.first.end() )
                                {
                                        servicemap.first.find(tm_it->second->getEventID());
 
                                if ( ev_it_tmp != servicemap.first.end() )
                                {
-                                       ev_erase_count++;                               
+                                       ev_erase_count++;
                                        // delete the found record from eventmap
                                        servicemap.first.erase(ev_it_tmp);
                                        prevEventIt=servicemap.first.end();
                                }
                        }
                                        // delete the found record from eventmap
                                        servicemap.first.erase(ev_it_tmp);
                                        prevEventIt=servicemap.first.end();
                                }
                        }
-                       
+
                        evt = new eventData(eit_event, eit_event_size, source);
                        evt = new eventData(eit_event, eit_event_size, source);
-#if EPG_DEBUG
+#ifdef EPG_DEBUG
                        bool consistencyCheck=true;
 #endif
                        if (ev_erase_count > 0 && tm_erase_count > 0) // 2 different pairs have been removed
                        {
                                // exempt memory
                        bool consistencyCheck=true;
 #endif
                        if (ev_erase_count > 0 && tm_erase_count > 0) // 2 different pairs have been removed
                        {
                                // exempt memory
-                               delete ev_it->second; 
+                               delete ev_it->second;
                                delete tm_it->second;
                                ev_it->second=evt;
                                tm_it->second=evt;
                        }
                                delete tm_it->second;
                                ev_it->second=evt;
                                tm_it->second=evt;
                        }
-                       else if (ev_erase_count == 0 && tm_erase_count > 0) 
+                       else if (ev_erase_count == 0 && tm_erase_count > 0)
                        {
                                // exempt memory
                                delete ev_it->second;
                        {
                                // exempt memory
                                delete ev_it->second;
@@ -435,34 +511,37 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
                        }
                        else // added new eventData
                        {
                        }
                        else // added new eventData
                        {
-#if EPG_DEBUG
+#ifdef EPG_DEBUG
                                consistencyCheck=false;
 #endif
                                consistencyCheck=false;
 #endif
-                               prevEventIt=servicemap.first.insert( prevEventIt, std::pair<const __u16, eventData*>( event_id, evt) );
-                               prevTimeIt=servicemap.second.insert( prevTimeIt, std::pair<const time_t, eventData*>( TM, evt ) );
+                               ev_it=prevEventIt=servicemap.first.insert( prevEventIt, std::pair<const __u16, eventData*>( event_id, evt) );
+                               tm_it=prevTimeIt=servicemap.second.insert( prevTimeIt, std::pair<const time_t, eventData*>( TM, evt ) );
                        }
                        }
-#if EPG_DEBUG
+
+                       FixOverlapping(servicemap, TM, duration, tm_it, service);
+
+#ifdef EPG_DEBUG
                        if ( consistencyCheck )
                        {
                                if ( tm_it->second != evt || ev_it->second != evt )
                                        eFatal("tm_it->second != ev_it->second");
                                else if ( tm_it->second->getStartTime() != tm_it->first )
                        if ( consistencyCheck )
                        {
                                if ( tm_it->second != evt || ev_it->second != evt )
                                        eFatal("tm_it->second != ev_it->second");
                                else if ( tm_it->second->getStartTime() != tm_it->first )
-                                       eFatal("event start_time(%d) non equal timemap key(%d)", 
+                                       eFatal("event start_time(%d) non equal timemap key(%d)",
                                                tm_it->second->getStartTime(), tm_it->first );
                                else if ( tm_it->first != TM )
                                                tm_it->second->getStartTime(), tm_it->first );
                                else if ( tm_it->first != TM )
-                                       eFatal("timemap key(%d) non equal TM(%d)", 
+                                       eFatal("timemap key(%d) non equal TM(%d)",
                                                tm_it->first, TM);
                                else if ( ev_it->second->getEventID() != ev_it->first )
                                        eFatal("event_id (%d) non equal event_map key(%d)",
                                                ev_it->second->getEventID(), ev_it->first);
                                else if ( ev_it->first != event_id )
                                                tm_it->first, TM);
                                else if ( ev_it->second->getEventID() != ev_it->first )
                                        eFatal("event_id (%d) non equal event_map key(%d)",
                                                ev_it->second->getEventID(), ev_it->first);
                                else if ( ev_it->first != event_id )
-                                       eFatal("eventmap key(%d) non equal event_id(%d)", 
+                                       eFatal("eventmap key(%d) non equal event_id(%d)",
                                                ev_it->first, event_id );
                        }
 #endif
                }
 next:
                                                ev_it->first, event_id );
                        }
 #endif
                }
 next:
-#if EPG_DEBUG
+#ifdef EPG_DEBUG
                if ( servicemap.first.size() != servicemap.second.size() )
                {
                        FILE *f = fopen("/hdd/event_map.txt", "w+");
                if ( servicemap.first.size() != servicemap.second.size() )
                {
                        FILE *f = fopen("/hdd/event_map.txt", "w+");
@@ -508,6 +587,15 @@ void eEPGCache::flushEPG(const uniqueEPGKey & s)
                        eventDB.erase(it);
 
                        // TODO .. search corresponding channel for removed service and remove this channel from lastupdated map
                        eventDB.erase(it);
 
                        // TODO .. search corresponding channel for removed service and remove this channel from lastupdated map
+#ifdef ENABLE_PRIVATE_EPG
+                       contentMaps::iterator it =
+                               content_time_tables.find(s);
+                       if ( it != content_time_tables.end() )
+                       {
+                               it->second.clear();
+                               content_time_tables.erase(it);
+                       }
+#endif
                }
        }
        else // clear complete EPG Cache
                }
        }
        else // clear complete EPG Cache
@@ -523,6 +611,9 @@ void eEPGCache::flushEPG(const uniqueEPGKey & s)
                        tmMap.clear();
                }
                eventDB.clear();
                        tmMap.clear();
                }
                eventDB.clear();
+#ifdef ENABLE_PRIVATE_EPG
+               content_time_tables.clear();
+#endif
                channelLastUpdated.clear();
                singleLock m(channel_map_lock);
                for (channelMapIterator it(m_knownChannels.begin()); it != m_knownChannels.end(); ++it)
                channelLastUpdated.clear();
                singleLock m(channel_map_lock);
                for (channelMapIterator it(m_knownChannels.begin()); it != m_knownChannels.end(); ++it)
@@ -542,6 +633,7 @@ void eEPGCache::cleanLoop()
 
                for (eventCache::iterator DBIt = eventDB.begin(); DBIt != eventDB.end(); DBIt++)
                {
 
                for (eventCache::iterator DBIt = eventDB.begin(); DBIt != eventDB.end(); DBIt++)
                {
+                       bool updated = false;
                        for (timeMap::iterator It = DBIt->second.second.begin(); It != DBIt->second.second.end() && It->first < now;)
                        {
                                if ( now > (It->first+It->second->getDuration()) )  // outdated normal entry (nvod references to)
                        for (timeMap::iterator It = DBIt->second.second.begin(); It != DBIt->second.second.end() && It->first < now;)
                        {
                                if ( now > (It->first+It->second->getDuration()) )  // outdated normal entry (nvod references to)
@@ -560,10 +652,37 @@ void eEPGCache::cleanLoop()
                                        delete It->second;
                                        DBIt->second.second.erase(It++);
 //                                     eDebug("[EPGC] delete old event (timeMap)");
                                        delete It->second;
                                        DBIt->second.second.erase(It++);
 //                                     eDebug("[EPGC] delete old event (timeMap)");
+                                       updated = true;
                                }
                                else
                                        ++It;
                        }
                                }
                                else
                                        ++It;
                        }
+#ifdef ENABLE_PRIVATE_EPG
+                       if ( updated )
+                       {
+                               contentMaps::iterator x =
+                                       content_time_tables.find( DBIt->first );
+                               if ( x != content_time_tables.end() )
+                               {
+                                       timeMap &tmMap = eventDB[DBIt->first].second;
+                                       for ( contentMap::iterator i = x->second.begin(); i != x->second.end(); )
+                                       {
+                                               for ( contentTimeMap::iterator it(i->second.begin());
+                                                       it != i->second.end(); )
+                                               {
+                                                       if ( tmMap.find(it->second.first) == tmMap.end() )
+                                                               i->second.erase(it++);
+                                                       else
+                                                               ++it;
+                                               }
+                                               if ( i->second.size() )
+                                                       ++i;
+                                               else
+                                                       x->second.erase(i++);
+                                       }
+                               }
+                       }
+#endif
                }
                eDebug("[EPGC] stop cleanloop");
                eDebug("[EPGC] %i bytes for cache used", eventData::CacheSize);
                }
                eDebug("[EPGC] stop cleanloop");
                eDebug("[EPGC] %i bytes for cache used", eventData::CacheSize);
@@ -609,6 +728,36 @@ void eEPGCache::gotMessage( const Message &msg )
                case Message::quit:
                        quit(0);
                        break;
                case Message::quit:
                        quit(0);
                        break;
+#ifdef ENABLE_PRIVATE_EPG
+               case Message::got_private_pid:
+               {
+                       for (channelMapIterator it(m_knownChannels.begin()); it != m_knownChannels.end(); ++it)
+                       {
+                               eDVBChannel *channel = (eDVBChannel*) it->first;
+                               channel_data *data = it->second;
+                               eDVBChannelID chid = channel->getChannelID();
+                               if ( chid.transport_stream_id.get() == msg.service.tsid &&
+                                       chid.original_network_id.get() == msg.service.onid &&
+                                       data->m_PrivatePid == -1 )
+                               {
+                                       data->m_PrevVersion = -1;
+                                       data->m_PrivatePid = msg.pid;
+                                       data->m_PrivateService = msg.service;
+                                       updateMap::iterator It = channelLastUpdated.find( channel->getChannelID() );
+                                       int update = ( It != channelLastUpdated.end() ? ( UPDATE_INTERVAL - ( (time(0)+eDVBLocalTimeHandler::getInstance()->difference()-It->second) * 1000 ) ) : ZAP_DELAY );
+                                       if (update < ZAP_DELAY)
+                                               update = ZAP_DELAY;
+                                       data->startPrivateTimer.start(update, 1);
+                                       if (update >= 60000)
+                                               eDebug("[EPGC] next private update in %i min", update/60000);
+                                       else if (update >= 1000)
+                                               eDebug("[EPGC] next private update in %i sec", update/1000);
+                                       break;
+                               }
+                       }
+                       break;
+               }
+#endif
                case Message::timeChanged:
                        cleanLoop();
                        break;
                case Message::timeChanged:
                        cleanLoop();
                        break;
@@ -620,24 +769,27 @@ void eEPGCache::gotMessage( const Message &msg )
 
 void eEPGCache::thread()
 {
 
 void eEPGCache::thread()
 {
+       hasStarted();
        nice(4);
        load();
        cleanLoop();
        nice(4);
        load();
        cleanLoop();
-       exec();
+       runLoop();
        save();
 }
 
 void eEPGCache::load()
 {
        save();
 }
 
 void eEPGCache::load()
 {
+       singleLock s(cache_lock);
        FILE *f = fopen("/hdd/epg.dat", "r");
        if (f)
        {
        FILE *f = fopen("/hdd/epg.dat", "r");
        if (f)
        {
-               unsigned char md5_saved[16];
-               unsigned char md5[16];
                int size=0;
                int cnt=0;
                int size=0;
                int cnt=0;
-               bool md5ok=false;
 #if 0
 #if 0
+               unsigned char md5_saved[16];
+               unsigned char md5[16];
+               bool md5ok=false;
+
                if (!md5_file("/hdd/epg.dat", 1, md5))
                {
                        FILE *f = fopen("/hdd/epg.dat.md5", "r");
                if (!md5_file("/hdd/epg.dat", 1, md5))
                {
                        FILE *f = fopen("/hdd/epg.dat.md5", "r");
@@ -652,9 +804,17 @@ void eEPGCache::load()
                if ( md5ok )
 #endif
                {
                if ( md5ok )
 #endif
                {
+                       unsigned int magic=0;
+                       fread( &magic, sizeof(int), 1, f);
+                       if (magic != 0x98765432)
+                       {
+                               eDebug("epg file has incorrect byte order.. dont read it");
+                               fclose(f);
+                               return;
+                       }
                        char text1[13];
                        fread( text1, 13, 1, f);
                        char text1[13];
                        fread( text1, 13, 1, f);
-                       if ( !strncmp( text1, "ENIGMA_EPG_V4", 13) )
+                       if ( !strncmp( text1, "ENIGMA_EPG_V5", 13) )
                        {
                                fread( &size, sizeof(int), 1, f);
                                while(size--)
                        {
                                fread( &size, sizeof(int), 1, f);
                                while(size--)
@@ -684,6 +844,43 @@ void eEPGCache::load()
                                }
                                eventData::load(f);
                                eDebug("%d events read from /hdd/epg.dat", cnt);
                                }
                                eventData::load(f);
                                eDebug("%d events read from /hdd/epg.dat", cnt);
+#ifdef ENABLE_PRIVATE_EPG
+                               char text2[11];
+                               fread( text2, 11, 1, f);
+                               if ( !strncmp( text2, "PRIVATE_EPG", 11) )
+                               {
+                                       size=0;
+                                       fread( &size, sizeof(int), 1, f);
+                                       while(size--)
+                                       {
+                                               int size=0;
+                                               uniqueEPGKey key;
+                                               fread( &key, sizeof(uniqueEPGKey), 1, f);
+                                               eventMap &evMap=eventDB[key].first;
+                                               fread( &size, sizeof(int), 1, f);
+                                               while(size--)
+                                               {
+                                                       int size;
+                                                       int content_id;
+                                                       fread( &content_id, sizeof(int), 1, f);
+                                                       fread( &size, sizeof(int), 1, f);
+                                                       while(size--)
+                                                       {
+                                                               time_t time1, time2;
+                                                               __u16 event_id;
+                                                               fread( &time1, sizeof(time_t), 1, f);
+                                                               fread( &time2, sizeof(time_t), 1, f);
+                                                               fread( &event_id, sizeof(__u16), 1, f);
+                                                               content_time_tables[key][content_id][time1]=std::pair<time_t, __u16>(time2, event_id);
+                                                               eventMap::iterator it =
+                                                                       evMap.find(event_id);
+                                                               if (it != evMap.end())
+                                                                       it->second->type = PRIVATE;
+                                                       }
+                                               }
+                                       }
+                               }
+#endif // ENABLE_PRIVATE_EPG
                        }
                        else
                                eDebug("[EPGC] don't read old epg database");
                        }
                        else
                                eDebug("[EPGC] don't read old epg database");
@@ -718,7 +915,9 @@ void eEPGCache::save()
        int cnt=0;
        if ( f )
        {
        int cnt=0;
        if ( f )
        {
-               const char *text = "ENIGMA_EPG_V4";
+               unsigned int magic = 0x98765432;
+               fwrite( &magic, sizeof(int), 1, f);
+               const char *text = "ENIGMA_EPG_V5";
                fwrite( text, 13, 1, f );
                int size = eventDB.size();
                fwrite( &size, sizeof(int), 1, f );
                fwrite( text, 13, 1, f );
                int size = eventDB.size();
                fwrite( &size, sizeof(int), 1, f );
@@ -739,6 +938,32 @@ void eEPGCache::save()
                }
                eDebug("%d events written to /hdd/epg.dat", cnt);
                eventData::save(f);
                }
                eDebug("%d events written to /hdd/epg.dat", cnt);
                eventData::save(f);
+#ifdef ENABLE_PRIVATE_EPG
+               const char* text3 = "PRIVATE_EPG";
+               fwrite( text3, 11, 1, f );
+               size = content_time_tables.size();
+               fwrite( &size, sizeof(int), 1, f);
+               for (contentMaps::iterator a = content_time_tables.begin(); a != content_time_tables.end(); ++a)
+               {
+                       contentMap &content_time_table = a->second;
+                       fwrite( &a->first, sizeof(uniqueEPGKey), 1, f);
+                       int size = content_time_table.size();
+                       fwrite( &size, sizeof(int), 1, f);
+                       for (contentMap::iterator i = content_time_table.begin(); i != content_time_table.end(); ++i )
+                       {
+                               int size = i->second.size();
+                               fwrite( &i->first, sizeof(int), 1, f);
+                               fwrite( &size, sizeof(int), 1, f);
+                               for ( contentTimeMap::iterator it(i->second.begin());
+                                       it != i->second.end(); ++it )
+                               {
+                                       fwrite( &it->first, sizeof(time_t), 1, f);
+                                       fwrite( &it->second.first, sizeof(time_t), 1, f);
+                                       fwrite( &it->second.second, sizeof(__u16), 1, f);
+                               }
+                       }
+               }
+#endif
                fclose(f);
 #if 0
                unsigned char md5[16];
                fclose(f);
 #if 0
                unsigned char md5[16];
@@ -757,18 +982,20 @@ void eEPGCache::save()
 
 eEPGCache::channel_data::channel_data(eEPGCache *ml)
        :cache(ml)
 
 eEPGCache::channel_data::channel_data(eEPGCache *ml)
        :cache(ml)
-       ,abortTimer(ml), zapTimer(ml)
-       ,state(0), isRunning(0), haveData(0), can_delete(1)
+       ,abortTimer(ml), zapTimer(ml),state(0)
+       ,isRunning(0), haveData(0), can_delete(1)
+       ,startPrivateTimer(ml)
 {
        CONNECT(zapTimer.timeout, eEPGCache::channel_data::startEPG);
        CONNECT(abortTimer.timeout, eEPGCache::channel_data::abortNonAvail);
 {
        CONNECT(zapTimer.timeout, eEPGCache::channel_data::startEPG);
        CONNECT(abortTimer.timeout, eEPGCache::channel_data::abortNonAvail);
+       CONNECT(startPrivateTimer.timeout, eEPGCache::channel_data::startPrivateReader);
 }
 
 bool eEPGCache::channel_data::finishEPG()
 {
        if (!isRunning)  // epg ready
        {
 }
 
 bool eEPGCache::channel_data::finishEPG()
 {
        if (!isRunning)  // epg ready
        {
-               eDebug("[EPGC] stop caching events(%d)", time(0)+eDVBLocalTimeHandler::getInstance()->difference());
+               eDebug("[EPGC] stop caching events(%ld)", time(0)+eDVBLocalTimeHandler::getInstance()->difference());
                zapTimer.start(UPDATE_INTERVAL, 1);
                eDebug("[EPGC] next update in %i min", UPDATE_INTERVAL / 60000);
                for (int i=0; i < 3; ++i)
                zapTimer.start(UPDATE_INTERVAL, 1);
                eDebug("[EPGC] next update in %i min", UPDATE_INTERVAL / 60000);
                for (int i=0; i < 3; ++i)
@@ -778,6 +1005,9 @@ bool eEPGCache::channel_data::finishEPG()
                }
                singleLock l(cache->cache_lock);
                cache->channelLastUpdated[channel->getChannelID()] = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
                }
                singleLock l(cache->cache_lock);
                cache->channelLastUpdated[channel->getChannelID()] = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
+#ifdef ENABLE_PRIVATE_EPG
+               if (seenPrivateSections.empty())
+#endif
                can_delete=1;
                return true;
        }
                can_delete=1;
                return true;
        }
@@ -786,7 +1016,7 @@ bool eEPGCache::channel_data::finishEPG()
 
 void eEPGCache::channel_data::startEPG()
 {
 
 void eEPGCache::channel_data::startEPG()
 {
-       eDebug("[EPGC] start caching events(%d)", eDVBLocalTimeHandler::getInstance()->difference()+time(0));
+       eDebug("[EPGC] start caching events(%ld)", eDVBLocalTimeHandler::getInstance()->difference()+time(0));
        state=0;
        haveData=0;
        can_delete=0;
        state=0;
        haveData=0;
        can_delete=0;
@@ -857,6 +1087,9 @@ void eEPGCache::channel_data::abortNonAvail()
                                seenSections[i].clear();
                                calcedSections[i].clear();
                        }
                                seenSections[i].clear();
                                calcedSections[i].clear();
                        }
+#ifdef ENABLE_PRIVATE_EPG
+                       if (seenPrivateSections.empty())
+#endif
                        can_delete=1;
                }
        }
                        can_delete=1;
                }
        }
@@ -909,8 +1142,14 @@ void eEPGCache::channel_data::abortEPG()
                        m_ScheduleOtherReader->stop();
                        m_ScheduleOtherConn=0;
                }
                        m_ScheduleOtherReader->stop();
                        m_ScheduleOtherConn=0;
                }
-               can_delete=1;
        }
        }
+#ifdef ENABLE_PRIVATE_EPG
+       if (m_PrivateReader)
+               m_PrivateReader->stop();
+       if (m_PrivateConn)
+               m_PrivateConn=0;
+#endif
+       can_delete=1;
 }
 
 void eEPGCache::channel_data::readData( const __u8 *data)
 }
 
 void eEPGCache::channel_data::readData( const __u8 *data)
@@ -964,7 +1203,7 @@ void eEPGCache::channel_data::readData( const __u8 *data)
                                        break;
                                default: eDebugNoNewLine("unknown");break;
                        }
                                        break;
                                default: eDebugNoNewLine("unknown");break;
                        }
-                       eDebug(" finished(%d)", time(0)+eDVBLocalTimeHandler::getInstance()->difference());
+                       eDebug(" finished(%ld)", time(0)+eDVBLocalTimeHandler::getInstance()->difference());
                        if ( reader )
                                reader->stop();
                        isRunning &= ~source;
                        if ( reader )
                                reader->stop();
                        isRunning &= ~source;
@@ -1004,7 +1243,7 @@ void eEPGCache::channel_data::readData( const __u8 *data)
        }
 }
 
        }
 }
 
-RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eventData *&result )
+RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eventData *&result, int direction)
 // if t == -1 we search the current event...
 {
        singleLock s(cache_lock);
 // if t == -1 we search the current event...
 {
        singleLock s(cache_lock);
@@ -1016,20 +1255,24 @@ RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, co
        {
                if (t==-1)
                        t = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
        {
                if (t==-1)
                        t = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
-               timeMap::iterator i = It->second.second.lower_bound(t);  // find > or equal
+               timeMap::iterator i = direction <= 0 ? It->second.second.lower_bound(t) :  // find > or equal
+                       It->second.second.upper_bound(t); // just >
                if ( i != It->second.second.end() )
                {
                if ( i != It->second.second.end() )
                {
-                       if ( i->second->getStartTime() != t )
+                       if ( direction < 0 || (direction == 0 && i->second->getStartTime() > t) )
                        {
                                timeMap::iterator x = i;
                                --x;
                                if ( x != It->second.second.end() )
                                {
                                        time_t start_time = x->second->getStartTime();
                        {
                                timeMap::iterator x = i;
                                --x;
                                if ( x != It->second.second.end() )
                                {
                                        time_t start_time = x->second->getStartTime();
-                                       if (t < start_time)
-                                               return -1;
-                                       if (t > (start_time+x->second->getDuration()))
-                                               return -1;
+                                       if (direction >= 0)
+                                       {
+                                               if (t < start_time)
+                                                       return -1;
+                                               if (t > (start_time+x->second->getDuration()))
+                                                       return -1;
+                                       }
                                        i = x;
                                }
                                else
                                        i = x;
                                }
                                else
@@ -1042,31 +1285,31 @@ RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, co
        return -1;
 }
 
        return -1;
 }
 
-RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eit_event_struct *&result )
+RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eit_event_struct *&result, int direction)
 {
        singleLock s(cache_lock);
        const eventData *data=0;
 {
        singleLock s(cache_lock);
        const eventData *data=0;
-       RESULT ret = lookupEventTime(service, t, data);
+       RESULT ret = lookupEventTime(service, t, data, direction);
        if ( !ret && data )
                result = data->get();
        return ret;
 }
 
        if ( !ret && data )
                result = data->get();
        return ret;
 }
 
-RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, Event *& result )
+RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, Event *& result, int direction)
 {
        singleLock s(cache_lock);
        const eventData *data=0;
 {
        singleLock s(cache_lock);
        const eventData *data=0;
-       RESULT ret = lookupEventTime(service, t, data);
+       RESULT ret = lookupEventTime(service, t, data, direction);
        if ( !ret && data )
                result = new Event((uint8_t*)data->get());
        return ret;
 }
 
        if ( !ret && data )
                result = new Event((uint8_t*)data->get());
        return ret;
 }
 
-RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, ePtr<eServiceEvent> &result )
+RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, ePtr<eServiceEvent> &result, int direction)
 {
        singleLock s(cache_lock);
        const eventData *data=0;
 {
        singleLock s(cache_lock);
        const eventData *data=0;
-       RESULT ret = lookupEventTime(service, t, data);
+       RESULT ret = lookupEventTime(service, t, data, direction);
        if ( !ret && data )
        {
                Event ev((uint8_t*)data->get());
        if ( !ret && data )
        {
                Event ev((uint8_t*)data->get());
@@ -1218,6 +1461,9 @@ void fillTuple(PyObject *tuple, char *argstring, int argcount, PyObject *service
                bool inc_refcount=false;
                switch(argstring[pos])
                {
                bool inc_refcount=false;
                switch(argstring[pos])
                {
+                       case '0': // PyLong 0
+                               tmp = PyLong_FromLong(0);
+                               break;
                        case 'I': // Event Id
                                tmp = ptr ? PyLong_FromLong(ptr->getEventId()) : NULL;
                                break;
                        case 'I': // Event Id
                                tmp = ptr ? PyLong_FromLong(ptr->getEventId()) : NULL;
                                break;
@@ -1264,44 +1510,53 @@ PyObject *handleEvent(ePtr<eServiceEvent> &ptr, PyObject *dest_list, char* argst
        if (convertFunc)
        {
                fillTuple(convertFuncArgs, argstring, argcount, service, ptr, nowTime, service_name);
        if (convertFunc)
        {
                fillTuple(convertFuncArgs, argstring, argcount, service, ptr, nowTime, service_name);
-               PyObject *result = PyEval_CallObject(convertFunc, convertFuncArgs);
+               PyObject *result = PyObject_CallObject(convertFunc, convertFuncArgs);
                if (result == NULL)
                {
                if (result == NULL)
                {
+                       if (service_name)
+                               Py_DECREF(service_name);
                        if (nowTime)
                                Py_DECREF(nowTime);
                        Py_DECREF(convertFuncArgs);
                        if (nowTime)
                                Py_DECREF(nowTime);
                        Py_DECREF(convertFuncArgs);
+                       Py_DECREF(dest_list);
                        return result;
                }
                PyList_Append(dest_list, result);
                        return result;
                }
                PyList_Append(dest_list, result);
+               Py_DECREF(result);
        }
        else
        {
                PyObject *tuple = PyTuple_New(argcount);
                fillTuple(tuple, argstring, argcount, service, ptr, nowTime, service_name);
                PyList_Append(dest_list, tuple);
        }
        else
        {
                PyObject *tuple = PyTuple_New(argcount);
                fillTuple(tuple, argstring, argcount, service, ptr, nowTime, service_name);
                PyList_Append(dest_list, tuple);
+               Py_DECREF(tuple);
        }
        return 0;
 }
 
        }
        return 0;
 }
 
-// here we get a list with tuples
-// first tuple entry is the servicereference
-// the second is the type of query (0 = time, 1 = event_id)
-// the third
-//             when type is eventid it is the event_id
-//             when type is time then it is the start_time ( 0 for now_time )
-// the fourth is the end_time .. ( optional )
-
-/* argv is a python string
-   I = Event Id
-   B = Event Begin Time
-   D = Event Duration
-   T = Event Title
-   S = Event Short Description
-   E = Event Extended Description
-   C = Current Time
-   R = Service Reference
-   N = Service Name
-*/
+// here we get a python list
+// the first entry in the list is a python string to specify the format of the returned tuples (in a list)
+//   0 = PyLong(0)
+//   I = Event Id
+//   B = Event Begin Time
+//   D = Event Duration
+//   T = Event Title
+//   S = Event Short Description
+//   E = Event Extended Description
+//   C = Current Time
+//   R = Service Reference
+//   N = Service Name
+// then for each service follows a tuple
+//   first tuple entry is the servicereference (as string... use the ref.toString() function)
+//   the second is the type of query
+//     2 = event_id
+//    -1 = event before given start_time
+//     0 = event intersects given start_time
+//    +1 = event after given start_time
+//   the third
+//      when type is eventid it is the event_id
+//      when type is time then it is the start_time ( 0 for now_time )
+//   the fourth is the end_time .. ( optional .. for query all events in time range)
 
 PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
 {
 
 PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
 {
@@ -1362,6 +1617,7 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                PyObject *item=PyList_GET_ITEM(list, listIt++); // borrowed reference!
                if (PyTuple_Check(item))
                {
                PyObject *item=PyList_GET_ITEM(list, listIt++); // borrowed reference!
                if (PyTuple_Check(item))
                {
+                       bool service_changed=false;
                        int type=0;
                        long event_id=-1;
                        time_t stime=-1;
                        int type=0;
                        long event_id=-1;
                        time_t stime=-1;
@@ -1369,46 +1625,27 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                        int tupleSize=PyTuple_Size(item);
                        int tupleIt=0;
                        PyObject *service=NULL;
                        int tupleSize=PyTuple_Size(item);
                        int tupleIt=0;
                        PyObject *service=NULL;
-                       PyObject *service_name=NULL;
-                       eServiceReference ref;
-                       char *refstr=NULL;
-                       while(tupleSize > tupleIt)
+                       while(tupleSize > tupleIt)  // parse query args
                        {
                                PyObject *entry=PyTuple_GET_ITEM(item, tupleIt); // borrowed reference!
                                switch(tupleIt++)
                                {
                                        case 0:
                                        {
                        {
                                PyObject *entry=PyTuple_GET_ITEM(item, tupleIt); // borrowed reference!
                                switch(tupleIt++)
                                {
                                        case 0:
                                        {
-                                               refstr = PyString_AS_STRING(entry);
-                                               ref = eServiceReference(refstr);
-                                               if (must_get_service_name)
+                                               if (!PyString_Check(entry))
                                                {
                                                {
-                                                       service = entry;
-                                                       ePtr<iStaticServiceInformation> sptr;
-                                                       eServiceCenterPtr ptr;
-                                                       eServiceCenter::getPrivInstance(ptr);
-                                                       if (ptr)
-                                                       {
-                                                               ptr->info(ref, sptr);
-                                                               if (sptr)
-                                                               {
-                                                                       std::string name;
-                                                                       sptr->getName(ref, name);
-                                                                       if (name.length())
-                                                                               service_name = PyString_FromString(name.c_str());
-                                                               }
-                                                       }
-                                                       if (!service_name)
-                                                               service_name = PyString_FromString("<n/a>");
+                                                       eDebug("tuple entry 0 is no a string");
+                                                       goto skip_entry;
                                                }
                                                }
+                                               service = entry;
                                                break;
                                        }
                                        case 1:
                                                type=PyInt_AsLong(entry);
                                                break;
                                        }
                                        case 1:
                                                type=PyInt_AsLong(entry);
-                                               if (type < 0 || type > 1)
+                                               if (type < -1 || type > 2)
                                                {
                                                        eDebug("unknown type %d", type);
                                                {
                                                        eDebug("unknown type %d", type);
-                                                       goto nextListEntry;
+                                                       goto skip_entry;
                                                }
                                                break;
                                        case 2:
                                                }
                                                break;
                                        case 2:
@@ -1422,44 +1659,86 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                                                break;
                                }
                        }
                                                break;
                                }
                        }
-                       if (refstr)
+                       eServiceReference ref(PyString_AS_STRING(service));
+                       if (ref.type != eServiceReference::idDVB)
                        {
                        {
-                               if (minutes)
+                               eDebug("service reference for epg query is not valid");
+                               continue;
+                       }
+
+                       // redirect subservice querys to parent service
+                       eServiceReferenceDVB &dvb_ref = (eServiceReferenceDVB&)ref;
+                       if (dvb_ref.getParentTransportStreamID().get()) // linkage subservice
+                       {
+                               eServiceCenterPtr service_center;
+                               if (!eServiceCenter::getPrivInstance(service_center))
                                {
                                {
-                                       Lock();
-                                       if (!startTimeQuery(ref, stime, minutes))
+                                       dvb_ref.setTransportStreamID( dvb_ref.getParentTransportStreamID() );
+                                       dvb_ref.setServiceID( dvb_ref.getParentServiceID() );
+                                       dvb_ref.setParentTransportStreamID(eTransportStreamID(0));
+                                       dvb_ref.setParentServiceID(eServiceID(0));
+                                       dvb_ref.name="";
+                                       service = PyString_FromString(dvb_ref.toString().c_str());
+                                       service_changed = true;
+                               }
+                       }
+
+                       PyObject *service_name=NULL;
+                       if (must_get_service_name)
+                       {
+                               ePtr<iStaticServiceInformation> sptr;
+                               eServiceCenterPtr service_center;
+                               eServiceCenter::getPrivInstance(service_center);
+                               if (service_center)
+                               {
+                                       service_center->info(ref, sptr);
+                                       if (sptr)
                                        {
                                        {
-                                               ePtr<eServiceEvent> ptr;
-                                               while (!getNextTimeEntry(ptr))
-                                               {
-                                                       PyObject *ret = handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs);
-                                                       if (ret)
-                                                               return ret;
-                                               }
+                                               std::string name;
+                                               sptr->getName(ref, name);
+                                               if (name.length())
+                                                       service_name = PyString_FromString(name.c_str());
                                        }
                                        }
-                                       else
-                                               eDebug("startTimeQuery failed %s", refstr);
-                                       Unlock();
                                }
                                }
-                               else
+                               if (!service_name)
+                                       service_name = PyString_FromString("<n/a>");
+                       }
+                       if (minutes)
+                       {
+                               Lock();
+                               if (!startTimeQuery(ref, stime, minutes))
                                {
                                        ePtr<eServiceEvent> ptr;
                                {
                                        ePtr<eServiceEvent> ptr;
-                                       if (stime)
+                                       while (!getNextTimeEntry(ptr))
                                        {
                                        {
-                                               if (type == 0)
-                                                       lookupEventTime(ref, stime, ptr);
-                                               else // type == 1
-                                                       lookupEventId(ref, event_id, ptr);
+                                               PyObject *ret = handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs);
+                                               if (ret)
+                                                       return ret;
                                        }
                                        }
-                                       PyObject *ret = handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs);
-                                       if (ret)
-                                               return ret;
                                }
                                }
+                               Unlock();
                        }
                        }
-nextListEntry:
+                       else
+                       {
+                               ePtr<eServiceEvent> ptr;
+                               if (stime)
+                               {
+                                       if (type == 2)
+                                               lookupEventId(ref, event_id, ptr);
+                                       else
+                                               lookupEventTime(ref, stime, ptr, type);
+                               }
+                               PyObject *ret = handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs);
+                               if (ret)
+                                       return ret;
+                       }
+                       if (service_changed)
+                               Py_DECREF(service);
                        if (service_name)
                                Py_DECREF(service_name);
                }
                        if (service_name)
                                Py_DECREF(service_name);
                }
+skip_entry:
+               ;
        }
        if (convertFuncArgs)
                Py_DECREF(convertFuncArgs);
        }
        if (convertFuncArgs)
                Py_DECREF(convertFuncArgs);
@@ -1467,3 +1746,704 @@ nextListEntry:
                Py_DECREF(nowTime);
        return dest_list;
 }
                Py_DECREF(nowTime);
        return dest_list;
 }
+
+void fillTuple2(PyObject *tuple, const char *argstring, int argcount, eventData *evData, ePtr<eServiceEvent> &ptr, PyObject *service_name, PyObject *service_reference)
+{
+       PyObject *tmp=NULL;
+       int pos=0;
+       while(pos < argcount)
+       {
+               bool inc_refcount=false;
+               switch(argstring[pos])
+               {
+                       case '0': // PyLong 0
+                               tmp = PyLong_FromLong(0);
+                               break;
+                       case 'I': // Event Id
+                               tmp = PyLong_FromLong(evData->getEventID());
+                               break;
+                       case 'B': // Event Begin Time
+                               if (ptr)
+                                       tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : NULL;
+                               else
+                                       tmp = PyLong_FromLong(evData->getStartTime());
+                               break;
+                       case 'D': // Event Duration
+                               if (ptr)
+                                       tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : NULL;
+                               else
+                                       tmp = PyLong_FromLong(evData->getDuration());
+                               break;
+                       case 'T': // Event Title
+                               tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : NULL;
+                               break;
+                       case 'S': // Event Short Description
+                               tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : NULL;
+                               break;
+                       case 'E': // Event Extended Description
+                               tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : NULL;
+                               break;
+                       case 'R': // service reference string
+                               tmp = service_reference;
+                               inc_refcount = true;
+                               break;
+                       case 'N': // service name
+                               tmp = service_name;
+                               inc_refcount = true;
+                               break;
+               }
+               if (!tmp)
+               {
+                       tmp = Py_None;
+                       inc_refcount = true;
+               }
+               if (inc_refcount)
+                       Py_INCREF(tmp);
+               PyTuple_SET_ITEM(tuple, pos++, tmp);
+       }
+}
+
+// here we get a python tuple
+// the first entry in the tuple is a python string to specify the format of the returned tuples (in a list)
+//   I = Event Id
+//   B = Event Begin Time
+//   D = Event Duration
+//   T = Event Title
+//   S = Event Short Description
+//   E = Event Extended Description
+//   R = Service Reference
+//   N = Service Name
+//  the second tuple entry is the MAX matches value
+//  the third tuple entry is the type of query
+//     0 = search for similar broadcastings (SIMILAR_BROADCASTINGS_SEARCH)
+//     1 = search events with exactly title name (EXAKT_TITLE_SEARCH)
+//     2 = search events with text in title name (PARTIAL_TITLE_SEARCH)
+//  when type is 0 (SIMILAR_BROADCASTINGS_SEARCH)
+//   the fourth is the servicereference string
+//   the fifth is the eventid
+//  when type is 1 or 2 (EXAKT_TITLE_SEARCH or PARTIAL_TITLE_SEARCH)
+//   the fourth is the search text
+//   the fifth is
+//     0 = case sensitive (CASE_CHECK)
+//     1 = case insensitive (NO_CASECHECK)
+
+PyObject *eEPGCache::search(PyObject *arg)
+{
+       PyObject *ret = 0;
+       int descridx = -1;
+       __u32 descr[512];
+       int eventid = -1;
+       const char *argstring=0;
+       char *refstr=0;
+       int argcount=0;
+       int querytype=-1;
+       bool needServiceEvent=false;
+       int maxmatches=0;
+
+       if (PyTuple_Check(arg))
+       {
+               int tuplesize=PyTuple_Size(arg);
+               if (tuplesize > 0)
+               {
+                       PyObject *obj = PyTuple_GET_ITEM(arg,0);
+                       if (PyString_Check(obj))
+                       {
+                               argcount = PyString_GET_SIZE(obj);
+                               argstring = PyString_AS_STRING(obj);
+                               for (int i=0; i < argcount; ++i)
+                                       switch(argstring[i])
+                                       {
+                                       case 'S':
+                                       case 'E':
+                                       case 'T':
+                                               needServiceEvent=true;
+                                       default:
+                                               break;
+                                       }
+                       }
+                       else
+                       {
+                               PyErr_SetString(PyExc_StandardError,
+                                       "type error");
+                               eDebug("tuple arg 0 is not a string");
+                               return NULL;
+                       }
+               }
+               if (tuplesize > 1)
+                       maxmatches = PyLong_AsLong(PyTuple_GET_ITEM(arg, 1));
+               if (tuplesize > 2)
+               {
+                       querytype = PyLong_AsLong(PyTuple_GET_ITEM(arg, 2));
+                       if (tuplesize > 4 && querytype == 0)
+                       {
+                               PyObject *obj = PyTuple_GET_ITEM(arg, 3);
+                               if (PyString_Check(obj))
+                               {
+                                       refstr = PyString_AS_STRING(obj);
+                                       eServiceReferenceDVB ref(refstr);
+                                       if (ref.valid())
+                                       {
+                                               eventid = PyLong_AsLong(PyTuple_GET_ITEM(arg, 4));
+                                               singleLock s(cache_lock);
+                                               const eventData *evData = 0;
+                                               lookupEventId(ref, eventid, evData);
+                                               if (evData)
+                                               {
+                                                       __u8 *data = evData->EITdata;
+                                                       int tmp = evData->ByteSize-12;
+                                                       __u32 *p = (__u32*)(data+12);
+                                                               // search short and extended event descriptors
+                                                       while(tmp>0)
+                                                       {
+                                                               __u32 crc = *p++;
+                                                               descriptorMap::iterator it =
+                                                                       eventData::descriptors.find(crc);
+                                                               if (it != eventData::descriptors.end())
+                                                               {
+                                                                       __u8 *descr_data = it->second.second;
+                                                                       switch(descr_data[0])
+                                                                       {
+                                                                       case 0x4D ... 0x4E:
+                                                                               descr[++descridx]=crc;
+                                                                       default:
+                                                                               break;
+                                                                       }
+                                                               }
+                                                               tmp-=4;
+                                                       }
+                                               }
+                                               if (descridx<0)
+                                                       eDebug("event not found");
+                                       }
+                                       else
+                                       {
+                                               PyErr_SetString(PyExc_StandardError,
+                                                       "type error");
+                                               eDebug("tuple arg 4 is not a valid service reference string");
+                                               return NULL;
+                                       }
+                               }
+                               else
+                               {
+                                       PyErr_SetString(PyExc_StandardError,
+                                       "type error");
+                                       eDebug("tuple arg 4 is not a string");
+                                       return NULL;
+                               }
+                       }
+                       else if (tuplesize > 4 && (querytype == 1 || querytype == 2) )
+                       {
+                               PyObject *obj = PyTuple_GET_ITEM(arg, 3);
+                               if (PyString_Check(obj))
+                               {
+                                       int casetype = PyLong_AsLong(PyTuple_GET_ITEM(arg, 4));
+                                       const char *str = PyString_AS_STRING(obj);
+                                       int textlen = PyString_GET_SIZE(obj);
+                                       if (querytype == 1)
+                                               eDebug("lookup for events with '%s' as title(%s)", str, casetype?"ignore case":"case sensitive");
+                                       else
+                                               eDebug("lookup for events with '%s' in title(%s)", str, casetype?"ignore case":"case sensitive");
+                                       singleLock s(cache_lock);
+                                       for (descriptorMap::iterator it(eventData::descriptors.begin());
+                                               it != eventData::descriptors.end() && descridx < 511; ++it)
+                                       {
+                                               __u8 *data = it->second.second;
+                                               if ( data[0] == 0x4D ) // short event descriptor
+                                               {
+                                                       int title_len = data[5];
+                                                       if ( querytype == 1 )
+                                                       {
+                                                               if (title_len > textlen)
+                                                                       continue;
+                                                               else if (title_len < textlen)
+                                                                       continue;
+                                                               if ( casetype )
+                                                               {
+                                                                       if ( !strncasecmp((const char*)data+6, str, title_len) )
+                                                                       {
+//                                                                             std::string s((const char*)data+6, title_len);
+//                                                                             eDebug("match1 %s %s", str, s.c_str() );
+                                                                               descr[++descridx] = it->first;
+                                                                       }
+                                                               }
+                                                               else if ( !strncmp((const char*)data+6, str, title_len) )
+                                                               {
+//                                                                     std::string s((const char*)data+6, title_len);
+//                                                                     eDebug("match2 %s %s", str, s.c_str() );
+                                                                       descr[++descridx] = it->first;
+                                                               }
+                                                       }
+                                                       else
+                                                       {
+                                                               int idx=0;
+                                                               while((title_len-idx) >= textlen)
+                                                               {
+                                                                       if (casetype)
+                                                                       {
+                                                                               if (!strncasecmp((const char*)data+6+idx, str, textlen) )
+                                                                               {
+                                                                                       descr[++descridx] = it->first;
+//                                                                                     std::string s((const char*)data+6, title_len);
+//                                                                                     eDebug("match 3 %s %s", str, s.c_str() );
+                                                                                       break;
+                                                                               }
+                                                                               else if (!strncmp((const char*)data+6+idx, str, textlen) )
+                                                                               {
+                                                                                       descr[++descridx] = it->first;
+//                                                                                     std::string s((const char*)data+6, title_len);
+//                                                                                     eDebug("match 4 %s %s", str, s.c_str() );
+                                                                                       break;
+                                                                               }
+                                                                       }
+                                                                       ++idx;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                               else
+                               {
+                                       PyErr_SetString(PyExc_StandardError,
+                                               "type error");
+                                       eDebug("tuple arg 4 is not a string");
+                                       return NULL;
+                               }
+                       }
+                       else
+                       {
+                               PyErr_SetString(PyExc_StandardError,
+                                       "type error");
+                               eDebug("tuple arg 3(%d) is not a known querytype(0, 1, 2)", querytype);
+                               return NULL;
+                       }
+               }
+               else
+               {
+                       PyErr_SetString(PyExc_StandardError,
+                               "type error");
+                       eDebug("not enough args in tuple");
+                       return NULL;
+               }
+       }
+       else
+       {
+               PyErr_SetString(PyExc_StandardError,
+                       "type error");
+               eDebug("arg 0 is not a tuple");
+               return NULL;
+       }
+
+       if (descridx > -1)
+       {
+               int maxcount=maxmatches;
+               eServiceReferenceDVB ref(refstr?refstr:"");
+               // ref is only valid in SIMILAR_BROADCASTING_SEARCH
+               // in this case we start searching with the base service
+               bool first = ref.valid() ? true : false;
+               singleLock s(cache_lock);
+               eventCache::iterator cit(ref.valid() ? eventDB.find(ref) : eventDB.begin());
+               while(cit != eventDB.end() && maxcount)
+               {
+                       if ( ref.valid() && !first && cit->first == ref )
+                       {
+                               // do not scan base service twice ( only in SIMILAR BROADCASTING SEARCH )
+                               ++cit;
+                               continue;
+                       }
+                       PyObject *service_name=0;
+                       PyObject *service_reference=0;
+                       timeMap &evmap = cit->second.second;
+                       // check all events
+                       for (timeMap::iterator evit(evmap.begin()); evit != evmap.end() && maxcount; ++evit)
+                       {
+                               if (evit->second->getEventID() == eventid)
+                                       continue;
+                               __u8 *data = evit->second->EITdata;
+                               int tmp = evit->second->ByteSize-12;
+                               __u32 *p = (__u32*)(data+12);
+                               // check if any of our descriptor used by this event
+                               int cnt=-1;
+                               while(tmp>0)
+                               {
+                                       __u32 crc32 = *p++;
+                                       for ( int i=0; i <= descridx; ++i)
+                                       {
+                                               if (descr[i] == crc32)  // found...
+                                                       ++cnt;
+                                       }
+                                       tmp-=4;
+                               }
+                               if ( (querytype == 0 && cnt == descridx) ||
+                                        ((querytype == 1 || querytype == 2) && cnt != -1) )
+                               {
+                                       const uniqueEPGKey &service = cit->first;
+                                       eServiceReference ref =
+                                               eDVBDB::getInstance()->searchReference(service.tsid, service.onid, service.sid);
+                                       if (ref.valid())
+                                       {
+                                       // create servive event
+                                               ePtr<eServiceEvent> ptr;
+                                               if (needServiceEvent)
+                                               {
+                                                       lookupEventId(ref, evit->first, ptr);
+                                                       if (!ptr)
+                                                               eDebug("event not found !!!!!!!!!!!");
+                                               }
+                                       // create service name
+                                               if (!service_name && strchr(argstring,'N'))
+                                               {
+                                                       ePtr<iStaticServiceInformation> sptr;
+                                                       eServiceCenterPtr service_center;
+                                                       eServiceCenter::getPrivInstance(service_center);
+                                                       if (service_center)
+                                                       {
+                                                               service_center->info(ref, sptr);
+                                                               if (sptr)
+                                                               {
+                                                                       std::string name;
+                                                                       sptr->getName(ref, name);
+                                                                       if (name.length())
+                                                                               service_name = PyString_FromString(name.c_str());
+                                                               }
+                                                       }
+                                                       if (!service_name)
+                                                               service_name = PyString_FromString("<n/a>");
+                                               }
+                                       // create servicereference string
+                                               if (!service_reference && strchr(argstring,'R'))
+                                                       service_reference = PyString_FromString(ref.toString().c_str());
+                                       // create list
+                                               if (!ret)
+                                                       ret = PyList_New(0);
+                                       // create tuple
+                                               PyObject *tuple = PyTuple_New(argcount);
+                                       // fill tuple
+                                               fillTuple2(tuple, argstring, argcount, evit->second, ptr, service_name, service_reference);
+                                               PyList_Append(ret, tuple);
+                                               Py_DECREF(tuple);
+                                               --maxcount;
+                                       }
+                               }
+                       }
+                       if (service_name)
+                               Py_DECREF(service_name);
+                       if (service_reference)
+                               Py_DECREF(service_reference);
+                       if (first)
+                       {
+                               // now start at first service in epgcache database ( only in SIMILAR BROADCASTING SEARCH )
+                               first=false;
+                               cit=eventDB.begin();
+                       }
+                       else
+                               ++cit;
+               }
+       }
+
+       if (!ret)
+       {
+               Py_INCREF(Py_None);
+               ret=Py_None;
+       }
+
+       return ret;
+}
+
+#ifdef ENABLE_PRIVATE_EPG
+#include <dvbsi++/descriptor_tag.h>
+#include <dvbsi++/unknown_descriptor.h>
+#include <dvbsi++/private_data_specifier_descriptor.h>
+
+void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler)
+{
+       ePtr<eTable<ProgramMapSection> > ptr;
+       if (!pmthandler->getPMT(ptr) && ptr)
+       {
+               std::vector<ProgramMapSection*>::const_iterator i;
+               for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i)
+               {
+                       const ProgramMapSection &pmt = **i;
+
+                       ElementaryStreamInfoConstIterator es;
+                       for (es = pmt.getEsInfo()->begin(); es != pmt.getEsInfo()->end(); ++es)
+                       {
+                               int tmp=0;
+                               switch ((*es)->getType())
+                               {
+                               case 0x05: // private
+                                       for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin();
+                                               desc != (*es)->getDescriptors()->end(); ++desc)
+                                       {
+                                               switch ((*desc)->getTag())
+                                               {
+                                                       case PRIVATE_DATA_SPECIFIER_DESCRIPTOR:
+                                                               if (((PrivateDataSpecifierDescriptor*)(*desc))->getPrivateDataSpecifier() == 190)
+                                                                       tmp |= 1;
+                                                               break;
+                                                       case 0x90:
+                                                       {
+                                                               UnknownDescriptor *descr = (UnknownDescriptor*)*desc;
+                                                               int descr_len = descr->getLength();
+                                                               if (descr_len == 4)
+                                                               {
+                                                                       uint8_t data[descr_len+2];
+                                                                       descr->writeToBuffer(data);
+                                                                       if ( !data[2] && !data[3] && data[4] == 0xFF && data[5] == 0xFF )
+                                                                               tmp |= 2;
+                                                               }
+                                                               break;
+                                                       }
+                                                       default:
+                                                               break;
+                                               }
+                                       }
+                               default:
+                                       break;
+                               }
+                               if (tmp==3)
+                               {
+                                       eServiceReferenceDVB ref;
+                                       if (!pmthandler->getServiceReference(ref))
+                                       {
+                                               int pid = (*es)->getPid();
+                                               messages.send(Message(Message::got_private_pid, ref, pid));
+                                               return;
+                                       }
+                               }
+                       }
+               }
+       }
+       else
+               eDebug("PMTready but no pmt!!");
+}
+
+struct date_time
+{
+       __u8 data[5];
+       time_t tm;
+       date_time( const date_time &a )
+       {
+               memcpy(data, a.data, 5);
+               tm = a.tm;
+       }
+       date_time( const __u8 data[5])
+       {
+               memcpy(this->data, data, 5);
+               tm = parseDVBtime(data[0], data[1], data[2], data[3], data[4]);
+       }
+       date_time()
+       {
+       }
+       const __u8& operator[](int pos) const
+       {
+               return data[pos];
+       }
+};
+
+struct less_datetime
+{
+       bool operator()( const date_time &a, const date_time &b ) const
+       {
+               return abs(a.tm-b.tm) < 360 ? false : a.tm < b.tm;
+       }
+};
+
+void eEPGCache::privateSectionRead(const uniqueEPGKey &current_service, const __u8 *data)
+{
+       contentMap &content_time_table = content_time_tables[current_service];
+       singleLock s(cache_lock);
+       std::map< date_time, std::list<uniqueEPGKey>, less_datetime > start_times;
+       eventMap &evMap = eventDB[current_service].first;
+       timeMap &tmMap = eventDB[current_service].second;
+       int ptr=8;
+       int content_id = data[ptr++] << 24;
+       content_id |= data[ptr++] << 16;
+       content_id |= data[ptr++] << 8;
+       content_id |= data[ptr++];
+
+       contentTimeMap &time_event_map =
+               content_time_table[content_id];
+       for ( contentTimeMap::iterator it( time_event_map.begin() );
+               it != time_event_map.end(); ++it )
+       {
+               eventMap::iterator evIt( evMap.find(it->second.second) );
+               if ( evIt != evMap.end() )
+               {
+                       delete evIt->second;
+                       evMap.erase(evIt);
+               }
+               tmMap.erase(it->second.first);
+       }
+       time_event_map.clear();
+
+       __u8 duration[3];
+       memcpy(duration, data+ptr, 3);
+       ptr+=3;
+       int duration_sec =
+               fromBCD(duration[0])*3600+fromBCD(duration[1])*60+fromBCD(duration[2]);
+
+       const __u8 *descriptors[65];
+       const __u8 **pdescr = descriptors;
+
+       int descriptors_length = (data[ptr++]&0x0F) << 8;
+       descriptors_length |= data[ptr++];
+       while ( descriptors_length > 0 )
+       {
+               int descr_type = data[ptr];
+               int descr_len = data[ptr+1];
+               descriptors_length -= (descr_len+2);
+               if ( descr_type == 0xf2 )
+               {
+                       ptr+=2;
+                       int tsid = data[ptr++] << 8;
+                       tsid |= data[ptr++];
+                       int onid = data[ptr++] << 8;
+                       onid |= data[ptr++];
+                       int sid = data[ptr++] << 8;
+                       sid |= data[ptr++];
+
+// WORKAROUND for wrong transmitted epg data
+                       if ( onid == 0x85 && tsid == 0x11 && sid == 0xd3 )  // premiere sends wrong tsid here
+                               tsid = 0x1;
+                       else if ( onid == 0x85 && tsid == 0x3 && sid == 0xf5 ) // premiere sends wrong sid here
+                               sid = 0xdc;
+////////////////////////////////////////////
+                               
+                       uniqueEPGKey service( sid, onid, tsid );
+                       descr_len -= 6;
+                       while( descr_len > 0 )
+                       {
+                               __u8 datetime[5];
+                               datetime[0] = data[ptr++];
+                               datetime[1] = data[ptr++];
+                               int tmp_len = data[ptr++];
+                               descr_len -= 3;
+                               while( tmp_len > 0 )
+                               {
+                                       memcpy(datetime+2, data+ptr, 3);
+                                       ptr+=3;
+                                       descr_len -= 3;
+                                       tmp_len -= 3;
+                                       start_times[datetime].push_back(service);
+                               }
+                       }
+               }
+               else
+               {
+                       *pdescr++=data+ptr;
+                       ptr += 2;
+                       ptr += descr_len;
+               }
+       }
+       __u8 event[4098];
+       eit_event_struct *ev_struct = (eit_event_struct*) event;
+       ev_struct->running_status = 0;
+       ev_struct->free_CA_mode = 1;
+       memcpy(event+7, duration, 3);
+       ptr = 12;
+       const __u8 **d=descriptors;
+       while ( d < pdescr )
+       {
+               memcpy(event+ptr, *d, ((*d)[1])+2);
+               ptr+=(*d++)[1];
+               ptr+=2;
+       }
+       for ( std::map< date_time, std::list<uniqueEPGKey> >::iterator it(start_times.begin()); it != start_times.end(); ++it )
+       {
+               time_t now = eDVBLocalTimeHandler::getInstance()->nowTime();
+               if ( (it->first.tm + duration_sec) < now )
+                       continue;
+               memcpy(event+2, it->first.data, 5);
+               int bptr = ptr;
+               int cnt=0;
+               for (std::list<uniqueEPGKey>::iterator i(it->second.begin()); i != it->second.end(); ++i)
+               {
+                       event[bptr++] = 0x4A;
+                       __u8 *len = event+(bptr++);
+                       event[bptr++] = (i->tsid & 0xFF00) >> 8;
+                       event[bptr++] = (i->tsid & 0xFF);
+                       event[bptr++] = (i->onid & 0xFF00) >> 8;
+                       event[bptr++] = (i->onid & 0xFF);
+                       event[bptr++] = (i->sid & 0xFF00) >> 8;
+                       event[bptr++] = (i->sid & 0xFF);
+                       event[bptr++] = 0xB0;
+                       bptr += sprintf((char*)(event+bptr), "Option %d", ++cnt);
+                       *len = ((event+bptr) - len)-1;
+               }
+               int llen = bptr - 12;
+               ev_struct->descriptors_loop_length_hi = (llen & 0xF00) >> 8;
+               ev_struct->descriptors_loop_length_lo = (llen & 0xFF);
+
+               time_t stime = it->first.tm;
+               while( tmMap.find(stime) != tmMap.end() )
+                       ++stime;
+               event[6] += (stime - it->first.tm);
+               __u16 event_id = 0;
+               while( evMap.find(event_id) != evMap.end() )
+                       ++event_id;
+               event[0] = (event_id & 0xFF00) >> 8;
+               event[1] = (event_id & 0xFF);
+               time_event_map[it->first.tm]=std::pair<time_t, __u16>(stime, event_id);
+               eventData *d = new eventData( ev_struct, bptr, eEPGCache::PRIVATE );
+               evMap[event_id] = d;
+               tmMap[stime] = d;
+       }
+}
+
+void eEPGCache::channel_data::startPrivateReader()
+{
+       eDVBSectionFilterMask mask;
+       memset(&mask, 0, sizeof(mask));
+       mask.pid = m_PrivatePid;
+       mask.flags = eDVBSectionFilterMask::rfCRC;
+       mask.data[0] = 0xA0;
+       mask.mask[0] = 0xFF;
+       eDebug("start privatefilter for pid %04x and version %d", m_PrivatePid, m_PrevVersion);
+       if (m_PrevVersion != -1)
+       {
+               mask.data[3] = m_PrevVersion << 1;
+               mask.mask[3] = 0x3E;
+               mask.mode[3] = 0x3E;
+       }
+       seenPrivateSections.clear();
+       m_PrivateReader->connectRead(slot(*this, &eEPGCache::channel_data::readPrivateData), m_PrivateConn);
+       m_PrivateReader->start(mask);
+}
+
+void eEPGCache::channel_data::readPrivateData( const __u8 *data)
+{
+       if (!data)
+               eDebug("get Null pointer from section reader !!");
+       else
+       {
+               if ( seenPrivateSections.find( data[6] ) == seenPrivateSections.end() )
+               {
+#ifdef NEED_DEMUX_WORKAROUND
+                       int version = data[5];
+                       version = ((version & 0x3E) >> 1);
+                       can_delete = 0;
+                       if ( m_PrevVersion != version )
+                       {
+                               cache->privateSectionRead(m_PrivateService, data);
+                               seenPrivateSections.insert(data[6]);
+                       }
+                       else
+                               eDebug("ignore");
+#else
+                       can_delete = 0;
+                       cache->privateSectionRead(m_PrivateService, data);
+                       seenPrivateSections.insert(data[6]);
+#endif
+               }
+               if ( seenPrivateSections.size() == (unsigned int)(data[7] + 1) )
+               {
+                       eDebug("[EPGC] private finished");
+                       if (!isRunning)
+                               can_delete = 1;
+                       m_PrevVersion = (data[5] & 0x3E) >> 1;
+                       startPrivateReader();
+               }
+       }
+}
+
+#endif // ENABLE_PRIVATE_EPG