|
[Webware-checkins] CVS: Webware/MiddleKit/Run MiddleObject.py,1.21,1.22 SQLObjectStore.py,1.44,1.45
From: Chuck Esterbrook <echuck@us...> - 2002-05-04 03:54
|
Update of /cvsroot/webware/Webware/MiddleKit/Run
In directory usw-pr-cvs1:/tmp/cvs-serv23630/Run
Modified Files:
MiddleObject.py SQLObjectStore.py
Log Message:
renamed initFromStore(self, row) to readStoreData(self, store, row)
Index: MiddleObject.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Run/MiddleObject.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MiddleObject.py 3 May 2002 14:26:28 -0000 1.21
--- MiddleObject.py 4 May 2002 03:54:56 -0000 1.22
***************
*** 49,53 ****
_mk_setCache = {} # cache the various setFoo methods first by qualified class name
! def initFromRow(self, row):
fullClassName = self.__class__.__module__ + '.' + self.__class__.__name__
cache = self._mk_setCache.setdefault(fullClassName, [])
--- 49,63 ----
_mk_setCache = {} # cache the various setFoo methods first by qualified class name
! def readStoreData(self, store, row):
! """
! Invoked by the store in order for this object to read data
! from the persistent store. Could be invoked multiple times
! for the same object in order to "refresh the attributes"
! from the persistent store.
! """
! if self._mk_store:
! assert self._mk_store is store, 'Cannot refresh data from a different store.'
! else:
! self.setStore(store)
fullClassName = self.__class__.__module__ + '.' + self.__class__.__name__
cache = self._mk_setCache.setdefault(fullClassName, [])
Index: SQLObjectStore.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Run/SQLObjectStore.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** SQLObjectStore.py 3 May 2002 14:26:29 -0000 1.44
--- SQLObjectStore.py 4 May 2002 03:54:56 -0000 1.45
***************
*** 285,291 ****
obj = pyClass()
assert isinstance(obj, MiddleObject), 'Not a MiddleObject. obj = %r, type = %r, MiddleObject = %r' % (obj, type(obj), MiddleObject)
! obj.initFromRow(row) # @@ 2002-05-03 ce: should be redone as readStoreData(store, row) and then remove next if stmt
! if obj._mk_store is not self:
! obj.setStore(self)
obj.setKey(key)
self._objects[key] = obj
--- 285,289 ----
obj = pyClass()
assert isinstance(obj, MiddleObject), 'Not a MiddleObject. obj = %r, type = %r, MiddleObject = %r' % (obj, type(obj), MiddleObject)
! obj.readStoreData(self, row)
obj.setKey(key)
self._objects[key] = obj
***************
*** 293,297 ****
# Existing object
if refreshAttrs:
! obj.initFromRow(row)
objs.append(obj)
objs.extend(deepObjs)
--- 291,295 ----
# Existing object
if refreshAttrs:
! obj.readStoreData(self, row)
objs.append(obj)
objs.extend(deepObjs)
|
| Thread | Author | Date |
|---|---|---|
| [Webware-checkins] CVS: Webware/MiddleKit/Run MiddleObject.py,1.21,1.22 SQLObjectStore.py,1.44,1.45 | Chuck Esterbrook <echuck@us...> |