changeset 834:2647dd909229

Merge
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Fri, 27 Nov 2015 12:21:24 +0000
parents f452455b5977 (diff) 39f982f9f9f1 (current diff)
children 84db2932ef02
files ape.js core.js pythonServer.py save.php
diffstat 1 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pythonServer.py	Fri Nov 27 12:20:56 2015 +0000
+++ b/pythonServer.py	Fri Nov 27 12:21:24 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)