1 files changed, 10 insertions, 9 deletions
diff --git a/p2pvr/daemon/sql/Schedules_GetCandidates.sql b/p2pvr/daemon/sql/Schedules_GetCandidates.sql
index 8e8b15e..0bb7bd8 100644
--- a/p2pvr/daemon/sql/Schedules_GetCandidates.sql
+++ b/p2pvr/daemon/sql/Schedules_GetCandidates.sql
@@ -1,25 +1,26 @@
-select what, serviceid, eventid, transportstreamid,
+select what, eventuid, transportstreamid,
 	starttime - early starttime, stoptime + late stoptime,
 	priority, scheduleid
 from (
-	select (e.title, e.subtitle, e.description)::text what, e.serviceid, e.eventid, sv.transportstreamid,
+	select (e.title, e.subtitle, e.description)::text what, e.eventuid, sv.transportstreamid,
 		e.starttime, e.stoptime - interval '1 second' stoptime,
 		s.early, s.late, s.scheduleid, s.priority,
-		rank() over(partition by e.serviceid, e.eventid, sv.serviceid order by s.priority desc, s.scheduleid) schedulerank
+		rank() over(partition by e.eventuid, sv.serviceid order by s.priority desc, s.scheduleid) schedulerank
 	from services sv, events e, schedules s
 	where (s.serviceid is null or s.serviceid = e.serviceid)
 	and (s.title is null or lower(s.title) = lower(e.title))
-	and (s.eventid is null or s.eventid = e.eventid)
+	and (s.eventuid is null or s.eventuid = e.eventuid)
 	and (s.search is null or event_tsvector(e) @@ plainto_tsquery(s.search))
 	and sv.serviceid = e.serviceid
 	and e.stoptime > now()
 	and not exists (
 		select 1
-		from recorded r
-		where lower(e.title) = lower(r.title)
-		and coalesce(lower(e.subtitle), '') = coalesce(lower(r.subtitle), '')
-		and ts_rank(to_tsvector(e.description), plainto_tsquery(r.description)) +
-			ts_rank(to_tsvector(r.description), plainto_tsquery(e.description)) > 1)) e
+		from recorded r, events re
+		where r.eventuid = re.eventuid
+		and lower(e.title) = lower(re.title)
+		and coalesce(lower(e.subtitle), '') = coalesce(lower(re.subtitle), '')
+		and ts_rank(to_tsvector(e.description), plainto_tsquery(re.description)) +
+			ts_rank(to_tsvector(re.description), plainto_tsquery(e.description)) > 1)) e
 where e.schedulerank = 1
 order by e.priority desc, e.what, e.transportstreamid, e.starttime