Mercurial > hg > webaudioevaluationtool
changeset 361:77d1cb86334b Dev_main
Resolved #1394: Python returns same XML responses as the PHP server
| author | Nicholas Jillings <nicholas.jillings@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 27 Nov 2015 12:09:49 +0000 |
| parents | 92eaa0db1e8f |
| children | 17c37d62d942 |
| files | pythonServer.py |
| diffstat | 1 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/pythonServer.py Fri Nov 27 11:08:45 2015 +0000 +++ b/pythonServer.py Fri Nov 27 12:09:49 2015 +0000 @@ -62,15 +62,21 @@ postVars = self.rfile.read(varLen) print curFileName file = open('saves/'+curFileName,'w') - curSaveIndex += 1; - curFileName = 'test-'+str(curSaveIndex)+'.xml' - print curFileName file.write(postVars) file.close() + try: + wbytes = os.path.getsize('saves/'+curFileName) + except OSError: + self.send_response(200) + self.send_header("Content-type", "text/xml") + self.end_headers() + self.wfile.write('<response state="error"><message>Could not open file</message></response>') self.send_response(200) self.send_header("Content-type", "text/xml") self.end_headers() - self.wfile.write('<response state="OK"><message>OK</message><file>"saves/'+curFileName+'"</file></response>') + self.wfile.write('<response state="OK"><message>OK</message><file bytes="'+str(wbytes)+'">"saves/'+curFileName+'"</file></response>') + curSaveIndex += 1 + curFileName = 'test-'+str(curSaveIndex)+'.xml' class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler): def do_HEAD(s): @@ -98,7 +104,7 @@ def do_POST(request): if(request.client_address[0] == "127.0.0.1"): - if (request.path == "/save"): + if (request.path == "/save" or request.path == "/save.php"): saveFile(request) else: send404(request)