From c646a9d7be631e75b8674db99e7979899f04ba68 Mon Sep 17 00:00:00 2001
From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 3 Mar 2006 15:01:29 +0000
Subject: [PATCH] move strToXML into Tools

---
 RecordTimer.py               | 9 +++------
 lib/python/Tools/XMLTools.py | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/RecordTimer.py b/RecordTimer.py
index a5df6725..a5c179c4 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
+from Tools.XMLTools import elementsWithTag, mergeText, filterXMLString
 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))
 
-	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')
@@ -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(' 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)) + '"')
diff --git a/lib/python/Tools/XMLTools.py b/lib/python/Tools/XMLTools.py
index 9f316d74..161ca308 100644
--- a/lib/python/Tools/XMLTools.py
+++ b/lib/python/Tools/XMLTools.py
@@ -24,5 +24,4 @@ def mergeText(nodelist):
 	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;')
-- 
2.30.2