From 6cebb6e7607c7197852300f1c2f014927094dbb4 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Mon, 26 Jan 2009 21:35:16 +0000 Subject: ~ fixing bugs in ConciergeServer.py test code ~ fix bug in ConciergeModule: wrong closing tag for avatars list --- .../Environment/Modules/Avatar/Concierge/ConciergeModule.cs | 2 +- .../Environment/Modules/Avatar/Concierge/ConciergeServer.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs index 2d1f381..b4f1a9e 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs @@ -391,7 +391,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge string name = _attendeeNames[uuid]; list.Append(String.Format(" \n", name, uuid)); } - list.Append(""); + list.Append(""); } string payload = list.ToString(); diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py index e5b1fd2..4a1a2b0 100755 --- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py +++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py @@ -61,12 +61,12 @@ class ConciergeHandler(BaseHTTPServer.BaseHTTPRequestHandler): self.logResponse(200) - def dumpXml(xml): + def dumpXml(self, xml): logging.debug('[ConciergeHandler] %s', xml.tag) for attr in xml.attrib: logging.debug('[ConciergeHandler] %s [%s] %s', xml.tag, attr, xml.attrib[attr]) - for kid in xml.getchildren: - dumpXml(kid) + for kid in xml.getchildren(): + self.dumpXml(kid) def do_POST(self): self.logRequest() @@ -80,8 +80,8 @@ class ConciergeHandler(BaseHTTPServer.BaseHTTPRequestHandler): logging.debug('[ConciergeHandler] POST: content: %s', content) try: - postXml = ET.parse(content) - dumpXml(postXml) + postXml = ET.fromstring(content) + self.dumpXml(postXml) except xml.parsers.expat.ExpatError, xmlError: logging.error('[ConciergeHandler] POST illformed:%s', xmlError) self.send_response(500) -- cgit v1.1