OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

~ fixing bugs in ConciergeServer.py test code 

~ fix bug in ConciergeModule: wrong closing tag for avatars list
0.6.3-post-fixes
Dr Scofield 2009-01-26 21:35:16 +00:00
parent 0aafeb5da3
commit 6cebb6e760
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
View File

@ -391,7 +391,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
string name = _attendeeNames[uuid]; string name = _attendeeNames[uuid];
list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", name, uuid)); list.Append(String.Format(" <avatar name=\"{0}\" uuid=\"{1}\" />\n", name, uuid));
} }
list.Append("</avatar>"); list.Append("</avatars>");
} }
string payload = list.ToString(); string payload = list.ToString();

10
OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py
View File

@ -61,12 +61,12 @@ class ConciergeHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.logResponse(200) self.logResponse(200)
def dumpXml(xml): def dumpXml(self, xml):
logging.debug('[ConciergeHandler] %s', xml.tag) logging.debug('[ConciergeHandler] %s', xml.tag)
for attr in xml.attrib: for attr in xml.attrib:
logging.debug('[ConciergeHandler] %s [%s] %s', xml.tag, attr, xml.attrib[attr]) logging.debug('[ConciergeHandler] %s [%s] %s', xml.tag, attr, xml.attrib[attr])
for kid in xml.getchildren: for kid in xml.getchildren():
dumpXml(kid) self.dumpXml(kid)
def do_POST(self): def do_POST(self):
self.logRequest() self.logRequest()
@ -80,8 +80,8 @@ class ConciergeHandler(BaseHTTPServer.BaseHTTPRequestHandler):
logging.debug('[ConciergeHandler] POST: content: %s', content) logging.debug('[ConciergeHandler] POST: content: %s', content)
try: try:
postXml = ET.parse(content) postXml = ET.fromstring(content)
dumpXml(postXml) self.dumpXml(postXml)
except xml.parsers.expat.ExpatError, xmlError: except xml.parsers.expat.ExpatError, xmlError:
logging.error('[ConciergeHandler] POST illformed:%s', xmlError) logging.error('[ConciergeHandler] POST illformed:%s', xmlError)
self.send_response(500) self.send_response(500)