fixed a problem with pipes in the pattern of blacklist, thanks to Andreas Mair for reporting

4 files changed, 9 insertions, 9 deletions

diff --git a/HISTORY b/HISTORY
index 01a274a..006e5be 100644
--- a/HISTORY
+++ b/HISTORY
@@ -52,6 +52,8 @@ fixes:
   to spockele@vdrportal for reporting
 - fixed some compiler warnings with g++ 4.3
 - fine-tuning fuzzy matching of descriptions, thanks to Alf Fahland for providing a patch
+- fixed a problem with pipes in the pattern of blacklists, thanks to Andreas Mair for
+  reporting.
 
 
 2007-09-02: Version 0.9.23
diff --git a/HISTORY.DE b/HISTORY.DE
index 9cf1b26..0b87e67 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -60,6 +60,8 @@ fixes:
 - einige Compilerwarnungen von g++ 4.3 behoben
 - fine-tuning beim fuzzy-Vergleich von Inhaltsangaben, Danke an Alf Fahland für einen
   Patch
+- Problem mit Pipes im Suchbegriff einer Blacklist behoben, Danke anAndreas Mair für
+  den Hinweis.
 
 
 2007-09-02: Version 0.9.23
diff --git a/blacklist.c b/blacklist.c
index aff3211..6f23aef 100644
--- a/blacklist.c
+++ b/blacklist.c
@@ -175,14 +175,10 @@ const char *cBlacklist::ToText(void)
   char* tmp_catvalues = NULL;
 
   free(buffer);
-  if (mode < 4 || mode == 5) // not a regular expression
-      asprintf(&tmp_search, "%s", search);
-  else if (mode ==4)
-  {
-      tmp_search = strdup(search);
-      while(strstr(tmp_search, "|"))
-	  tmp_search = strreplace(tmp_search, "|", "!^pipe^!"); // ugly: replace with something, that should not happen to be part of a regular expression
-  }
+  tmp_search = strdup(search);
+  while(strstr(tmp_search, "|"))
+    tmp_search = strreplace(tmp_search, "|", "!^pipe^!"); // ugly: replace a pipe with something, that should not happen to be part of a regular expression 
+
   strreplace(tmp_search, ':', '|');
 
   if (useTime)
diff --git a/scripts/timercmds-auxinfo.sh b/scripts/timercmds-auxinfo.sh
index 0a89a6a..94dcc62 100755
--- a/scripts/timercmds-auxinfo.sh
+++ b/scripts/timercmds-auxinfo.sh
@@ -15,7 +15,7 @@
 #<Configuration>
 
 # Your timers.conf
-TIMERS="/etc/vdr.conf/timers.conf"
+TIMERS="/video/timers.conf"
 
 #</Configuration>