Ticket #4879: myth_schedule_slack.diff

scheduler.cpp

@@ -2376 +2376 @@
                  << "/" << whereclauses[clause] << endl;
     }
 
+    int startTimeSlack = gContext->GetNumSetting( "StartTimeSlack", 0);
+
     for (clause = 0; clause < fromclauses.count(); clause++)
     {
         QString query = QString(
@@ -2400 +2402 @@
 "  AND "
 "  ((RECTABLE.type = %5) " // channelrecord
 "   OR"
-"   ((TIME_TO_SEC(RECTABLE.starttime) = TIME_TO_SEC(program.starttime)) " // timeslot matches
+"   (720-ABS(ABS(TIMESTAMPDIFF(MINUTE,program.starttime,ADDTIME(RECTABLE.startdate,RECTABLE.starttime))% 1440) -720) <= %6"
 "    AND "
-"    ((RECTABLE.type = %6) " // timeslotrecord
+"    ((RECTABLE.type = %7) " // timeslotrecord
 "     OR"
-"     ((DAYOFWEEK(RECTABLE.startdate) = DAYOFWEEK(program.starttime) "
+"     ((5040-ABS(ABS(TIMESTAMPDIFF(MINUTE,program.starttime,ADDTIME(RECTABLE.startdate,RECTABLE.starttime))% 10080) -5040) <= %8"
 "      AND "
-"      ((RECTABLE.type = %7) " // weekslotrecord
+"      ((RECTABLE.type = %9) " // weekslotrecord
 "       OR"
 "       ((TO_DAYS(RECTABLE.startdate) = TO_DAYS(program.starttime)) " // date matches
 "        )"
@@ -2423 +2425 @@
             .arg(kFindDailyRecord)
             .arg(kFindWeeklyRecord)
             .arg(kChannelRecord)
+            .arg(startTimeSlack)
             .arg(kTimeslotRecord)
+            .arg(startTimeSlack)
             .arg(kWeekslotRecord);
 
         while (1)