git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@390 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2011-09-13 19:16:02 +00:00
parent ed225ca751
commit af87e1a66e
2 changed files with 27 additions and 18 deletions

View File

@ -1,7 +1,7 @@
Package: webif
Priority: optional
Section: web
Version: 0.6.9
Version: 0.7.0
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

View File

@ -141,14 +141,16 @@ rsv method insert {{table pending}} {
global rsvdb
# Duplicate check - all tables
foreach tab {pending TBL_RESERVATION} {
set rec [$rsvdb query "
select ulslot from $tab
where szCRID = '%s'
" $szCRID]
if {[llength $rec] > 0} {
throw 20 "Duplicate reservation."
return
if {$szCRID ne "" && $action == 0} {
foreach tab {pending TBL_RESERVATION} {
set rec [$rsvdb query "
select ulslot from $tab
where szCRID = '%s'
" $szCRID]
if {[llength $rec] > 0} {
throw 20 "Duplicate reservation."
return
}
}
}
@ -308,6 +310,8 @@ proc {rsv commit} {} {
}
proc {rsv construct} {event type} {
global ccrid
$event get_channel_info
set args {}
@ -326,15 +330,20 @@ proc {rsv construct} {event type} {
# Event
set args(ucCRIDType) 49
set args(ucRecKind) 1
set args(szCRID) "$ccrid[$event get event_crid]"
set args(szEventToRecord) "1$args(szCRID)|"
# Handle split events
if {[string match {*#?} $args(szCRID)]} {
set args(ucRecKind) 2
set args(szCRID) [string range $args(szCRID) 0 end-2]
# TOTO - check to see how many parts there are...
append args(szEventToRecord) $args(szEventToRecord)
set ecrid [$event get event_crid]
if {$ecrid ne ""} {
set args(szCRID) "$ccrid$ecrid"
set args(szEventToRecord) "1$args(szCRID)|"
# Handle split events
if {[string match {*#?} $args(szCRID)]} {
set args(ucRecKind) 2
set args(szCRID) [
string range $args(szCRID) 0 end-2]
# TODO - check to see how many parts there
# are...
append args(szEventToRecord) \
$args(szEventToRecord)
}
}
} else {
# Series