diff --git a/mythtv/libs/libmythtv/channelsettings.cpp b/mythtv/libs/libmythtv/channelsettings.cpp
index e03829f..bb0f96f 100644
a
|
b
|
QString ChannelDBStorage::GetSetClause(MSqlBindings &bindings) const |
27 | 27 | GetColumnName() + " = " + nameTag); |
28 | 28 | |
29 | 29 | bindings.insert(fieldTag, id.getValue()); |
30 | | bindings.insert(nameTag, user->GetDBValue()); |
| 30 | |
| 31 | if (trimTagValue) |
| 32 | { |
| 33 | bindings.insert(nameTag, user->GetDBValue().trimmed()); |
| 34 | } |
| 35 | else |
| 36 | { |
| 37 | bindings.insert(nameTag, user->GetDBValue()); |
| 38 | } |
31 | 39 | |
32 | 40 | return query; |
33 | 41 | } |
… |
… |
class Name : public LineEditSetting, public ChannelDBStorage |
40 | 48 | { |
41 | 49 | public: |
42 | 50 | Name(const ChannelID &id) : |
43 | | LineEditSetting(this), ChannelDBStorage(this, id, "name") |
| 51 | LineEditSetting(this), ChannelDBStorage(this, id, "name", true) |
44 | 52 | { |
45 | 53 | setLabel(QObject::tr("Channel Name")); |
46 | 54 | } |
… |
… |
class Channum : public LineEditSetting, public ChannelDBStorage |
50 | 58 | { |
51 | 59 | public: |
52 | 60 | Channum(const ChannelID &id) : |
53 | | LineEditSetting(this), ChannelDBStorage(this, id, "channum") |
| 61 | LineEditSetting(this), ChannelDBStorage(this, id, "channum", true) |
54 | 62 | { |
55 | 63 | setLabel(QObject::tr("Channel Number")); |
56 | 64 | } |
… |
… |
class Callsign : public LineEditSetting, public ChannelDBStorage |
114 | 122 | { |
115 | 123 | public: |
116 | 124 | Callsign(const ChannelID &id) : |
117 | | LineEditSetting(this), ChannelDBStorage(this, id, "callsign") |
| 125 | LineEditSetting(this), ChannelDBStorage(this, id, "callsign", true) |
118 | 126 | { |
119 | 127 | setLabel(QObject::tr("Callsign")); |
120 | 128 | } |
diff --git a/mythtv/libs/libmythtv/channelsettings.h b/mythtv/libs/libmythtv/channelsettings.h
index 381ee44..c6a7d53 100644
a
|
b
|
protected: |
102 | 102 | |
103 | 103 | class ChannelDBStorage : public SimpleDBStorage |
104 | 104 | { |
| 105 | private: |
| 106 | bool trimTagValue; |
| 107 | |
105 | 108 | protected: |
106 | | ChannelDBStorage(StorageUser *_user, const ChannelID &_id, QString _name) : |
107 | | SimpleDBStorage(_user, "channel", _name), id(_id) { } |
| 109 | ChannelDBStorage(StorageUser *_user, const ChannelID &_id, QString _name, bool _trimTagValue = false) : |
| 110 | SimpleDBStorage(_user, "channel", _name), id(_id), trimTagValue(_trimTagValue) { } |
108 | 111 | |
109 | 112 | virtual QString GetSetClause(MSqlBindings &bindings) const; |
110 | 113 | virtual QString GetWhereClause(MSqlBindings &bindings) const; |
diff --git a/mythtv/libs/libmythtv/channelutil.cpp b/mythtv/libs/libmythtv/channelutil.cpp
index b872986..48d9500 100644
a
|
b
|
bool ChannelUtil::CreateChannel(uint db_mplexid, |
1574 | 1574 | query.prepare(qstr); |
1575 | 1575 | |
1576 | 1576 | query.bindValue(":CHANID", new_channel_id); |
1577 | | query.bindValue(":CHANNUM", chanNum); |
| 1577 | query.bindValue(":CHANNUM", chanNum.trimmed()); |
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); |
… |
… |
bool ChannelUtil::UpdateChannel(uint db_mplexid, |
1658 | 1658 | query.bindValue(":CHANID", channel_id); |
1659 | 1659 | |
1660 | 1660 | if (set_channum) |
1661 | | query.bindValue(":CHANNUM", chan_num); |
| 1661 | query.bindValue(":CHANNUM", chan_num.trimmed()); |
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 --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
index 2eedf68..a8506d5 100644
a
|
b
|
bool TVRec::SetChannelInfo(uint chanid, uint sourceid, |
3187 | 3187 | " xmltvid = :XMLTVID " |
3188 | 3188 | "WHERE chanid = :CHANID AND " |
3189 | 3189 | " sourceid = :SOURCEID"); |
3190 | | query.bindValue(":CALLSIGN", callsign); |
3191 | | query.bindValue(":CHANNUM", channum); |
3192 | | query.bindValue(":CHANNAME", channame); |
| 3190 | query.bindValue(":CALLSIGN", callsign.trimmed()); |
| 3191 | query.bindValue(":CHANNUM", channum.trimmed()); |
| 3192 | query.bindValue(":CHANNAME", channame.trimmed()); |
3193 | 3193 | query.bindValue(":XMLTVID", xmltvid); |
3194 | 3194 | query.bindValue(":CHANID", chanid); |
3195 | 3195 | query.bindValue(":SOURCEID", sourceid); |