From: Ian Weller <ian@ianweller.org>
Date: Tue, 22 Dec 2009 02:28:39 +0000 (-0600)
Subject: Fixes to Metadir:pages_add_rev
X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/fc682361b6d34052fb59b17ba2a3d71a3a6f6650?hp=c5075c4a66b4f0f461489f1cee62068b67e01ff0;ds=sidebyside

Fixes to Metadir:pages_add_rev
---

diff --git a/src/mw/metadir.py b/src/mw/metadir.py
index 49a91cf..3988d78 100644
--- a/src/mw/metadir.py
+++ b/src/mw/metadir.py
@@ -82,11 +82,13 @@ class Metadir(object):
     def pages_add_rev(self, pageid, rv):
         pagefile = os.path.join(self.location, 'cache', 'pages', str(pageid))
         fd = file(pagefile, 'w+')
-        pagedata = json.loads(fd.read())
+        pagedata_raw = fd.read()
+        if pagedata_raw == '':
+            pagedata = {}
+        else:
+            pagedata = json.loads(pagedata_raw)
         rvid = int(rv['revid'])
-        if pageid not in pagedata.keys():
-            pagedata[pageid] = {}
-        pagedata[pageid][rvid] = {
+        pagedata[rvid] = {
                 'user': rv['user'], 'timestamp': rv['timestamp'],
                 'content': rv['*'],
         }