diff --git a/var/mongoose/html/sched/sched.jim b/var/mongoose/html/sched/sched.jim index f95197f..5b70768 100755 --- a/var/mongoose/html/sched/sched.jim +++ b/var/mongoose/html/sched/sched.jim @@ -7,8 +7,17 @@ require altrow rsv.class progressbar epg.class system.class puts "Content-Type: text/html" puts "" +set svcmap {} +lmap i \ + [$::channeldb query {select hSvc, usSvcid from TBL_SVC}] \ + { + set svcmap([lindex $i 1]) [lindex $i 3] + } + header +require epg_popup + puts { @@ -17,7 +26,7 @@ puts { -
+ } proc eventheader {{table TBL_RESERVATION} note} { @@ -49,6 +58,8 @@ proc eventheader {{table TBL_RESERVATION} note} { } proc eventrow {event {table TBL_RESERVATION}} { + global svcmap + set name [$event name] set attrs "table=$table sid=[$event get ulslot] \ @@ -83,6 +94,7 @@ proc eventrow {event {table TBL_RESERVATION}} { } { puts "
'); }
});
@@ -73,11 +73,11 @@ function schedpopup(e, o)
e.preventDefault();
var slot = o.attr('slot');
var table = o.attr('table');
- $('#dialogue').attr('slot', slot).attr('table', table);
+ $('#sdialogue').attr('slot', slot).attr('table', table);
var url = 'info.jim?slot=' + slot +
'&table=' + table;
- $('#dialogue').load(url);
+ $('#sdialogue').load(url);
$dialog.dialog('open');
}
$('a.schedule').click(function(e) { schedpopup(e, $(this)) });
diff --git a/var/mongoose/lib/epg.class b/var/mongoose/lib/epg.class
index 295184d..a59dbd1 100644
--- a/var/mongoose/lib/epg.class
+++ b/var/mongoose/lib/epg.class
@@ -419,7 +419,7 @@ proc {epg dbfetch} {mode args} {
lappend records [epg new $rec]
}
} msg]} {
- puts "No cached EPG data, try again later."
+ puts "No cached EPG data, try again later ($msg)."
}
return $records
}
diff --git a/var/mongoose/lib/epg_popup b/var/mongoose/lib/epg_popup
index dc0b4be..4dfdd16 100644
--- a/var/mongoose/lib/epg_popup
+++ b/var/mongoose/lib/epg_popup
@@ -65,7 +65,10 @@ $(document).ready(function() {
.attr('xe', o.attr('xe'));
$dialog.dialog('open');
}
- $('a.event').click(function(e) { epgpopup(e, $(this)) });
+ $('a.event').click(function(e) {
+ e.preventDefault();
+ epgpopup(e, $(this))
+ });
});
}
diff --git a/var/mongoose/lib/rsv.class b/var/mongoose/lib/rsv.class
index 516854f..d868ef3 100755
--- a/var/mongoose/lib/rsv.class
+++ b/var/mongoose/lib/rsv.class
@@ -60,7 +60,7 @@ rsv method aul {} {
for {set i 0} {$i < [string length $aulEventToRecordInfo]} {incr i 16} {
binary scan [string range $aulEventToRecordInfo $i $($i + 15)] \
iiii service start end event_id
- lappend aul [list $service $start $end $event_id]
+ catch {lappend aul [list $service $start $end $event_id]}
}
return $aul
}