[Zope-CVS] CVS: Products/AdaptableStorage/serial_ofs - FolderItems.py:1.4 MetaTypeClassifier.py:1.5

[Shane Hathaway]

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

Modified Files:
	FolderItems.py MetaTypeClassifier.py 
Log Message:
Fixed the bugs in the new strategy (OIDs no longer include mapper_names, 
allowing more flexibility in loading and storage).  Did not resolve new
key generation yet, but everything else seems to be in good shape.


=== Products/AdaptableStorage/serial_ofs/FolderItems.py 1.3 => 1.4 ===
--- Products/AdaptableStorage/serial_ofs/FolderItems.py:1.3	Fri Dec  6 17:06:50 2002
+++ Products/AdaptableStorage/serial_ofs/FolderItems.py	Sat Dec  7 00:59:13 2002
@@ -42,6 +42,10 @@
         for id, subob in object.objectItems():
             base = aq_base(subob)
             keychain = event.identifyObject(base)
+            if keychain is None:
+                # XXX this needs to be delegated to something
+                keychain = event.getKeychain()
+                keychain = keychain[:-1] + ((keychain[-1] + '/' + id),)
             event.notifySerializedRef(id, base, 1, keychain)
             state.append((id, keychain))
         return state


=== Products/AdaptableStorage/serial_ofs/MetaTypeClassifier.py 1.4 => 1.5 ===
--- Products/AdaptableStorage/serial_ofs/MetaTypeClassifier.py:1.4	Fri Dec  6 17:06:50 2002
+++ Products/AdaptableStorage/serial_ofs/MetaTypeClassifier.py	Sat Dec  7 00:59:13 2002
@@ -46,7 +46,7 @@
 
 
     def registerKey(self, meta_type, mapper_name, key):
-        self.key_to_res[key] = (meta_type, mapper_name)
+        self.key_to_res[key] = ({'meta_type': meta_type}, mapper_name)
 
 
     def registerDefaultLoader(self, meta_type, mapper_name, isdir):