diff -ur mythtv-original/mythtv/libs/libmythtv/channelutil.cpp mythtv/mythtv/libs/libmythtv/channelutil.cpp
old
|
new
|
|
1576 | 1576 | query.bindValue(":CHANID", new_channel_id); |
1577 | 1577 | query.bindValue(":CHANNUM", chanNum); |
1578 | 1578 | query.bindValue(":SOURCEID", db_sourceid); |
1579 | | query.bindValue(":CALLSIGN", callsign); |
1580 | | query.bindValue(":NAME", service_name); |
| 1579 | query.bindValue(":CALLSIGN", callsign.trimmed()); |
| 1580 | query.bindValue(":NAME", service_name.trimmed()); |
1581 | 1581 | |
1582 | 1582 | if (db_mplexid > 0) |
1583 | 1583 | query.bindValue(":MPLEXID", db_mplexid); |
… |
… |
|
1661 | 1661 | query.bindValue(":CHANNUM", chan_num); |
1662 | 1662 | |
1663 | 1663 | query.bindValue(":SOURCEID", source_id); |
1664 | | query.bindValue(":CALLSIGN", callsign); |
1665 | | query.bindValue(":NAME", service_name); |
| 1664 | query.bindValue(":CALLSIGN", callsign.trimmed()); |
| 1665 | query.bindValue(":NAME", service_name.trimmed()); |
1666 | 1666 | |
1667 | 1667 | query.bindValue(":MPLEXID", db_mplexid); |
1668 | 1668 | |
diff -ur mythtv-original/mythtv/libs/libmythtv/datadirect.cpp mythtv/mythtv/libs/libmythtv/datadirect.cpp
old
|
new
|
|
812 | 812 | continue; |
813 | 813 | } |
814 | 814 | |
815 | | chan_update_q.bindValue(":CALLSIGN", dd_station_info.value(0)); |
816 | | chan_update_q.bindValue(":NAME", dd_station_info.value(1)); |
| 815 | chan_update_q.bindValue(":CALLSIGN", dd_station_info.value(0).trimmed()); |
| 816 | chan_update_q.bindValue(":NAME", dd_station_info.value(1).trimmed()); |
817 | 817 | chan_update_q.bindValue(":STATIONID", dd_station_info.value(2)); |
818 | 818 | chan_update_q.bindValue(":CHANNUM", channum); |
819 | 819 | chan_update_q.bindValue(":SOURCEID", sourceid); |
… |
… |
|
2295 | 2295 | new_name = (new_name.isEmpty()) ? new_callsign : new_name; |
2296 | 2296 | |
2297 | 2297 | chan_update_q.bindValue(":CHANID", chanid); |
2298 | | chan_update_q.bindValue(":NAME", new_name); |
2299 | | chan_update_q.bindValue(":CALLSIGN", new_callsign); |
| 2298 | chan_update_q.bindValue(":NAME", new_name.trimmed()); |
| 2299 | chan_update_q.bindValue(":CALLSIGN", new_callsign.trimmed()); |
2300 | 2300 | chan_update_q.bindValue(":XMLTVID", xmltvid); |
2301 | 2301 | chan_update_q.bindValue(":SOURCEID", sourceid); |
2302 | 2302 | |
diff -ur mythtv-original/mythtv/libs/libmythtv/tv_rec.cpp mythtv/mythtv/libs/libmythtv/tv_rec.cpp
old
|
new
|
|
3187 | 3187 | " xmltvid = :XMLTVID " |
3188 | 3188 | "WHERE chanid = :CHANID AND " |
3189 | 3189 | " sourceid = :SOURCEID"); |
3190 | | query.bindValue(":CALLSIGN", callsign); |
| 3190 | query.bindValue(":CALLSIGN", callsign.trimmed()); |
3191 | 3191 | query.bindValue(":CHANNUM", channum); |
3192 | | query.bindValue(":CHANNAME", channame); |
| 3192 | query.bindValue(":CHANNAME", channame.trimmed()); |
3193 | 3193 | query.bindValue(":XMLTVID", xmltvid); |
3194 | 3194 | query.bindValue(":CHANID", chanid); |
3195 | 3195 | query.bindValue(":SOURCEID", sourceid); |