Ticket #363: dbox2.patch

dbox2epg.cpp

@@ -67 +67 @@
         // Wait before processing
         usleep(waitTime);
 
-        RequestEPG(m_requestedChannel);
-        m_pendingRequest = false;
+        // Only grab the EPG for this channel if useonairguide is set to 1
+        // Qstring::compare returns zero if both strings are equal
+
+        if (!QString::compare( CheckUseOnAirGuide(), "1") )
+                {
+                        RequestEPG(m_requestedChannel);
+                        m_pendingRequest = false;
+                }
+
+        else
+                {
+                 // do nothing
+                printf (QString("Skipping EPG grab for channel %1 \n").arg(m_requestedChannel));
+                EPGFinished();
+                }
+
     }
 #ifdef DEBUG_DBOX2EPG
     VERBOSE(VB_IMPORTANT, QString("DBOXEPG#%1: Exiting Thread....").arg(m_cardid));
@@ -244 +258 @@
     } 
     return "";
 }
+QString DBox2EPG::CheckUseOnAirGuide()
+{
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare("SELECT useonairguide "
+                  "FROM channel "
+                  "WHERE "
+                  "channel.channum = :CHANNUM");
+    query.bindValue(":CHANNUM", m_requestedChannel);
 
+   if (query.exec() && query.isActive() && query.size() > 0)
+    {
+        query.next();
+        return query.value(0).toString();
+    }
+    return "";
+}

dbox2epg.h

@@ -7 +7 @@
 #ifndef DBOX2EPG_H_
 #define DBOX2EPG_H_
 
-#include <map>
-using namespace std;
-
-#include <qhttp.h>
+#include "qhttp.h"
 #include <qobject.h>
 #include <qthread.h>
-
 #include "mythcontext.h"
 #include "tv_rec.h"
 #include "dbox2channel.h"
@@ -30 +26 @@
         void RequestEPG(const QString& channelNumber);
         void ScheduleRequestEPG(const QString& channelNumber);
         void Shutdown();
-
     public slots:
         void httpRequestFinished(int requestID, bool error);
 
@@ -42 +37 @@
         void UpdateDataBase(QString* chanID, QDateTime* startTime, QDateTime* endTime, QString* title, QString *description, QString *category);
         QString DBox2EPG::ParseNextLine(QByteArray buffer, int* index, int size);
         QString GetChannelID(const QString& channelnumber) ;
+        QString CheckUseOnAirGuide() ;
         void run();
 
         QHttp* http;