diff --git a/webif/html/diag/mux.jim b/webif/html/diag/mux.jim
index b4d6ea9..977992a 100755
--- a/webif/html/diag/mux.jim
+++ b/webif/html/diag/mux.jim
@@ -19,6 +19,19 @@ proc f2c {frequency} {
return [expr int($ch)]
}
+proc svc2mux {svcid mux} {
+ return [switch $($svcid / 4096) {
+ 1 { format "PSB1/BBC A" }
+ 2 { format "PSB2/D3&4" }
+ 4 { format "PSB3/BBC B" }
+ 3 { format "COM4/SDN" }
+ 5 { format "COM5/ARQ A" }
+ 6 { format "COM6/ARQ B" }
+ 10 { format "COM7/ARQ C" }
+ default { format $mux }
+ }]
+}
+
puts "

@@ -61,7 +74,7 @@ foreach tw [$db query {
puts "
[system strip $netName] | "
set channels [$db query {
- select usLcn, szSvcName, szPrvName, aucDefaultAuthority
+ select usLcn, szSvcName, usSvcId, szPrvName, aucDefaultAuthority
from TBL_SVC left join TBL_PRV using (prvIdx)
where tsIdx = %s
order by usLcn
@@ -72,14 +85,15 @@ foreach tw [$db query {
} else {
set mux "Unknown"
}
+ if {[llength $channels] != 0} {
+ set chan [lindex $channels 0]
+ lassign $chan x lcn x name x svcid
+ set mux [svc2mux $svcid $mux]
+ }
set ehs 0
foreach chan $channels {
- lassign $chan x lcn x name
- set name [system strip $name]
+ lassign $chan x lcn
if {$lcn >= 800} { incr ehs }
- if {[dict exists $::muxdb $name]} {
- set mux $::muxdb($name)
- }
}
puts "
$mux | "
if {$eSystem == 0} {
@@ -106,7 +120,7 @@ foreach tw [$db query {
"
altrow reset
foreach chan $channels {
- lassign $chan x lcn x name x prv x auth
+ lassign $chan x lcn x name x svcid x prv x auth
set name [system strip $name]
set prv [system strip $prv]
altrow