From fbb64a2e9f929d797361723453afee9bcec7959f Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 19 Sep 2011 17:11:18 +0000 Subject: [PATCH] fix padding git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@409 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- var/mongoose/include/epg.jim | 2 +- var/mongoose/lib/rsv.class | 8 ++++++++ var/mongoose/lib/system.class | 4 +++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 73418ed0..a6688466 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.7.0-3 +Version: 0.7.1 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.3),hmt(>=1.0.6),ssmtp diff --git a/var/mongoose/include/epg.jim b/var/mongoose/include/epg.jim index 6726f17e..7a32192a 100755 --- a/var/mongoose/include/epg.jim +++ b/var/mongoose/include/epg.jim @@ -45,7 +45,7 @@ foreach record [lsort -command rsort $records] { continue } set num [$record get channel_num] - if {$num == 0 || $num >= 800} { continue } + if {$num == 0} { continue } altrow puts "$num" puts "[$record channel_icon 50] diff --git a/var/mongoose/lib/rsv.class b/var/mongoose/lib/rsv.class index ad5446d8..63b3ff40 100755 --- a/var/mongoose/lib/rsv.class +++ b/var/mongoose/lib/rsv.class @@ -76,6 +76,14 @@ rsv method name {} { return $name } +rsv method padded {} { + if {$ulPreOffset > 0 || $ulPostOffset > 0} { + return 1 + } else { + return 0 + } +} + rsv method channel_name {} { return [string range $szSvcName 1 end] } diff --git a/var/mongoose/lib/system.class b/var/mongoose/lib/system.class index 13f237f9..be760707 100644 --- a/var/mongoose/lib/system.class +++ b/var/mongoose/lib/system.class @@ -77,7 +77,9 @@ proc {system restartpending} {} { proc {system padding} {} { set start 0 set stop 0 - set db [sqlite3.open /var/lib/humaxtv/setup.db] + if {[catch {set db [sqlite3.open /var/lib/humaxtv/setup.db]} msg]} { + return {0 0} + } foreach l [$db query " select itemName, itemValue from TBL_MENUCONFIG