From 2a4ec43ef6c9842428a2b05437e6268a7ffbb8da Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Wed, 6 Nov 2013 22:13:25 +0000
Subject: [PATCH] work around missing event IDs in the future

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1716 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                   |  2 +-
 var/mongoose/html/sched/sched.jim | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index f99e808..33a8c1d 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.7-6
+Version: 1.0.7-7
 Architecture: mipsel
 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)
diff --git a/var/mongoose/html/sched/sched.jim b/var/mongoose/html/sched/sched.jim
index 8edad89..af2f354 100755
--- a/var/mongoose/html/sched/sched.jim
+++ b/var/mongoose/html/sched/sched.jim
@@ -12,6 +12,7 @@ lmap i \
     {
 	set svcmap([lindex $i 1]) [lindex $i 3]
     }
+set svckeys [array names svcmap]
 
 require epg_popup
 
@@ -55,7 +56,7 @@ proc eventheader {{table TBL_RESERVATION} note} {
 }
 
 proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
-	global svcmap
+	global svcmap svckeys
 
 	set name [$event name]
 
@@ -111,7 +112,6 @@ proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
 		incr ::ended
 	} else {
 		set elist [$event aul]
-
 		set ds "[clock format $s -format {%a %d %b %Y %H:%M}]"
 		puts "<td nowrap class=\"va"
 		if {$n > $e} { puts " blood" }
@@ -119,7 +119,7 @@ proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
 
 		if {[llength $elist] > 0} {
 			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=#
 				    xs=$svcmap($service_id) xe=$event_id>
 				    $ds</a>"
@@ -143,10 +143,16 @@ proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
 			foreach e $elist {
 				lassign $e service_id start end event_id
 				if {$start == $s} continue
-				puts "<a class=event href=#
+				if {$service_id in $svckeys} {
+				  puts "<a class=event href=#
 				    xs=$svcmap($service_id) xe=$event_id>
 				    [clock format $start \
 				    -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>";
 		}