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

work around missing event IDs in the future

Browse Source 
git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1716 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2013-11-06 22:13:25 +00:00
parent 7080242ff8
commit 2a4ec43ef6
2 changed files with 11 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.7-6 Version: 1.0.7-7
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk Maintainer: af123@hummypkg.org.uk
Depends: webif-channelicons(>=1.1.4),mongoose(>=3.0-9),jim(>=0.74-2),jim-oo,jim-sqlite3(>=0.74-1),jim-cgi(>=0.7),jim-binary,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.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6) Depends: webif-channelicons(>=1.1.4),mongoose(>=3.0-9),jim(>=0.74-2),jim-oo,jim-sqlite3(>=0.74-1),jim-cgi(>=0.7),jim-binary,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.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6)

12
var/mongoose/html/sched/sched.jim
View File

@ -12,6 +12,7 @@ lmap i \
{ {
set svcmap([lindex $i 1]) [lindex $i 3] set svcmap([lindex $i 1]) [lindex $i 3]
} }
set svckeys [array names svcmap]
require epg_popup require epg_popup
@ -55,7 +56,7 @@ proc eventheader {{table TBL_RESERVATION} note} {
} }
proc eventrow {event {table TBL_RESERVATION} {pending 0}} { proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
global svcmap global svcmap svckeys
set name [$event name] set name [$event name]
@ -111,7 +112,6 @@ proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
incr ::ended incr ::ended
} else { } else {
set elist [$event aul] set elist [$event aul]
set ds "[clock format $s -format {%a %d %b %Y %H:%M}]" set ds "[clock format $s -format {%a %d %b %Y %H:%M}]"
puts "<td nowrap class=\"va" puts "<td nowrap class=\"va"
if {$n > $e} { puts " blood" } if {$n > $e} { puts " blood" }
@ -119,7 +119,7 @@ proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
if {[llength $elist] > 0} { if {[llength $elist] > 0} {
lassign [lindex $elist 0] service_id start end event_id lassign [lindex $elist 0] service_id start end event_id
if {$start == $s} { if {$start == $s && $service_id in $svckeys} {
puts "<a class=event href=# puts "<a class=event href=#
xs=$svcmap($service_id) xe=$event_id> xs=$svcmap($service_id) xe=$event_id>
$ds</a>" $ds</a>"
@ -143,10 +143,16 @@ proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
foreach e $elist { foreach e $elist {
lassign $e service_id start end event_id lassign $e service_id start end event_id
if {$start == $s} continue if {$start == $s} continue
if {$service_id in $svckeys} {
puts "<a class=event href=# puts "<a class=event href=#
xs=$svcmap($service_id) xe=$event_id> xs=$svcmap($service_id) xe=$event_id>
[clock format $start \ [clock format $start \
-format {%a %d %b %Y %H:%M}]</a><br>" -format {%a %d %b %Y %H:%M}]</a><br>"
} else {
puts "[clock format $start \
-format {%a %d %b %Y %H:%M}]
($service_id)<br>"
}
} }
puts "</div>"; puts "</div>";
} }