2017-03-23: version 1.1.114 (horchi)\n - change: Minor view change for peding features\n\n1.1.114

9 files changed, 70 insertions, 8 deletions

diff --git a/HISTORY.h b/HISTORY.h
index e85b846..e3aac53 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -4,8 +4,8 @@
  * -----------------------------------
  */
 
-#define _VERSION     "1.1.113"
-#define VERSION_DATE "20.03.2017"
+#define _VERSION     "1.1.114"
+#define VERSION_DATE "23.03.2017"
 #define DB_API       4
 
 #ifdef GIT_REV
@@ -17,8 +17,11 @@
 /*
  * ------------------------------------
 
+2017-03-23: version 1.1.114 (horchi)
+   - change: Minor view change for peding features
+
 2017-03-20: version 1.1.113 (horchi)
-    -added:  Add validity check of the API key for https://www.themoviedb.org (by 3po)
+   - added:  Add validity check of the API key for https://www.themoviedb.org (by 3po)
    - change: Removed compiler warnings when using clang
    - added:  Added clang++ to Make.config (as optional compiler)
 
diff --git a/Make.config b/Make.config
index 3d8effd..4e06fc7 100644
--- a/Make.config
+++ b/Make.config
@@ -85,7 +85,7 @@ endif
 
 CFLAGS   += -fPIC -Wreturn-type -Wall -Wextra -Wparentheses -Wformat -pedantic \
               -Wno-long-long -Wunused-variable -Wunused-label -Wno-unused-result \
-              -Wunused-value -Wunused-function -Wno-variadic-macros \
+              -Wunused-value -Wunused-function -Wno-variadic-macros -Wunused-local-typedefs \
               -Wno-unused-parameter -Werror=format-security \
               -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
@@ -94,7 +94,7 @@ CFLAGS   += -std=c++11 -D__STDC_FORMAT_MACROS
 ifdef USE_CLANG
   CFLAGS += -x c++ -Wunused-const-variable
 else
-  CFLAGS += -Wunused-but-set-variable
+  CXXFLAGS += -Wunused-but-set-variable -Wunused-but-set-parameter
 endif
 
 %.o: %.c
diff --git a/configs/epg.dat b/configs/epg.dat
index b33e4a4..0959093 100644
--- a/configs/epg.dat
+++ b/configs/epg.dat
@@ -400,7 +400,6 @@ Table useevents
 
    MASTERID                ""                                               cnt_masterid                  UInt       0 Data|Meta,
    USEID                   ""                                               cnt_useid                     UInt       0 Data,
-// SOURCE                  ""                                               source                        Ascii     25 Data
 
    SUBSOURCE               ""                                               sub_source                    Ascii     10 Data|Meta,
    SUBEVENTID              ""                                               sub_eventid                   UBigInt    0 Data|Meta,
diff --git a/configs/eventsview-3po.sql b/configs/eventsview-3po.sql
index 3f9d167..39ba49e 100644
--- a/configs/eventsview-3po.sql
+++ b/configs/eventsview-3po.sql
@@ -20,6 +20,16 @@ else
   case when length(ifnull(sub_genre,'')) + length(ifnull(sub_country,'')) + length(ifnull(sub_year,'')) > 0 then ')' else '' end
  )
 end shorttext,
+case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then
+  concat('sub_longdescription','|DVB: ',cnt_longdescription)
+else
+  sub_longdescription
+end longdescription,
+case when cnt_source <> sub_source then
+  concat(upper(replace(cnt_source,'vdr','dvb')),'/',upper(sub_source))
+else
+  upper(replace(cnt_source,'vdr','dvb'))
+end mergesource,
 cnt_starttime starttime, cnt_duration duration, cnt_parentalrating parentalrating, cnt_vps vps, cnt_contents contents, replace(
 concat(
   TRIM(LEADING '|' FROM
diff --git a/configs/eventsview-ck.sql b/configs/eventsview-ck.sql
index 62e54e8..1a8c506 100644
--- a/configs/eventsview-ck.sql
+++ b/configs/eventsview-ck.sql
@@ -11,6 +11,16 @@ case when sub_shorttext is null then
 else
  sub_shorttext
 end shorttext,
+case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then
+  concat('sub_longdescription','|DVB: ',cnt_longdescription)
+else
+  sub_longdescription
+end longdescription,
+case when cnt_source <> sub_source then
+  concat(upper(replace(cnt_source,'vdr','dvb')),'/',upper(sub_source))
+else
+  upper(replace(cnt_source,'vdr','dvb'))
+end mergesource,
 cnt_starttime starttime, cnt_duration duration, cnt_parentalrating parentalrating, cnt_vps vps, cnt_contents contents, replace(
 concat(
   TRIM(LEADING '|' FROM
diff --git a/configs/eventsview-horchi.sql b/configs/eventsview-horchi.sql
index 3e9debf..e137594 100644
--- a/configs/eventsview-horchi.sql
+++ b/configs/eventsview-horchi.sql
@@ -11,6 +11,16 @@ case when sub_shorttext is null then
 else
  sub_shorttext
 end shorttext,
+case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then
+  concat('sub_longdescription','|DVB: ',cnt_longdescription)
+else
+  sub_longdescription
+end longdescription,
+case when cnt_source <> sub_source then
+  concat(upper(replace(cnt_source,'vdr','dvb')),'/',upper(sub_source))
+else
+  upper(replace(cnt_source,'vdr','dvb'))
+end mergesource,
 cnt_starttime starttime, cnt_duration duration, cnt_parentalrating parentalrating, cnt_vps vps, cnt_contents contents, replace(
 concat(
   TRIM(LEADING '|' FROM
@@ -20,13 +30,13 @@ concat(
     case when sub_country is Null then '' else concat('|','Land: ',sub_country) end,
     case when sub_year is Null then '' else concat('|','Jahr: ',substring(sub_year,1,4)) end,
     case when epi_episodename is Null then '' else concat('|Serie: ',epi_episodename,' - Staffel: ',epi_season,' / Folge: ',epi_part) end,
+    case when cnt_source <> sub_source then concat('|','Quelle: ',upper(replace(cnt_source,'vdr','dvb')),'/',upper(sub_source)) else concat('|','Quelle: ',upper(replace(cnt_source,'vdr','dvb'))) end,
     case when sub_flags is Null then '' else concat('|',sub_flags) end,
     case when sub_flags is Null or sub_audio is Null then '' else ' ' end,
     case when sub_audio is Null then '' else concat('[', replace(sub_audio, ' ', '] ['), ']') end,
     case when sub_flags is Null and sub_audio is Null then '|' else '' end,
     case when sub_flags is Null or sub_audio is Null then '' else ' ' end,
-    case when cnt_parentalrating is Null then '' else concat('[FSK ',cnt_parentalrating,']') end,
-    case when cnt_source <> sub_source then concat(' [EPG: ',upper(replace(cnt_source,'vdr','dvb')),'/',upper(sub_source),']') else concat(' [EPG: ',upper(replace(cnt_source,'vdr','dvb')),']') end
+    case when cnt_parentalrating is Null then '' else concat('[FSK ',cnt_parentalrating,']') end
    )
   ),
    case when sub_tipp is Null then '' else concat('||',sub_tipp) end,
diff --git a/configs/eventsview-perlbo.sql b/configs/eventsview-perlbo.sql
index 03d6a2c..44dddcc 100644
--- a/configs/eventsview-perlbo.sql
+++ b/configs/eventsview-perlbo.sql
@@ -9,6 +9,16 @@ case
     concat('(S', lpad(format(epi_season, 0), 2, '0'), 'E', lpad(format(epi_part, 0), 2, '0'), ') ', epi_partname)
   end
 end shorttext,
+case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then
+  concat('sub_longdescription','|DVB: ',cnt_longdescription)
+else
+  sub_longdescription
+end longdescription,
+case when cnt_source <> sub_source then
+  concat(upper(replace(cnt_source,'vdr','dvb')),'/',upper(sub_source))
+else
+  upper(replace(cnt_source,'vdr','dvb'))
+end mergesource,
 cnt_starttime starttime, cnt_duration duration, cnt_parentalrating parentalrating, cnt_vps vps, cnt_contents contents, replace(
 concat(
   TRIM(LEADING '|' FROM
diff --git a/configs/eventsview-uti.sql b/configs/eventsview-uti.sql
index 2984707..e8960ec 100644
--- a/configs/eventsview-uti.sql
+++ b/configs/eventsview-uti.sql
@@ -11,6 +11,16 @@ case when sub_shorttext is null then
 else
  sub_shorttext
 end shorttext,
+case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then
+  concat('sub_longdescription','|DVB: ',cnt_longdescription)
+else
+  sub_longdescription
+end longdescription,
+case when cnt_source <> sub_source then
+  concat(upper(replace(cnt_source,'vdr','dvb')),'/',upper(sub_source))
+else
+  upper(replace(cnt_source,'vdr','dvb'))
+end mergesource,
 cnt_starttime starttime, cnt_duration duration, cnt_parentalrating parentalrating, cnt_vps vps, cnt_contents contents, replace(
 concat(
   TRIM(LEADING '|' FROM
diff --git a/configs/eventsview.sql b/configs/eventsview.sql
index 6cee8af..62397d2 100644
--- a/configs/eventsview.sql
+++ b/configs/eventsview.sql
@@ -11,6 +11,16 @@ case when sub_shorttext is null then
 else
  sub_shorttext
 end shorttext,
+case when sub_longdescription is Null or (sub_category not in ('Serie','Spielfilm') and length(cnt_longdescription) / (length(sub_longdescription)/100) > 20) then
+  concat('sub_longdescription','|DVB: ',cnt_longdescription)
+else
+  sub_longdescription
+end longdescription,
+case when cnt_source <> sub_source then
+  concat(upper(replace(cnt_source,'vdr','dvb')),'/',upper(sub_source))
+else
+  upper(replace(cnt_source,'vdr','dvb'))
+end mergesource,
 cnt_starttime starttime, cnt_duration duration, cnt_parentalrating parentalrating, cnt_vps vps, cnt_contents contents, replace(
 concat(
   TRIM(LEADING '|' FROM