diff --git a/CONTROL/control b/CONTROL/control index 74866fe6..88668ad5 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.0.10-3 +Version: 1.0.10-4 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.1.10),mongoose(>=3.0.11),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6) diff --git a/var/mongoose/html/epg/service.jim b/var/mongoose/html/epg/service.jim index d976b153..4fc6e5d5 100755 --- a/var/mongoose/html/epg/service.jim +++ b/var/mongoose/html/epg/service.jim @@ -188,20 +188,23 @@ proc jcprog {day} { proc skiptoday {day} { global daymap dayrmap currday contprog oldcell + #puts "Skiptoday: $day ($daymap($currday))
" if {!$oldcell && [dict exists $contprog $currday]} { + #puts "Skipping, jcprog
" jcprog $currday } - #puts "Skiptoday: $day ($daymap($currday))
" if {$daymap($currday) eq $day} return puts "" - incr day -1 - loop i $daymap($currday) $day { + set lday $($day - 1) + loop i $daymap($currday) $lday { set j $($i + 1) if {[dict exists $contprog $dayrmap($j)]} { + #puts "Skipping, jcprog
" jcprog $dayrmap($j) } puts "" } + #puts "skiptoday - arrived at $day
" } set currhour -1 @@ -212,7 +215,7 @@ foreach e $records { set day [clock format $start -format "%Y%m%d"] if {$day ni $daymap} continue set hour [clock format $start -format "%H"] - if {$hour != $currhour} { + if {$hour != $currhour || $day < $currday} { if {$currhour ne "-1"} { if {$daymap($currday) < 7} { skiptoday 7