From b28ad987eb858306bd394e149247ba32ed73b59b Mon Sep 17 00:00:00 2001
From: Jochen Dolze <vdr@dolze.de>
Date: Sun, 22 Apr 2012 14:39:13 +0200
Subject: Added missing debug.h Changed some debugging output

---
 debug.h       | 38 ++++++++++++++++++++++++++++++++++++++
 parse.cpp     |  2 +-
 xmltv2vdr.cpp | 19 ++++++++++++-------
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 debug.h

diff --git a/debug.h b/debug.h
new file mode 100644
index 0000000..0bc6c46
--- /dev/null
+++ b/debug.h
@@ -0,0 +1,38 @@
+/*
+ * debug.h: A program for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __debug_h_
+#define __debug_h_
+
+#include "source.h"
+
+extern void logger(cEPGSource *source, char logtype, const char* format, ...);
+extern char *logfile;
+extern int SysLogLevel;
+
+#ifdef esyslog
+#undef esyslog
+#endif
+#ifdef isyslog
+#undef isyslog
+#endif
+#ifdef dsyslog
+#undef dsyslog
+#endif
+
+#define esyslog(a...) logger(NULL,'E', a)
+#define isyslog(a...) logger(NULL,'I', a)
+#define dsyslog(a...) logger(NULL,'D', a)
+#define tsyslog(a...) void( (logfile) ? logger(NULL,'T', a) : void() )
+
+#define esyslogs(s,a...) logger(s,'E', a)
+#define isyslogs(s,a...) logger(s,'I', a)
+#define dsyslogs(s,a...) logger(s,'D', a)
+#define tsyslogs(s,a...) void( (logfile) ? logger(s,'T', a) : void() )
+
+
+#endif
diff --git a/parse.cpp b/parse.cpp
index 3610a98..31d45af 100644
--- a/parse.cpp
+++ b/parse.cpp
@@ -247,7 +247,7 @@ bool cParse::FetchSeasonEpisode(iconv_t Conv, const char *EPDir, const char *Tit
 
     if (!found)
     {
-        isyslog("xmltv2vdr: failed to find '%s' for '%s' in eplists",ShortText,Title);
+        isyslog("failed to find '%s' for '%s' in eplists",ShortText,Title);
     }
     if (line) free(line);
     fclose(f);
diff --git a/xmltv2vdr.cpp b/xmltv2vdr.cpp
index e8430b5..4cbb7da 100644
--- a/xmltv2vdr.cpp
+++ b/xmltv2vdr.cpp
@@ -177,12 +177,16 @@ bool cEPGHandler::SetShortText(cEvent* Event, const char* ShortText)
     if (import->WasChanged(Event))
     {
         // ok we already changed this event!
-        tsyslog("{%i} already seen stext %s",Event->EventID(),Event->Title());
+        tsyslog("{%i} already seen stext '%s'",Event->EventID(),Event->Title());
         return true;
     }
-    if (!ShortText) return true; // prevent setting empty shorttext
-    if (!strlen(ShortText)) return true; // prevent setting empty shorttext
-    tsyslog("{%i} setting stext (%s) of %s",Event->EventID(),ShortText,Event->Title());
+    // prevent setting empty shorttext
+    if (!ShortText) return true;
+    // prevent setting empty shorttext
+    if (!strlen(ShortText)) return true;
+    // prevent setting shorttext equal
+    if (Event->Title() && !strcasecmp(Event->Title(),ShortText)) return true;
+    tsyslog("{%i} setting stext (%s) of '%s'",Event->EventID(),ShortText,Event->Title());
     return false;
 }
 
@@ -199,13 +203,13 @@ bool cEPGHandler::SetDescription(cEvent* Event, const char* Description)
         if (strncasecmp(Event->Description(),Description,len))
         {
             // eit description changed -> set it
-            tsyslog("{%i} changing descr of %s",Event->EventID(),Event->Title());
+            tsyslog("{%i} changing descr of '%s'",Event->EventID(),Event->Title());
             return false;
         }
-        tsyslog("{%i} already seen descr %s",Event->EventID(),Event->Title());
+        tsyslog("{%i} already seen descr '%s'",Event->EventID(),Event->Title());
         return true;
     }
-    tsyslog("{%i} setting descr of %s",Event->EventID(),Event->Title());
+    tsyslog("{%i} setting descr of '%s'",Event->EventID(),Event->Title());
     return false;
 }
 
@@ -672,6 +676,7 @@ time_t cPluginXmltv2vdr::WakeupTime(void)
 
     time_t nt=epgsources.NextRunTime();
     if (nt) nt-=(time_t) 180;
+    tsyslog("reporting wakeuptime %s",ctime(&nt));
     return nt;
 }
 
-- 
cgit v1.2.3