[Zope-CVS] CVS: Products/AdaptableStorage/serial_ofs - FolderItems.py:1.15 FolderItemsByKeychain.py:1.6

[Shane Hathaway]

Update of /cvs-repository/Products/AdaptableStorage/serial_ofs
In directory cvs.zope.org:/tmp/cvs-serv30888/serial_ofs

Modified Files:
	FolderItems.py FolderItemsByKeychain.py 
Log Message:
Used the new method of storing mount points, as provided by DBTab.

=== Products/AdaptableStorage/serial_ofs/FolderItems.py 1.14 => 1.15 ===
--- Products/AdaptableStorage/serial_ofs/FolderItems.py:1.14	Wed Feb  5 14:43:12 2003
+++ Products/AdaptableStorage/serial_ofs/FolderItems.py	Thu Feb  6 15:34:39 2003
@@ -45,11 +45,11 @@
         assert isinstance(object, ObjectManager), repr(object)
         state = []
         event.ignoreAttribute('_objects')
+        mps = getattr(object, '_mount_points', None)
         for id, subob in object.objectItems():
-            mp = getattr(subob, '_v_mount_point_', None)
-            if mp is not None:
+            if mps and mps.has_key(id):
                 # Store the mount point rather than the mounted object.
-                subob = mp[0]
+                subob = mps[id]
             base = aq_base(subob)
             keychain = event.identifyObject(base)
             expected = event.makeKeychain(id, 0)


=== Products/AdaptableStorage/serial_ofs/FolderItemsByKeychain.py 1.5 => 1.6 ===
--- Products/AdaptableStorage/serial_ofs/FolderItemsByKeychain.py:1.5	Wed Feb  5 14:43:12 2003
+++ Products/AdaptableStorage/serial_ofs/FolderItemsByKeychain.py	Thu Feb  6 15:34:39 2003
@@ -44,11 +44,11 @@
         assert isinstance(object, ObjectManager), repr(object)
         state = []
         event.ignoreAttribute('_objects')
+        mps = getattr(object, '_mount_points', None)
         for id, subob in object.objectItems():
-            mp = getattr(subob, '_v_mount_point_', None)
-            if mp is not None:
+            if mps and mps.has_key(id):
                 # Store the mount point rather than the mounted object.
-                subob = mp[0]
+                subob = mps[id]
             base = aq_base(subob)
             keychain = event.identifyObject(base)
             if keychain is None: