Ticket #10046: libmythtv.patch

mythtv/libs/libmythtv/channelutil.cpp

@@ -1576 +1576 @@
     query.bindValue(":CHANID",    new_channel_id);
     query.bindValue(":CHANNUM",   chanNum);
     query.bindValue(":SOURCEID",  db_sourceid);
-    query.bindValue(":CALLSIGN",  callsign);
-    query.bindValue(":NAME",      service_name);
+    query.bindValue(":CALLSIGN",  callsign.trimmed());
+    query.bindValue(":NAME",      service_name.trimmed());
 
     if (db_mplexid > 0)
         query.bindValue(":MPLEXID",   db_mplexid);
@@ -1661 +1661 @@
         query.bindValue(":CHANNUM", chan_num);
 
     query.bindValue(":SOURCEID",  source_id);
-    query.bindValue(":CALLSIGN",  callsign);
-    query.bindValue(":NAME",      service_name);
+    query.bindValue(":CALLSIGN",  callsign.trimmed());
+    query.bindValue(":NAME",      service_name.trimmed());
 
     query.bindValue(":MPLEXID",   db_mplexid);
 

mythtv/libs/libmythtv/datadirect.cpp

@@ -812 +812 @@
             continue;
         }
 
-        chan_update_q.bindValue(":CALLSIGN",  dd_station_info.value(0));
-        chan_update_q.bindValue(":NAME",      dd_station_info.value(1));
+        chan_update_q.bindValue(":CALLSIGN",  dd_station_info.value(0).trimmed());
+        chan_update_q.bindValue(":NAME",      dd_station_info.value(1).trimmed());
         chan_update_q.bindValue(":STATIONID", dd_station_info.value(2));
         chan_update_q.bindValue(":CHANNUM",   channum);
         chan_update_q.bindValue(":SOURCEID",  sourceid);
@@ -2295 +2295 @@
             new_name = (new_name.isEmpty()) ? new_callsign : new_name;
 
             chan_update_q.bindValue(":CHANID",   chanid);
-            chan_update_q.bindValue(":NAME",     new_name);
-            chan_update_q.bindValue(":CALLSIGN", new_callsign);
+            chan_update_q.bindValue(":NAME",     new_name.trimmed());
+            chan_update_q.bindValue(":CALLSIGN", new_callsign.trimmed());
             chan_update_q.bindValue(":XMLTVID",  xmltvid);
             chan_update_q.bindValue(":SOURCEID", sourceid);
 

mythtv/libs/libmythtv/tv_rec.cpp

@@ -3187 +3187 @@
         "    xmltvid  = :XMLTVID   "
         "WHERE chanid   = :CHANID AND "
         "      sourceid = :SOURCEID");
-    query.bindValue(":CALLSIGN", callsign);
+    query.bindValue(":CALLSIGN", callsign.trimmed());
     query.bindValue(":CHANNUM",  channum);
-    query.bindValue(":CHANNAME", channame);
+    query.bindValue(":CHANNAME", channame.trimmed());
     query.bindValue(":XMLTVID",  xmltvid);
     query.bindValue(":CHANID",   chanid);
     query.bindValue(":SOURCEID", sourceid);