From 13bc06295fe67a20d46caddf09c97984760e0482 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Fri, 21 Sep 2007 19:15:02 +0000 Subject: [PATCH] Changing the storage usage calculation algorithm to not count old notebook revisions. --- controller/Users.py | 2 +- controller/test/Test_users.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/controller/Users.py b/controller/Users.py index fa07782..0eea8cb 100644 --- a/controller/Users.py +++ b/controller/Users.py @@ -343,7 +343,7 @@ class Users( object ): def sum_notebook( notebook ): return \ - sum_revisions( notebook ) + \ + self.__database.size( notebook.object_id ) + \ sum( [ sum_revisions( note ) for note in notebook.notes ], 0 ) for notebook in user.notebooks: diff --git a/controller/test/Test_users.py b/controller/test/Test_users.py index a5641c7..64f9836 100644 --- a/controller/test/Test_users.py +++ b/controller/test/Test_users.py @@ -213,9 +213,7 @@ class Test_users( Test_controller ): # expected a sum of the sizes of all of this user's notebooks, notes, and revisions expected_size = \ self.database.size( notebooks[ 0 ].object_id ) + \ - self.database.size( notebooks[ 0 ].object_id, notebooks[ 0 ].revision ) + \ - self.database.size( notebooks[ 1 ].object_id ) + \ - self.database.size( notebooks[ 1 ].object_id, notebooks[ 1 ].revision ) + self.database.size( notebooks[ 1 ].object_id ) assert size == expected_size @@ -224,7 +222,6 @@ class Test_users( Test_controller ): expected_size = \ self.database.size( self.anon_notebook.object_id ) + \ - self.database.size( self.anon_notebook.object_id, self.anon_notebook.revision ) + \ self.database.size( self.anon_notebook.notes[ 0 ].object_id ) + \ self.database.size( self.anon_notebook.notes[ 0 ].object_id, self.anon_notebook.notes[ 0 ].revision )