From c676f22efe2d89752f21ae135447c238239bb794 Mon Sep 17 00:00:00 2001 From: horchi Date: Thu, 8 Feb 2018 20:04:20 +0100 Subject: 2018-02-08: version 1.1.127 (horchi)\n - change: store timer type to support 'switch' timer\n\n --- HISTORY.h | 9 ++++++--- scripts/epgd-dropall | 2 +- webstore.c | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/HISTORY.h b/HISTORY.h index 5e889cc..4a90fd7 100644 --- a/HISTORY.h +++ b/HISTORY.h @@ -4,8 +4,8 @@ * ----------------------------------- */ -#define _VERSION "1.1.126" -#define VERSION_DATE "02.01.2017" +#define _VERSION "1.1.127" +#define VERSION_DATE "08.02.2018" #define DB_API 5 #ifdef GIT_REV @@ -18,7 +18,10 @@ * ------------------------------------ * -2017-01-02: version 1.1.126 (ckone) +2018-02-08: version 1.1.127 (horchi) + - change: store timer type to support 'switch' timer + +2018-01-02: version 1.1.126 (ckone) - change: improved handling of reinstated events in merge procedure 2017-12-22: version 1.1.125 (horchi) diff --git a/scripts/epgd-dropall b/scripts/epgd-dropall index 2c93522..f8a2d00 100755 --- a/scripts/epgd-dropall +++ b/scripts/epgd-dropall @@ -30,7 +30,7 @@ if [ "${c}" = "y" ]; then mysql -u epg2vdr -Depg2vdr -e 'drop table if exists analyse;' mysql -u epg2vdr -Depg2vdr -e 'drop table if exists snapshot;' - echo "Now you have two choices for timers and timersdone:" + echo "Now you have two choices for timers and timersdone (only the pending ones):" echo " 1. Automatic (without dropping the timers table):" echo " All created timers will be marked for delete action to force VDRs to remove them" echo " 2. Drop table timers - you have to cleanup the timers.conf of your VDRs by hand" diff --git a/webstore.c b/webstore.c index d16513a..c5f9c8d 100644 --- a/webstore.c +++ b/webstore.c @@ -343,6 +343,7 @@ int cEpgHttpd::storeTimerJob(json_t* jInData, json_t* response) getFieldFromJson(jInData, &timerRow, "CHILDLOCK"); getFieldFromJson(jInData, &timerRow, "CHANNELID"); getFieldFromJson(jInData, &timerRow, "DIRECTORY"); + getFieldFromJson(jInData, &timerRow, "TYPE"); modifyCreateTimer(&timerRow); } -- cgit v1.2.3