2017-03-24 version 1.1.56 (horchi)\n - bugfix: Fixed problem with service interface (frequent db reconnects)\n\n1.1.56

7 files changed, 58 insertions, 40 deletions

diff --git a/HISTORY.h b/HISTORY.h
index 99e6f00..953db33 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,7 +5,7 @@
  *
  */
 
-#define _VERSION     "1.1.55"
+#define _VERSION     "1.1.56"
 #define VERSION_DATE "24.03.2017"
 
 #define DB_API       4
@@ -19,6 +19,9 @@
 /*
  * ------------------------------------
 
+2017-03-24 version 1.1.56 (horchi)
+   - bugfix: Fixed problem with service interface (frequent db reconnects)
+
 2017-03-24 version 1.1.55 (horchi)
    - change: Fixed default make option
 
diff --git a/epg2vdr.c b/epg2vdr.c
index 8c64a1d..a3c299f 100644
--- a/epg2vdr.c
+++ b/epg2vdr.c
@@ -281,6 +281,7 @@ void cMenuSetupEPG2VDR::Setup()
    Add(new cMenuEditBoolItem(tr("Prohibit Shutdown On Busy 'epgd'"), &data.activeOnEpgd));
    Add(new cMenuEditBoolItem(tr("Schedule Boot For Update"), &data.scheduleBoot));
    Add(new cMenuEditBoolItem(tr("Blacklist not configured Channels"), &data.blacklist));
+   Add(new cMenuEditBoolItem(tr("Store extended EPD Data to AUX (e.g. for Skins)"), &data.extendedEpgData2Aux));
 
    Add(new cOsdItem(cString::sprintf("--------------------- %s ---------------------------------", tr("Menu"))));
    cList<cOsdItem>::Last()->SetSelectable(false);
@@ -858,21 +859,24 @@ bool cPluginEPG2VDR::Service(const char* id, void* data)
       return true;
    }
 
-   // Services with direct db access
+   if (strcmp(id, EPG2VDR_TIMER_SERVICE) == 0) // || .....
+   {
+      // Services with direct db access
 
-   cMutexLock lock(&mutexServiceWithDb);
+      cMutexLock lock(&mutexServiceWithDb);
 
-   if (initDb() == success)
-   {
-      if (strcmp(id, EPG2VDR_TIMER_SERVICE) == 0)
+      if (initDb() == success)
       {
-         cEpgTimer_Service_V1* ts = (cEpgTimer_Service_V1*)data;
+         if (strcmp(id, EPG2VDR_TIMER_SERVICE) == 0)
+         {
+            cEpgTimer_Service_V1* ts = (cEpgTimer_Service_V1*)data;
 
-         if (ts)
-            return timerService(ts);
-      }
+            if (ts)
+               return timerService(ts);
+         }
 
-      exitDb();
+         exitDb();
+      }
    }
 
    return false;
diff --git a/plgconfig.c b/plgconfig.c
index 4dda3d2..b41983b 100644
--- a/plgconfig.c
+++ b/plgconfig.c
@@ -13,7 +13,7 @@ cEpg2VdrConfig Epg2VdrConfig;
 // cEpg2VdrConfig
 //***************************************************************************
 
-cEpg2VdrConfig::cEpg2VdrConfig() 
+cEpg2VdrConfig::cEpg2VdrConfig()
    : cEpgConfig()
 {
    mainmenuVisible = yes;
@@ -27,10 +27,11 @@ cEpg2VdrConfig::cEpg2VdrConfig()
    createTimerLocal = no;
    useCommonRecFolder = yes;
    xchgOkBlue = no;
-   
+
    replaceScheduleMenu = no;
    replaceTimerMenu = no;
    userIndex = 0;
    *user = 0;
    showEmptyChannels = no;
+   extendedEpgData2Aux = no;
 }
diff --git a/plgconfig.h b/plgconfig.h
index fce7b0d..b810b36 100644
--- a/plgconfig.h
+++ b/plgconfig.h
@@ -18,7 +18,7 @@
 struct cEpg2VdrConfig : public cEpgConfig
 {
    public:
-      
+
       cEpg2VdrConfig();
 
       int mainmenuVisible;
@@ -31,12 +31,13 @@ struct cEpg2VdrConfig : public cEpgConfig
       int createTimerLocal;
       int useCommonRecFolder;   // NAS
       int xchgOkBlue;
-   
+
       int replaceScheduleMenu;
       int replaceTimerMenu;
       int userIndex;
       char user[100+TB];
       int showEmptyChannels;
+      int extendedEpgData2Aux;
 };
 
 extern cEpg2VdrConfig Epg2VdrConfig;
diff --git a/po/de_DE.po b/po/de_DE.po
index 9a1eb62..fc7f868 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr@jwendel.de>\n"
-"POT-Creation-Date: 2017-02-14 12:24+0100\n"
+"POT-Creation-Date: 2017-03-24 07:25+0100\n"
 "PO-Revision-Date: 2009-08-27 21:40+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,9 @@ msgstr "Booten für geplante Updates"
 msgid "Blacklist not configured Channels"
 msgstr "Nicht konfigurierte Kanäle 'blacklisten'"
 
+msgid "Store extended EPD Data to AUX (e.g. for Skins)"
+msgstr ""
+
 msgid "Menu"
 msgstr "Menü"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 356928e..77ebd5a 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr@jwendel.de>\n"
-"POT-Creation-Date: 2017-02-14 12:24+0100\n"
+"POT-Creation-Date: 2017-03-24 07:25+0100\n"
 "PO-Revision-Date: 2009-08-27 21:45+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -75,6 +75,9 @@ msgstr ""
 msgid "Blacklist not configured Channels"
 msgstr ""
 
+msgid "Store extended EPD Data to AUX (e.g. for Skins)"
+msgstr ""
+
 msgid "Menu"
 msgstr ""
 
diff --git a/update.c b/update.c
index 7b9da44..8113f97 100644
--- a/update.c
+++ b/update.c
@@ -1653,39 +1653,42 @@ cEvent* cUpdate::createEventFromRow(const cDbRow* row)
    // ------------
    // aux
 
-   useeventsDb->clear();
-   useeventsDb->setValue("USEID", row->getIntValue("USEID"));
-
-   if (selectEventById->find())
+   if (Epg2VdrConfig.extendedEpgData2Aux)
    {
-      cXml xml;
-
-      xml.create("epg2vdr");
+      useeventsDb->clear();
+      useeventsDb->setValue("USEID", row->getIntValue("USEID"));
 
-      for (int i = 0; auxFields[i]; i++)
+      if (selectEventById->find())
       {
-         cDbValue* value = useeventsDb->getValue(auxFields[i]);
+         cXml xml;
 
-         if (!value || value->isEmpty())
-            continue;
+         xml.create("epg2vdr");
 
-         if (value->getField()->hasFormat(cDBS::ffAscii) || value->getField()->hasFormat(cDBS::ffText) || value->getField()->hasFormat(cDBS::ffMText))
-            xml.appendElement(auxFields[i], value->getStrValue());
-         else
-            xml.appendElement(auxFields[i], value->getIntValue());
-      }
+         for (int i = 0; auxFields[i]; i++)
+         {
+            cDbValue* value = useeventsDb->getValue(auxFields[i]);
 
-      // finally add some fields of the view
+            if (!value || value->isEmpty())
+               continue;
 
-      xml.appendElement("source", viewMergeSource->getStrValue());
-      xml.appendElement("longdescription", viewLongDescription->getStrValue());
+            if (value->getField()->hasFormat(cDBS::ffAscii) || value->getField()->hasFormat(cDBS::ffText) || value->getField()->hasFormat(cDBS::ffMText))
+               xml.appendElement(auxFields[i], value->getStrValue());
+            else
+               xml.appendElement(auxFields[i], value->getIntValue());
+         }
 
-      // set to events aux field
+         // finally add some fields of the view
 
-      e->SetAux(xml.toText());
-   }
+         xml.appendElement("source", viewMergeSource->getStrValue());
+         xml.appendElement("longdescription", viewLongDescription->getStrValue());
+
+         // set to events aux field
 
-   selectEventById->freeResult();
+         e->SetAux(xml.toText());
+      }
+
+      selectEventById->freeResult();
+   }
 
 #endif // WITH_AUX_PATCH