Commit 88c25449 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Fix history prototype.

- Rename length 'parameter' to 'size'
- Define None as default version.

See HistoryTests.checkSimpleHistory.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1798 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 23cc39da
...@@ -123,8 +123,8 @@ class Storage(BaseStorage.BaseStorage, ...@@ -123,8 +123,8 @@ class Storage(BaseStorage.BaseStorage,
def registerDB(self, db, limit): def registerDB(self, db, limit):
self.app.registerDB(db, limit) self.app.registerDB(db, limit)
def history(self, oid, version, length=1, filter=None): def history(self, oid, version=None, size=1, filter=None):
return self.app.history(oid, version, length, filter) return self.app.history(oid, version, size, filter)
def sync(self): def sync(self):
self.app.sync() self.app.sync()
......
...@@ -400,7 +400,7 @@ class Application(object): ...@@ -400,7 +400,7 @@ class Application(object):
finally: finally:
self._cache_lock_release() self._cache_lock_release()
# history return serial, so use it # history return serial, so use it
hist = self.history(oid, length = 1, object_only = 1) hist = self.history(oid, size=1, object_only=1)
if len(hist) == 0: if len(hist) == 0:
raise NEOStorageNotFoundError() raise NEOStorageNotFoundError()
if hist[0] != oid: if hist[0] != oid:
...@@ -878,7 +878,7 @@ class Application(object): ...@@ -878,7 +878,7 @@ class Application(object):
def transactionLog(self, first, last): def transactionLog(self, first, last):
return self.__undoLog(first, last, with_oids=True) return self.__undoLog(first, last, with_oids=True)
def history(self, oid, version=None, length=1, filter=None, object_only=0): def history(self, oid, version=None, size=1, filter=None, object_only=0):
# Get history informations for object first # Get history informations for object first
cell_list = self._getCellListForOID(oid, readable=True) cell_list = self._getCellListForOID(oid, readable=True)
shuffle(cell_list) shuffle(cell_list)
...@@ -890,7 +890,7 @@ class Application(object): ...@@ -890,7 +890,7 @@ class Application(object):
self.local_var.history = None self.local_var.history = None
try: try:
self._askStorage(conn, Packets.AskObjectHistory(oid, 0, length)) self._askStorage(conn, Packets.AskObjectHistory(oid, 0, size))
except ConnectionClosed: except ConnectionClosed:
continue continue
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment