diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
index 2a253d2..94780a3 100644
a
|
b
|
static bool FromProgramQuery( |
4007 | 4007 | const QString &sql, const MSqlBindings &bindings, MSqlQuery &query) |
4008 | 4008 | { |
4009 | 4009 | QString querystr = QString( |
| 4010 | "select program.description, sub.* from program, (" |
4010 | 4011 | "SELECT DISTINCT program.chanid, program.starttime, program.endtime, " |
4011 | | " program.title, program.subtitle, program.description, " |
| 4012 | " program.title, program.subtitle, " |
4012 | 4013 | " program.category, channel.channum, channel.callsign, " |
4013 | 4014 | " channel.name, program.previouslyshown, channel.commmethod, " |
4014 | 4015 | " channel.outputfilters, program.seriesid, program.programid, " |
… |
… |
static bool FromProgramQuery( |
4040 | 4041 | if (!sql.contains(" LIMIT ")) |
4041 | 4042 | querystr += " LIMIT 20000 "; |
4042 | 4043 | |
| 4044 | querystr += " ) as sub where program.chanid=sub.chanid and program.starttime=sub.starttime"; |
4043 | 4045 | query.prepare(querystr); |
4044 | 4046 | MSqlBindings::const_iterator it; |
4045 | 4047 | for (it = bindings.begin(); it != bindings.end(); ++it) |
… |
… |
bool LoadFromProgram( |
4072 | 4074 | { |
4073 | 4075 | destination.push_back( |
4074 | 4076 | new ProgramInfo( |
4075 | | query.value(3).toString(), // title |
4076 | | query.value(4).toString(), // subtitle |
4077 | | query.value(5).toString(), // description |
| 4077 | query.value(4).toString(), // title |
| 4078 | query.value(5).toString(), // subtitle |
| 4079 | query.value(0).toString(), // description |
4078 | 4080 | query.value(6).toString(), // category |
4079 | 4081 | |
4080 | | query.value(0).toUInt(), // chanid |
| 4082 | query.value(1).toUInt(), // chanid |
| 4083 | |
4081 | 4084 | query.value(7).toString(), // channum |
4082 | 4085 | query.value(8).toString(), // chansign |
4083 | 4086 | query.value(9).toString(), // channame |
4084 | 4087 | query.value(12).toString(), // chanplaybackfilters |
4085 | 4088 | |
4086 | | query.value(1).toDateTime(), // startts |
4087 | | query.value(2).toDateTime(), // endts |
4088 | | query.value(1).toDateTime(), // recstartts |
4089 | | query.value(2).toDateTime(), // recendts |
| 4089 | query.value(2).toDateTime(), // startts |
| 4090 | query.value(3).toDateTime(), // endts |
| 4091 | query.value(2).toDateTime(), // recstartts |
| 4092 | query.value(3).toDateTime(), // recendts |
| 4093 | |
4090 | 4094 | |
4091 | 4095 | query.value(13).toString(), // seriesid |
4092 | 4096 | query.value(14).toString(), // programid |
… |
… |
bool LoadFromProgram( |
4099 | 4103 | query.value(19).toUInt(), // recordid |
4100 | 4104 | RecordingType(query.value(20).toInt()), // rectype |
4101 | 4105 | query.value(22).toUInt(), // findid |
4102 | | |
4103 | 4106 | query.value(11).toInt() == COMM_DETECT_COMMFREE, // commfree |
4104 | 4107 | query.value(10).toInt(), // repeat |
4105 | 4108 | |