rename FilterXMLString to StringToXML

diff --git a/RecordTimer.py b/RecordTimer.py
index a5c179c4979b4ed6bd788a30d6c26d2b07887e28..faec5344fcc36e92b4eca61451532a47710541ba 100644 (file)
--- 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 161ca308f4a93be97119192c82ab138118b8cc5a..2fd896d967fae29555f6d6e845608c8cb4bb8bd9 100644 (file)
--- 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;')