Ticket #1485: getbettermplex.patch

libs/libmythtv/channelutil.h

@@ -35 +35 @@
     static int     GetMplexID(int sourceid, uint freq);
     static int     GetMplexID(int sourceid, uint frequency,
                               int transport_id, int network_id);
+    static int     GetExistingMplexID(int transport_id, int network_id);
     static int     GetBetterMplexID(int current_mplexid,
                                     int transport_id, int network_id);
 

libs/libmythtv/siscan.cpp

@@ -1230 +1230 @@
     if (!sdt->ServiceCount())
         return;
 
-    int db_mplexid = ChannelUtil::GetBetterMplexID(
-        tid_db, sdt->TSID(), sdt->OriginalNetworkID());
+    int db_mplexid = ChannelUtil::GetExistingMplexID(sdt->TSID(),
+        sdt->OriginalNetworkID());
 
     if (db_mplexid == -1)
     {
@@ -1655 +1655 @@
     {
         MSqlQuery query(MSqlQuery::InitCon());
         // See if transport already in database
-        QString theQuery = QString("select * from dtv_multiplex where NetworkID = %1 and "
-                   " TransportID = %2 and Frequency = %3 and sourceID = %4")
+        QString theQuery = QString("SELECT * FROM dtv_multiplex WHERE networkid = %1 AND "
+                   " transportid = %2 AND frequency = %3 AND sourceid = %4")
                    .arg((*t).NetworkID)
                    .arg((*t).TransportID)
                    .arg((*t).Frequency)

libs/libmythtv/channelutil.cpp

@@ -303 +303 @@
     return -1;
 }
 
+int ChannelUtil::GetExistingMplexID(int transport_id, int network_id)
+{
+    MSqlQuery query(MSqlQuery::InitCon());
+    // See if transport already in database
+    query.prepare("SELECT mplexid FROM dtv_multiplex "
+                  "WHERE networkid=:NETWORKID AND transportid=:TRANSPORTID");
+
+    query.bindValue(":NETWORKID",   network_id);
+    query.bindValue(":TRANSPORTID", transport_id);
+
+    if (!query.exec() || !query.isActive())
+    {
+        MythContext::DBError("Selecting transports", query);
+        return -1;
+    }
+
+    if (query.size() > 0)
+    {
+        query.next();
+        VERBOSE(VB_SIPARSER,
+            QString("Matched existing MplexID"));
+        return query.value(0).toInt();
+    }
+
+    return -1;
+}
+
 /** \fn ChannelUtil::GetBetterMplexID(int, int, int)
  *  \brief Returns best match multiplex ID, creating one if needed.
  *