ouczbs/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for a JSON encoding "quirk" in PHP

Browse Source
This commit is contained in:
David Snopek 2013-08-01 17:29:19 +01:00
parent 0e1322e1cd
commit 4e2c697abc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AnkiServer/apps/rest_app.py
View File

@ -228,6 +228,10 @@ class RestApp(object):
logging.error(req.path+': Unable to parse JSON: '+str(e), exc_info=True) logging.error(req.path+': Unable to parse JSON: '+str(e), exc_info=True)
raise HTTPBadRequest() raise HTTPBadRequest()
# fix for a JSON encoding 'quirk' in PHP
if type(data) == list and len(data) == 0:
data = {}
# make the keys into non-unicode strings # make the keys into non-unicode strings
data = dict([(str(k), v) for k, v in data.items()]) data = dict([(str(k), v) for k, v in data.items()])
@ -553,7 +557,7 @@ class CollectionHandler(RestHandlerBase):
args = [] args = []
if req.data.has_key('updated_since'): if req.data.has_key('updated_since'):
sql += ' WHERE r.id > ?' sql += ' WHERE r.id > ?'
args.append(req.data['updated_since'] * 1000) args.append(long(req.data['updated_since']) * 1000)
sql += ' ORDER BY r.id DESC' sql += ' ORDER BY r.id DESC'
sql += ' LIMIT ' + str(req.data.get('limit', 100)) sql += ' LIMIT ' + str(req.data.get('limit', 100))