From d0ac75a3ce3224d1071c771fa33244cf81c95a86 Mon Sep 17 00:00:00 2001
From: horchi <vdr@jwendel.de>
Date: Sat, 18 Mar 2017 08:04:30 +0100
Subject: 2017-03-18: version 1.1.111 (horchi)\n   - change: modified repeaing
 timer check statement to handle '' values like null values again\n   - added:
  new view eventsview-perlbo.sql\n   - change: fixed some typos\n\n

---
 HISTORY.h              | 9 +++++++--
 configs/epgd.conf      | 2 +-
 lib/searchtimer.c      | 4 ++--
 scripts/epgd-showmerge | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/HISTORY.h b/HISTORY.h
index 4719880..e778153 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -4,8 +4,8 @@
  * -----------------------------------
  */
 
-#define _VERSION     "1.1.110"
-#define VERSION_DATE "16.03.2017"
+#define _VERSION     "1.1.111"
+#define VERSION_DATE "18.03.2017"
 #define DB_API       4
 
 #ifdef GIT_REV
@@ -17,6 +17,11 @@
 /*
  * ------------------------------------
 
+2017-03-18: version 1.1.111 (horchi)
+   - change: modified repeaing timer check statement to handle '' values like null values again
+   - added:  new view eventsview-perlbo.sql
+   - change: fixed some typos
+
 2017-03-16: version 1.1.110 (horchi)
    - added: Congig option for MovieDb api-key
 
diff --git a/configs/epgd.conf b/configs/epgd.conf
index 019c43f..7fbddc7 100644
--- a/configs/epgd.conf
+++ b/configs/epgd.conf
@@ -32,7 +32,7 @@ MaxImagesPerEvent = 1
 SeriesEnabled = 1
 SeriesPort = 2006
 SeriesStoreToFs = 0
-SeriesUrl = eplists.constabel.net
+SeriesUrl = www.eplists.de
 
 ScrapEpg = 1
 ScrapRecordings = 1
diff --git a/lib/searchtimer.c b/lib/searchtimer.c
index b516359..e9081fb 100644
--- a/lib/searchtimer.c
+++ b/lib/searchtimer.c
@@ -1224,8 +1224,8 @@ int cSearchTimer::isAlreadyDone(int repeatfields, json_t* obj, int silent)
 
    if (repeatfields & sfFolge)
    {
-      selectDoneTimer->build(" and (field('%s',ifnull(compshorttext,''),ifnull(episodecomppartname,'')) > 0"
-                             "   or field('%s',ifnull(compshorttext,''),ifnull(episodecomppartname,'')) > 0)",
+      selectDoneTimer->build(" and (field('%s',ifnull(compshorttext,'NoShortnameAvailable'),ifnull(episodecomppartname,'NoShortnameAvailable')) > 0"
+                             "   or field('%s',ifnull(compshorttext,''),ifnull(episodecomppartname,'NoShortnameAvailable')) > 0)",
                              useeventsDb->getStrValue("COMPSHORTTEXT"), useeventsDb->getStrValue("EPISODECOMPPARTNAME"));
    }
 
diff --git a/scripts/epgd-showmerge b/scripts/epgd-showmerge
index 1dc022a..5c4fee2 100755
--- a/scripts/epgd-showmerge
+++ b/scripts/epgd-showmerge
@@ -10,7 +10,7 @@ if [ "$1" == "-h" ]; then
   exit 0
 fi
 
-mysql -u epg2vdr -Depg2vdr -e "select from_unixtime(lastmerge) as 'las merge was at' from vdrs where uuid = 'epgd';"
+mysql -u epg2vdr -Depg2vdr -e "select from_unixtime(lastmerge) as 'last merge was at' from vdrs where uuid = 'epgd';"
 mysql -u epg2vdr -Depg2vdr -e "select count(1) as 'events pending for merge' from events where source = 'vdr' and updsp > (select lastmerge from vdrs where uuid = 'epgd');"
 mysql -u epg2vdr -Depg2vdr -e "select count(source),source from events group by source;"
 
-- 
cgit v1.2.3