From fbd469ffec63d733b9593710fb4c2e588dfc2ea6 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Tue, 26 Nov 2013 22:53:35 +0000
Subject: [PATCH] restore to LCN if channel name not found

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1726 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control            |  4 ++--
 var/mongoose/lib/rsv.class | 20 +++++---------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 844ac7f..6a9f0b0 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,9 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.7-8
+Version: 1.0.7-9
 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)
+Depends: webif-channelicons(>=1.1.5),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)
 Suggests:
 Description: An evolving web interface for the Humax.
diff --git a/var/mongoose/lib/rsv.class b/var/mongoose/lib/rsv.class
index 13c4328..f8efe78 100755
--- a/var/mongoose/lib/rsv.class
+++ b/var/mongoose/lib/rsv.class
@@ -54,6 +54,8 @@ class rsv {
 	action			0
 }
 
+require findhsvc
+
 rsv method aul {} {
 	if {![exists -proc binary]} { package require binary }
 	set aul {}
@@ -206,20 +208,9 @@ rsv method remove_pending {} {
 }
 
 rsv method fix_hsvc {} {
-	global rsvdb
-
-	set _hsvc [$rsvdb query {
-		select hSvc
-		from channel.TBL_SVC
-		where szSvcName = '%s'
-		or szSvcname = '\025%s'
-		limit 1
-	} $szSvcName $szSvcName]
-
-	if {[llength $_hsvc] == 1} {
-		set hsvc [lindex [lindex $_hsvc 0] 1]
-	} else {
-		set hsvc 0
+	set _hsvc [get_channel_attr $szSvcName]
+	if {$_hsvc eq ""} {
+		set _hsvc [get_channel_attr_bylcn $usLcn]
 	}
 	return $hsvc
 }
@@ -551,7 +542,6 @@ proc {rsv backup} {file} {
 
 proc {rsv restore} {file} {
 	global rsvdb
-	require findhsvc
 
 	if {![file exists $file]} {
 		error "Backup file <i>$file</i> does not exist."