From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 3 Mar 2006 15:22:31 +0000 (+0000)
Subject: rename FilterXMLString to StringToXML
X-Git-Tag: 2.6.0~3919
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/0d00868acef330b30c6505b199cec32b1105ece2

rename FilterXMLString to StringToXML
---

diff --git a/RecordTimer.py b/RecordTimer.py
index a5c179c4..faec5344 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -12,7 +12,7 @@ from Screens.SubserviceSelection import SubserviceSelection
 import NavigationInstance
 from time import localtime
 
-from Tools.XMLTools import elementsWithTag, mergeText, filterXMLString
+from Tools.XMLTools import elementsWithTag, mergeText, stringToXML
 from ServiceReference import ServiceReference
 
 # ok, for descriptions etc we have:
@@ -291,10 +291,10 @@ class RecordTimer(timer.Timer):
 			list.append('<timer')
 			list.append(' begin="' + str(int(timer.begin)) + '"')
 			list.append(' end="' + str(int(timer.end)) + '"')
-			list.append(' serviceref="' + str(timer.service_ref) + '"')
+			list.append(' serviceref="' + str(stringToXML(timer.service_ref)) + '"')
 			list.append(' repeated="' + str(int(timer.repeated)) + '"')
-			list.append(' name="' + str(filterXMLString(timer.name)) + '"')
-			list.append(' description="' + str(filterXMLString(timer.description)) + '"')
+			list.append(' name="' + str(stringToXML(timer.name)) + '"')
+			list.append(' description="' + str(stringToXML(timer.description)) + '"')
 			if timer.eit is not None:
 				list.append(' eit="' + str(timer.eit) + '"')
 			list.append(' disabled="' + str(int(timer.disabled)) + '"')
diff --git a/lib/python/Tools/XMLTools.py b/lib/python/Tools/XMLTools.py
index 161ca308..2fd896d9 100644
--- a/lib/python/Tools/XMLTools.py
+++ b/lib/python/Tools/XMLTools.py
@@ -23,5 +23,5 @@ def mergeText(nodelist):
 			rc = rc + node.data
 	return rc
 
-def filterXMLString(text):
-		return str.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace("'", '&apos;'). replace('"', '&quot;')
+def stringToXML(text):
+		return str.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace("'", '&apos;').replace('"', '&quot;')