move strToXML into Tools

diff --git a/RecordTimer.py b/RecordTimer.py
index a5df6725997a2ab67526785b5d642cbdc453d4e6..a5c179c4979b4ed6bd788a30d6c26d2b07887e28 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -12,7 +12,7 @@ from Screens.SubserviceSelection import SubserviceSelection
 import NavigationInstance
 from time import localtime
 
 import NavigationInstance
 from time import localtime
 

-from Tools.XMLTools import elementsWithTag, mergeText
+from Tools.XMLTools import elementsWithTag, mergeText, filterXMLString

 from ServiceReference import ServiceReference
 
 # ok, for descriptions etc we have:
 from ServiceReference import ServiceReference
 
 # ok, for descriptions etc we have:


@@ -238,9 +238,6 @@ class RecordTimer(timer.Timer):
                for timer in elementsWithTag(root.childNodes, "timer"):
                        self.record(createTimer(timer))
 
                for timer in elementsWithTag(root.childNodes, "timer"):
                        self.record(createTimer(timer))
 

-       def strToXML(self, str):
-               return str.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace("'", '&apos;'). replace('"', '&quot;')
-

        def saveTimer(self):
                #doc = xml.dom.minidom.Document()
                #root_element = doc.createElement('timers')
        def saveTimer(self):
                #doc = xml.dom.minidom.Document()
                #root_element = doc.createElement('timers')


@@ -296,8 +293,8 @@ class RecordTimer(timer.Timer):
                        list.append(' end="' + str(int(timer.end)) + '"')
                        list.append(' serviceref="' + str(timer.service_ref) + '"')
                        list.append(' repeated="' + str(int(timer.repeated)) + '"')
                        list.append(' end="' + str(int(timer.end)) + '"')
                        list.append(' serviceref="' + str(timer.service_ref) + '"')
                        list.append(' repeated="' + str(int(timer.repeated)) + '"')

-                       list.append(' name="' + str(self.strToXML(timer.name)) + '"')
-                       list.append(' description="' + str(self.strToXML(timer.description)) + '"')
+                       list.append(' name="' + str(filterXMLString(timer.name)) + '"')
+                       list.append(' description="' + str(filterXMLString(timer.description)) + '"')

                        if timer.eit is not None:
                                list.append(' eit="' + str(timer.eit) + '"')
                        list.append(' disabled="' + str(int(timer.disabled)) + '"')
                        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 9f316d74448598f36127115fef02a9721496510d..161ca308f4a93be97119192c82ab138118b8cc5a 100644 (file)
--- a/lib/python/Tools/XMLTools.py
+++ b/lib/python/Tools/XMLTools.py
@@ -24,5 +24,4 @@ def mergeText(nodelist):
        return rc
 
 def filterXMLString(text):
        return rc
 
 def filterXMLString(text):

-       # TODO: better solutions?
-       return text.replace('"', "&quot;").replace('<', '&lt;')
+               return str.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace("'", '&apos;'). replace('"', '&quot;')