hummypkg/webif
5
3
Fork 4
Code Issues Pull Requests Releases 1 Activity

fix grid problem

Browse Source 
git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1828 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2014-03-27 21:34:27 +00:00
parent dad2a630c7
commit 604ac65172
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTROL/control
View File

@ -1,7 +1,7 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.0.10-3 Version: 1.0.10-4
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk 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) 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)

11
var/mongoose/html/epg/service.jim
View File

@ -188,20 +188,23 @@ proc jcprog {day} {
proc skiptoday {day} { proc skiptoday {day} {
global daymap dayrmap currday contprog oldcell global daymap dayrmap currday contprog oldcell
#puts "Skiptoday: $day ($daymap($currday))<br>"
if {!$oldcell && [dict exists $contprog $currday]} { if {!$oldcell && [dict exists $contprog $currday]} {
#puts "Skipping, jcprog<br>"
jcprog $currday jcprog $currday
} }
#puts "Skiptoday: $day ($daymap($currday))<br>"
if {$daymap($currday) eq $day} return if {$daymap($currday) eq $day} return
puts "</td><td class=dayhour>" puts "</td><td class=dayhour>"
incr day -1 set lday $($day - 1)
loop i $daymap($currday) $day { loop i $daymap($currday) $lday {
set j $($i + 1) set j $($i + 1)
if {[dict exists $contprog $dayrmap($j)]} { if {[dict exists $contprog $dayrmap($j)]} {
#puts "Skipping, jcprog<br>"
jcprog $dayrmap($j) jcprog $dayrmap($j)
} }
puts "</td><td class=dayhour>" puts "</td><td class=dayhour>"
} }
#puts "skiptoday - arrived at $day<br>"
} }
set currhour -1 set currhour -1
@ -212,7 +215,7 @@ foreach e $records {
set day [clock format $start -format "%Y%m%d"] set day [clock format $start -format "%Y%m%d"]
if {$day ni $daymap} continue if {$day ni $daymap} continue
set hour [clock format $start -format "%H"] set hour [clock format $start -format "%H"]
if {$hour != $currhour} { if {$hour != $currhour || $day < $currday} {
if {$currhour ne "-1"} { if {$currhour ne "-1"} {
if {$daymap($currday) < 7} { if {$daymap($currday) < 7} {
skiptoday 7 skiptoday 7