From ffd567096221ee204de4b0a216a44301c171ac98 Mon Sep 17 00:00:00 2001
From: MymsMan <bobbuxton@gmail.com>
Date: Mon, 6 Apr 2020 10:56:38 +0100
Subject: [PATCH] renamed $event to $resv

---
 webif/plugin/schedchk/schedchk.jim | 96 +++++++++++++++---------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/webif/plugin/schedchk/schedchk.jim b/webif/plugin/schedchk/schedchk.jim
index 2afbd67..ab77177 100755
--- a/webif/plugin/schedchk/schedchk.jim
+++ b/webif/plugin/schedchk/schedchk.jim
@@ -172,21 +172,21 @@ proc rsvscan {} {
   conflict-list
 
 
-  set events [rsv list]
+  set resvs [rsv list]
 
   # for each reservation
-  foreach event $events {
-    set name [$event name]
-    set def $svcdef([$event get hsvc])
-    set s [$event start]
+  foreach resv $resvs {
+    set name [$resv name]
+    set def $svcdef([$resv get hsvc])
+    set s [$resv start]
     set ds "[clock format $s -format {%a %d %b %Y %H:%M}]"
-    set d [$event get nduration]
+    set d [$resv get nduration]
     set e $($s + $d)
     set now [clock seconds]
-    lassign [$event padded 1] sp ep
+    lassign [$resv padded 1] sp ep
 
     # Ignore manual recordings & reminders
-    if {[$event get ersvtype] != 3} { continue}
+    if {[$resv get ersvtype] != 3} { continue}
     # Has event passed
     if {$now > $e + $ep} {
       set ended 1
@@ -195,14 +195,14 @@ proc rsvscan {} {
       set ended 0
     }
 
-    set devent "$ds [clock format $d -format {%H:%M}]  === $name === [$event channel_name]"
+    set dresv "$ds [clock format $d -format {%H:%M}]  === $name === [$resv channel_name]"
 
     if {!$ended} {
-      log "Reservation - $devent" 2
-      set elist [$event aul]
+      log "Reservation - $dresv" 2
+      set elist [$resv aul]
       set enum -1
-      set ecrids [split [$event get szEventToRecord] "|"]
-      set ecrid [$event get szCRID]
+      set ecrids [split [$resv get szEventToRecord] "|"]
+      set ecrid [$resv get szCRID]
 
       if {[llength $elist] > 0} {
         # check each episode scheduled
@@ -220,7 +220,7 @@ proc rsvscan {} {
             epg dbfetch dump -service $svc -event $event_id -sort ""] 0]
           log "$service_id $start $end $svc $event_id $record $ecrid $epgcrid" 3
           if {$record==""} {
-            set deps "[clock format $start -format {%a %d %b %Y %H:%M}]  [clock format $dur -format {%H:%M}] === $name === [$event channel_name]"
+            set deps "[clock format $start -format {%a %d %b %Y %H:%M}]  [clock format $dur -format {%H:%M}] === $name === [$resv channel_name]"
             log "+++ No matching epg entry ++++ $deps" 0
             if {$::opts(nomissepg)} {
               log "-nomissepg - Not checking for alternate" 1
@@ -231,7 +231,7 @@ proc rsvscan {} {
             set others [epg dbfetch dump -crid $epgcrid -nocase 1 -sort "start" debug 1]
             #param "collate nocase"
             log "$ecrid $epgcrid $ecrids $others" 3
-            set other [findAlternate $event $others $start $def 1]
+            set other [findAlternate $resv $others $start $def 1]
             if {$other != ""} {
               set ostart [$other get start]
               set odur [$other get duration]
@@ -241,13 +241,13 @@ proc rsvscan {} {
               set dother "[clock format $ostart -format {%a %d %b %Y %H:%M}]  [clock format $odur -format {%H:%M}] === $oname === $ocname"
               # attempt to schedule the alternate
               if {[schedule $other $dother "Event Changed"]} {
-                if {![$event isseries]} {
+                if {![$resv isseries]} {
                   # delete single recording
-                  cancel $event $deps "Event Changed"
+                  cancel $resv $deps "Event Changed"
                 } else {
                   # move crid from scheduled to recorded
-                  replaceskip $event $ecrid $deps "Event Changed"
-                  #refresh $event  $deps
+                  replaceskip $resv $ecrid $deps "Event Changed"
+                  #refresh $resv  $deps
                 }
                 conflict-list
                 break
@@ -273,16 +273,16 @@ proc rsvscan {} {
             }
             # Refresh event since we cant update individual entry
             if {!$ok && !$::opts(noepgchg)} {
-              refresh $event $deps "Event Changed"
+              refresh $resv $deps "Event Changed"
               conflict-list
             }
 
             # Check for conflicts
-            if {"[$event get ulslot]$end" in $conflicts} {
+            if {"[$resv get ulslot]$end" in $conflicts} {
               set ok 0
               log "+++ Confict exists +++ $deps" 1
               set others [$record othertimes]
-              set other [findAlternate $event $others $start $def 0]
+              set other [findAlternate $resv $others $start $def 0]
               if {$other != ""} {
                 set ostart [$other get start]
                 set odur [$other get duration]
@@ -293,12 +293,12 @@ proc rsvscan {} {
 
                 # attempt to schedule the alternate
                 if {[schedule $other $dother "Confict resolution"]} {
-                  if {![$event isseries]} {
+                  if {![$resv isseries]} {
                     # delete single recording
-                    cancel $event $deps "Conflict resolution"
+                    cancel $resv $deps "Conflict resolution"
                   } else {
                     # skip conflicted epidode
-                    skip $event $svc $event_id $deps "Conflict resolution"
+                    skip $resv $svc $resv_id $deps "Conflict resolution"
                   }
                   conflict-list
                   break
@@ -309,10 +309,10 @@ proc rsvscan {} {
           }
         }
       } else {
-        log "+++ No episodes scheduled +++ $devent" 1
+        log "+++ No episodes scheduled +++ $dresv" 1
       }
     } else {
-        log "Completed - $devent" 2
+        log "Completed - $dresv" 2
       # check for new series in same time slot
     }
   }
@@ -323,18 +323,18 @@ proc rsvscan {} {
   epg cleanup
 }
 # Scan others for a suitable alternate episode
-proc findAlternate {event others start definition sametime} {
+proc findAlternate {resv others start definition sametime} {
   # look for alternate with same definition HD/SD/radio
-  set other [scanAlternates $event $others $start $definition $sametime 1]
+  set other [scanAlternates $resv $others $start $definition $sametime 1]
   if {$other == ""} {
     # scan again wihout requiring matching definition
-    set other [scanAlternates $event $others $start $definition $sametime 0]
+    set other [scanAlternates $resv $others $start $definition $sametime 0]
   }
   return $other
 }
 
 # Scan others for a suitable alternate episode
-proc scanAlternates {event others start definition sametime samedef} {
+proc scanAlternates {resv others start definition sametime samedef} {
   global svcdef
 
   foreach other $others {
@@ -368,8 +368,8 @@ proc scanAlternates {event others start definition sametime samedef} {
 }
 
 # Create a new reservation
-proc schedule {event desc {reason ""} {type 1} } {
-  if {[$event scheduled]} {
+proc schedule {resv desc {reason ""} {type 1} } {
+  if {[$resv scheduled]} {
     log "*** Already scheduled *** $desc === $reason" 0
     return 1
   }
@@ -378,7 +378,7 @@ proc schedule {event desc {reason ""} {type 1} } {
     return 1
   }
   set type 1
-  set r [rsv construct $event $type]
+  set r [rsv construct $resv $type]
   if {[catch {$r insert pending} msg]} {
   	log "+++ Error encountered while scheduling: $msg ++++ $desc === $reason" 0
     return 0
@@ -391,16 +391,16 @@ proc schedule {event desc {reason ""} {type 1} } {
 }
 
 # Refresh a  reservation
-proc refresh {event desc {reason ""}} {
+proc refresh {resv desc {reason ""}} {
   if {$::opts(test)} {
     log "*** Test mode =refreshed *** $desc === $reason" 0
     return 1
   }
   set type 1
   if {[catch {
-    $event clear_ulslot
-  	$event set_refresh
-  	$event insert
+    $resv clear_ulslot
+  	$resv set_refresh
+  	$resv insert
   } msg]} {
   	log "+++ Error encountered while refreshing: $msg ++++ $desc === $reason" 0
     return 0
@@ -413,16 +413,16 @@ proc refresh {event desc {reason ""}} {
 }
 
 # Cancel reservation
-proc cancel {event desc {reason ""}} {
+proc cancel {resv desc {reason ""}} {
   if {$::opts(test)} {
     log "*** Test mode =cancelled *** $desc === $reason" 0
     return 1
   }
   set type 1
   if {[catch {
-    $event clear_ulslot
-    $event set_delete
-    $event insert pending 0 1
+    $resv clear_ulslot
+    $resv set_delete
+    $resv insert pending 0 1
   } msg]} {
   	log "+++ Error encountered while cancelling: $msg ++++ $desc === $reason" 0
     return 0
@@ -435,13 +435,13 @@ proc cancel {event desc {reason ""}} {
 }
 
 # Skip an episode - with apply_skip
-proc skip {event xservice xevent desc {reason ""}} {
+proc skip {resv xservice xevent desc {reason ""}} {
   if {$::opts(test)} {
     log "*** Test mode =skipped *** $desc === $reason" 0
     return 1
   }
 	if {[catch {
-		$event apply_skip $xservice $xevent
+		$resv apply_skip $xservice $xevent
 	} msg]} {
     log "+++ Error encountered while skipping: $msg ++++ $desc === $reason" 0
     return 0
@@ -454,15 +454,15 @@ proc skip {event xservice xevent desc {reason ""}} {
 }
 
 # Skip an episode - with replace_skip
-proc replaceskip {event skipcrid desc {reason ""}} {
+proc replaceskip {resv skipcrid desc {reason ""}} {
   if {$::opts(test)} {
     log "*** Test mode =skipped *** $desc === $reason" 0
     return 1
   }
 	if {[catch {
-		$event clear_ulslot
-    $event replace_skip [list $skipcrid]
-    $event insert
+		$resv clear_ulslot
+    $resv replace_skip [list $skipcrid]
+    $resv insert
 	} msg]} {
     log "+++ Error encountered while skipping: $msg ++++ $desc === $reason" 0
     return 0