From 43f7bb297aa1336abb6f50541286bd60a6525c53 Mon Sep 17 00:00:00 2001
From: "Brian P. McGlynn" <brian.mcglynn@geneseemedia.net>
Date: Sat, 23 Apr 2016 16:27:51 -0400
Subject: [PATCH] Favor cuts expiring first in playback

---
 ChangeLog      | 3 +++
 lib/rdcart.cpp | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bef54b06..5a71fd97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15075,3 +15075,6 @@
 2016-04-23 Fred Gleason <fredg@paravelsystems.com>
 	* Renamed the 'ClockAddress' parameter to 'HostAddress' in
 	'rlm/rlm_walltime.c'.
+2016-04-23 Brian McGlynn <brian.mcglynn@geneseemedia.net>
+	* Updated Cart Scheduler to favor weighted playback for cuts expiring
+	first following the number of plays
diff --git a/lib/rdcart.cpp b/lib/rdcart.cpp
index 2469bf09..2ff025e6 100644
--- a/lib/rdcart.cpp
+++ b/lib/rdcart.cpp
@@ -129,7 +129,8 @@ bool RDCart::selectCut(QString *cut,const QTime &time) const
       QString().sprintf("(CART_NUMBER=%u)&&(EVERGREEN=\"N\")&&",cart_number)+
       "(LENGTH>0)";
     if(useWeighting()) {
-      sql+=" order by LOCAL_COUNTER";
+      sql+=" order by LOCAL_COUNTER ASC, ISNULL(END_DATETIME), END_DATETIME ASC, \
+             LAST_PLAY_DATETIME ASC";
     }
     else {
       sql+=" order by LAST_PLAY_DATETIME desc";