Fixes to Metadir:pages_add_rev

[mw] / src / mw / metadir.py

diff --git a/src/mw/metadir.py b/src/mw/metadir.py
index 27e2fec06bf2253c3b836c9d8768a5a162584411..3988d78981c535f4539330a5dd80dd20e448e308 100644 (file)
--- a/src/mw/metadir.py
+++ b/src/mw/metadir.py
@@ -52,7 +52,7 @@ class Metadir(object):
         else:
             os.mkdir(self.location, 0755)
         # metadir versioning
-        fd = file(os.path.join(self.location, 'version'))
+        fd = file(os.path.join(self.location, 'version'), 'w')
         fd.write('1')
         fd.close()
         # create config
@@ -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['*'],
         }