new variable search.series

4 files changed, 20 insertions, 2 deletions

diff --git a/HISTORY b/HISTORY
index 7318ff1..1f65b27 100644
--- a/HISTORY
+++ b/HISTORY
@@ -33,6 +33,8 @@ new:
     direct links e.g. in the search timer mails.
   * %date_iso% and %date_iso_now% return the (current) date in 'YYYY-MM-DD' format, 
     suggested by Andreas Mair.
+  * %search.series% returns 1 or 0 depending on the flag "series recording" of a search and
+    can be used in the directory entry of a search or it's depending variables.
 - new command 'connect' within internal variables: with this command you can connect to
   a TCP service, pass data and assign the result to a variable. See the MANUAL for 
   details.
diff --git a/HISTORY.DE b/HISTORY.DE
index cd77415..8086d8d 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -33,6 +33,8 @@ neu:
     Damit können nun z.B. in den Suchtimer-Mails direkte Links angegeben werden.
   * %date_iso% und %date_iso_now% ergeben das (aktuelle) Datum im Format 'YYYY-MM-DD', 
     vorgeschlagen von Andreas Mair.
+  * %search.series% liefert 1 oder 0 abhängig vom Flag "Serienaufnahme" der Suche und kann
+    im Verzeichniseintrag einer Suche oder in deren abhängigen Variablen benutzt werden.
 - neues Kommando 'connect' innerhalb interner Variablen: damit kann eine Verbindung zu einem
   TCP-Dienst aufgebaut werden, Daten übergeben und das Ergebnis einer Variable zugewiesen
   werden. S. MANUAL für Details.
diff --git a/doc-src/en/epgsearch.4.txt b/doc-src/en/epgsearch.4.txt
index ae29610..e940fa5 100644
--- a/doc-src/en/epgsearch.4.txt
+++ b/doc-src/en/epgsearch.4.txt
@@ -65,8 +65,10 @@ entry. This allows to form directory entries like this one:
 
  %Category%~%Genre%~%Title%~%Episode%~%Subtitle%
 
-There is also another variable %search.query% that will be replaced with the
-query of the search timer.
+There are also the following search variables:
+
+ %search.query% that will be replaced with the query of the search timer
+ %search.series% that is '1', if the search has it's 'Series recording' flag set, else '0'.
 
 See also C<epgsearchuservars.conf(5)>.
 
diff --git a/uservars.h b/uservars.h
index 33be78e..c2c21c7 100644
--- a/uservars.h
+++ b/uservars.h
@@ -677,6 +677,16 @@ public:
 	}
 };
 
+class cSearchSeriesVar : public cSearchVar {
+public:
+    cSearchSeriesVar() : cSearchVar("%search.series%") {}
+    string Evaluate(const cSearchExt* s) 
+	{ 
+	    if (!s) return "";
+	    return NumToString(s->useEpisode);
+	}
+};
+
 class cUserVars : public cList<cUserVar> {
  public:
     cTitleVar titleVar;
@@ -704,6 +714,7 @@ class cUserVars : public cList<cUserVar> {
     cChannelDataVar chDataVar;
     cChannelGroupVar chGroupVar;
     cSearchQueryVar searchQueryVar;
+    cSearchSeriesVar searchSeriesVar;
 
     cColonVar colonVar;
     cDateNowVar dateNowVar;
@@ -779,6 +790,7 @@ class cUserVars : public cList<cUserVar> {
 	    internalTimerVars[timerLiveIDVar.Name()] = &timerLiveIDVar;
 
 	    internalSearchVars[searchQueryVar.Name()] = &searchQueryVar;
+	    internalSearchVars[searchSeriesVar.Name()] = &searchSeriesVar;
 	}
 
     void InitExtEPGVars()