MymsMan/webif
1
0
Fork 0
forked from hummypkg/webif
Code Pull Requests Activity

restore to LCN if channel name not found

Browse Source 
git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1726 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2013-11-26 22:53:35 +00:00
parent 2c62699f00
commit fbd469ffec
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTROL/control
View File

@ -1,9 +1,9 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.0.7-8 Version: 1.0.7-9
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.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: Suggests:
Description: An evolving web interface for the Humax. Description: An evolving web interface for the Humax.

20
var/mongoose/lib/rsv.class
View File

@ -54,6 +54,8 @@ class rsv {
action 0 action 0
} }
require findhsvc
rsv method aul {} { rsv method aul {} {
if {![exists -proc binary]} { package require binary } if {![exists -proc binary]} { package require binary }
set aul {} set aul {}
@ -206,20 +208,9 @@ rsv method remove_pending {} {
} }
rsv method fix_hsvc {} { rsv method fix_hsvc {} {
global rsvdb set _hsvc [get_channel_attr $szSvcName]
if {$_hsvc eq ""} {
set _hsvc [$rsvdb query { set _hsvc [get_channel_attr_bylcn $usLcn]
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
} }
return $hsvc return $hsvc
} }
@ -551,7 +542,6 @@ proc {rsv backup} {file} {
proc {rsv restore} {file} { proc {rsv restore} {file} {
global rsvdb global rsvdb
require findhsvc
if {![file exists $file]} { if {![file exists $file]} {
error "Backup file <i>$file</i> does not exist." error "Backup file <i>$file</i> does not exist."