Fixed ' character bug dicovered by oldmanuk

Added output of sqlite version

4 files changed, 26 insertions, 31 deletions

diff --git a/event.cpp b/event.cpp
index 00e4818..cb048cc 100644
--- a/event.cpp
+++ b/event.cpp
@@ -62,7 +62,7 @@ void cXMLTVEvent::SetSource(const char *Source)
     source=strcpyrealloc(source, Source);
     if (source)
     {
-        source=removechar(source,'\'');
+        source=removechar(source,'^');
         source=compactspace(source);
     }
 }
@@ -72,7 +72,7 @@ void cXMLTVEvent::SetChannelID(const char *ChannelID)
     channelid=strcpyrealloc(channelid, ChannelID);
     if (channelid)
     {
-        channelid=removechar(channelid,'\'');
+        channelid=removechar(channelid,'^');
         channelid=compactspace(channelid);
     }
 }
@@ -82,7 +82,7 @@ void cXMLTVEvent::SetTitle(const char *Title)
     title=strcpyrealloc(title, Title);
     if (title)
     {
-        title=removechar(title,'\'');
+        title=removechar(title,'^');
         title=removechar(title,'\n');
         title=removechar(title,'\r');
         title=compactspace(title);
@@ -94,7 +94,7 @@ void cXMLTVEvent::SetAltTitle(const char *AltTitle)
     alttitle=strcpyrealloc(alttitle, AltTitle);
     if (alttitle)
     {
-        alttitle=removechar(alttitle,'\'');
+        alttitle=removechar(alttitle,'^');
         alttitle=removechar(alttitle,'\n');
         alttitle=removechar(alttitle,'\r');
         alttitle=compactspace(alttitle);
@@ -106,7 +106,7 @@ void cXMLTVEvent::SetOrigTitle(const char *OrigTitle)
     origtitle=strcpyrealloc(origtitle, OrigTitle);
     if (origtitle)
     {
-        origtitle=removechar(origtitle,'\'');
+        origtitle=removechar(origtitle,'^');
         origtitle=compactspace(origtitle);
     }
 }
@@ -116,7 +116,7 @@ void cXMLTVEvent::SetShortText(const char *ShortText)
     shorttext=strcpyrealloc(shorttext,ShortText);
     if (shorttext)
     {
-        shorttext=removechar(shorttext,'\'');
+        shorttext=removechar(shorttext,'^');
         shorttext=removechar(shorttext,'\n');
         shorttext=removechar(shorttext,'\r');
         shorttext=compactspace(shorttext);
@@ -133,7 +133,7 @@ void cXMLTVEvent::AddDescription(const char *Description)
     {
         description=strcatrealloc(description,"\n");
         description=strcatrealloc(description,Description);
-        description=removechar(description,'\'');
+        description=removechar(description,'^');
         description=compactspace(description);
     }
 }
@@ -143,7 +143,7 @@ void cXMLTVEvent::SetDescription(const char *Description)
     description=strcpyrealloc(description, Description);
     if (description)
     {
-        description=removechar(description,'\'');
+        description=removechar(description,'^');
         description=compactspace(description);
     }
 }
@@ -153,7 +153,7 @@ void cXMLTVEvent::SetEITDescription(const char *EITDescription)
     eitdescription=strcpyrealloc(eitdescription, EITDescription);
     if (eitdescription)
     {
-        eitdescription=removechar(eitdescription,'\'');
+        eitdescription=removechar(eitdescription,'^');
         eitdescription=compactspace(eitdescription);
     }
 }
@@ -163,7 +163,7 @@ void cXMLTVEvent::SetCountry(const char *Country)
     country=strcpyrealloc(country, Country);
     if (country)
     {
-        country=removechar(country,'\'');
+        country=removechar(country,'^');
         country=compactspace(country);
     }
 }
@@ -173,7 +173,7 @@ void cXMLTVEvent::SetAudio(const char *Audio)
     audio=strcpyrealloc(audio, Audio);
     if (audio)
     {
-        audio=removechar(audio,'\'');
+        audio=removechar(audio,'^');
         audio=compactspace(audio);
     }
 }
@@ -191,7 +191,7 @@ void cXMLTVEvent::SetCredits(const char *Credits)
         char *val=strdup(tok);
         if (val)
         {
-            val=removechar(val,'\'');
+            val=removechar(val,'^');
             val=compactspace(val);
             credits.Append(val);
         }
@@ -214,7 +214,7 @@ void cXMLTVEvent::SetCategory(const char *Category)
         char *val=strdup(tok);
         if (val)
         {
-            val=removechar(val,'\'');
+            val=removechar(val,'^');
             val=compactspace(val);
             category.Append(val);
         }
@@ -237,7 +237,7 @@ void cXMLTVEvent::SetReview(const char *Review)
         char *val=strdup(tok);
         if (val)
         {
-            val=removechar(val,'\'');
+            val=removechar(val,'^');
             val=compactspace(val);
             review.Append(val);
         }
@@ -259,7 +259,7 @@ void cXMLTVEvent::SetRating(const char *Rating)
         char *val=strdup(tok);
         if (val)
         {
-            val=removechar(val,'\'');
+            val=removechar(val,'^');
             val=compactspace(val);
             rating.Append(val);
             char *rval=strchr(tok,'|');
@@ -289,7 +289,7 @@ void cXMLTVEvent::SetVideo(const char *Video)
         char *val=strdup(tok);
         if (val)
         {
-            val=removechar(val,'\'');
+            val=removechar(val,'^');
             val=compactspace(val);
             video.Append(val);
         }
@@ -311,7 +311,7 @@ void cXMLTVEvent::SetPics(const char* Pics)
         char *val=strdup(tok);
         if (val)
         {
-            val=removechar(val,'\'');
+            val=removechar(val,'^');
             val=compactspace(val);
             pics.Append(val);
         }
@@ -333,7 +333,7 @@ void cXMLTVEvent::SetStarRating(const char *StarRating)
         char *val=strdup(tok);
         if (val)
         {
-            val=removechar(val,'\'');
+            val=removechar(val,'^');
             val=compactspace(val);
             starrating.Append(val);
         }
@@ -348,7 +348,7 @@ void cXMLTVEvent::AddReview(const char *Review)
     char *val=strdup(Review);
     if (val)
     {
-        val=removechar(val,'\'');
+        val=removechar(val,'^');
         val=compactspace(val);
         review.Append(val);
     }
@@ -359,7 +359,7 @@ void cXMLTVEvent::AddPics(const char* Pic)
     char *val=strdup(Pic);
     if (val)
     {
-        val=removechar(val,'\'');
+        val=removechar(val,'^');
         val=compactspace(val);
         pics.Append(val);
     }
@@ -369,7 +369,7 @@ void cXMLTVEvent::AddVideo(const char *VType, const char *VContent)
 {
     char *value=NULL;
     if (asprintf(&value,"%s|%s",VType,VContent)==-1) return;
-    value=removechar(value,'\'');
+    value=removechar(value,'^');
     value=compactspace(value);
     video.Append(value);
 }
@@ -380,7 +380,7 @@ void cXMLTVEvent::AddRating(const char *System, const char *Rating)
     if (asprintf(&value,"%s|%s",System,Rating)==-1) return;
     int r=atoi(Rating);
     if ((r>0 && r<=18) && (r>parentalRating)) parentalRating=r;
-    value=removechar(value,'\'');
+    value=removechar(value,'^');
     value=compactspace(value);
     rating.Append(value);
     rating.Sort();
@@ -397,7 +397,7 @@ void cXMLTVEvent::AddStarRating(const char *System, const char *Rating)
     {
         if (asprintf(&value,"*|%s",Rating)==-1) return;
     }
-    value=removechar(value,'\'');
+    value=removechar(value,'^');
     value=compactspace(value);
     starrating.Append(value);
 }
@@ -407,7 +407,7 @@ void cXMLTVEvent::AddCategory(const char *Category)
     char *val=strdup(Category);
     if (val)
     {
-        val=removechar(val,'\'');
+        val=removechar(val,'^');
         val=compactspace(val);
         category.Append(val);
         category.Sort();
@@ -425,7 +425,7 @@ void cXMLTVEvent::AddCredits(const char *CreditType, const char *Credit, const c
     {
         if (asprintf(&value,"%s|%s",CreditType,Credit)==-1) return;
     }
-    value=removechar(value,'\'');
+    value=removechar(value,'^');
     value=compactspace(value);
     credits.Append(value);
     credits.Sort();
diff --git a/import.cpp b/import.cpp
index 65bc6ac..b543bac 100644
--- a/import.cpp
+++ b/import.cpp
@@ -743,11 +743,6 @@ bool cImport::PutEvent(cEPGSource *Source, sqlite3 *Db, cSchedule* Schedule,
     bool retcode=false;
     bool added=false;
 
-    if (xEvent->EventID()==65234425)
-    {
-        dsyslog("!!!");
-    }
-
     if ((Flags & OPT_APPEND)==OPT_APPEND) append=true;
 
     if (append && !Event)
diff --git a/maps.h b/maps.h
index b9f9421..e66fb18 100644
--- a/maps.h
+++ b/maps.h
@@ -31,7 +31,6 @@
 #define USE_AUDIO              0x200
 #define USE_SEASON             0x400
 #define USE_STARRATING         0x800
-//#define USE_TITLE              0x1000
 
 #define CREDITS_ACTORS         0x100000
 #define CREDITS_DIRECTORS      0x200000
diff --git a/xmltv2vdr.cpp b/xmltv2vdr.cpp
index 45a76d7..c73ae43 100644
--- a/xmltv2vdr.cpp
+++ b/xmltv2vdr.cpp
@@ -916,6 +916,7 @@ bool cPluginXmltv2vdr::Start(void)
     g.EPGSources()->ReadIn(&g);
     g.epghandler = new cEPGHandler(&g);
     g.SetEPAll(g.EPAll());
+    isyslog("using sqlite v%s",sqlite3_libversion());
     if (sqlite3_threadsafe()==0) esyslog("sqlite3 not threadsafe!");
     cParse::InitLibXML();
     return true;