From 93b32a77966bcb47fe7c090830616f2bf2fc1295 Mon Sep 17 00:00:00 2001
From: HummyPkg <af123@hummypkg.org.uk>
Date: Mon, 26 Feb 2018 00:24:25 +0000
Subject: [PATCH] Handle split events with multi-character IMIs

---
 webif/lib/epg.class | 2 +-
 webif/lib/rsv.class | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webif/lib/epg.class b/webif/lib/epg.class
index 96ab9880..b742e600 100644
--- a/webif/lib/epg.class
+++ b/webif/lib/epg.class
@@ -261,7 +261,7 @@ epg method icon_set {{height 0}} {
 		    "<img src=/images/178_1_26_Icon_Recommend.png $height>"
 	}
 
-	if {[string match {/*#?} $event_crid]} {
+	if {[string match {/*#*} $event_crid]} {
 		lappend set \
 		    "<img src=/images/178_1_26_Icon_Split.png $height>"
 	}
diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class
index dfde3fae..007768a3 100755
--- a/webif/lib/rsv.class
+++ b/webif/lib/rsv.class
@@ -834,10 +834,10 @@ proc {rsv construct} {event type} {
 			set args(szEventToRecord) "1$args(szCRID)|"
 			set args(aulEventToRecordInfo) [rsv mkaul $event]
 			# Handle split events
-			if {[string match {*#?} $args(szCRID)]} {
+			if {[string match {*#*} $args(szCRID)]} {
 				set args(ucRecKind)	2
-				set args(szCRID) [
-				    string range $args(szCRID) 0 end-2]
+				lassign [split $args(szCRID) "#"] crid imi
+				set args(szCRID) $crid
 				# TODO - check to see how many parts there
 				# are...
 				append args(szEventToRecord) \