Ticket #3081: scheduler.diff
| File scheduler.diff, 2.3 KB (added by , 19 years ago) |
|---|
-
scheduler.cpp
1973 1973 << "/" << whereclauses[clause] << endl; 1974 1974 } 1975 1975 1976 QString progfindid = QString( 1977 "(CASE RECTABLE.type " 1978 " WHEN %1 " 1979 " THEN RECTABLE.findid " 1980 " WHEN %2 " 1981 " THEN to_days(date_sub(program.starttime, interval " 1982 " time_format(RECTABLE.findtime, '%H:%i') hour_minute)) " 1983 " WHEN %3 " 1984 " THEN floor((to_days(date_sub(program.starttime, interval " 1985 " time_format(RECTABLE.findtime, '%H:%i') hour_minute)) - " 1986 " RECTABLE.findday)/7) * 7 + RECTABLE.findday " 1987 " WHEN %4 " 1988 " THEN RECTABLE.findid " 1989 " ELSE 0 " 1990 " END) ") 1991 .arg(kFindOneRecord) 1992 .arg(kFindDailyRecord) 1993 .arg(kFindWeeklyRecord) 1994 .arg(kOverrideRecord); 1995 1976 1996 for (clause = 0; clause < fromclauses.count(); clause++) 1977 1997 { 1978 1998 QString query = QString( 1979 "INSERT INTO recordmatch (recordid, chanid, starttime, manualid ) "1999 "INSERT INTO recordmatch (recordid, chanid, starttime, manualid, progfindid) " 1980 2000 "SELECT RECTABLE.recordid, program.chanid, program.starttime, " 1981 " IF(search = %1, recordid, 0) ").arg(kManualSearch) + QString(2001 " IF(search = %1, recordid, 0) ").arg(kManualSearch) + "," + progfindid + QString( 1982 2002 "FROM (RECTABLE, program INNER JOIN channel " 1983 2003 " ON channel.chanid = program.chanid) ") + fromclauses[clause] + QString( 1984 2004 " WHERE ") + whereclauses[clause] + … … 2121 2141 } 2122 2142 } 2123 2143 2124 QString progfindid = QString( 2125 "(CASE RECTABLE.type " 2126 " WHEN %1 " 2127 " THEN RECTABLE.findid " 2128 " WHEN %2 " 2129 " THEN to_days(date_sub(program.starttime, interval " 2130 " time_format(RECTABLE.findtime, '%H:%i') hour_minute)) " 2131 " WHEN %3 " 2132 " THEN floor((to_days(date_sub(program.starttime, interval " 2133 " time_format(RECTABLE.findtime, '%H:%i') hour_minute)) - " 2134 " RECTABLE.findday)/7) * 7 + RECTABLE.findday " 2135 " WHEN %4 " 2136 " THEN RECTABLE.findid " 2137 " ELSE 0 " 2138 " END) ") 2139 .arg(kFindOneRecord) 2140 .arg(kFindDailyRecord) 2141 .arg(kFindWeeklyRecord) 2142 .arg(kOverrideRecord); 2144 QString progfindid = QString("recordmatch.progfindid"); 2143 2145 2144 2146 QString query = QString( 2145 2147 "SELECT DISTINCT channel.chanid, channel.sourceid, "
