[Zope-CVS] CVS: Products/AdaptableStorage/gateway_fs - FSClassificationSection.py:1.4 FSDirectoryItems.py:1.5

[Shane Hathaway]

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

Modified Files:
	FSClassificationSection.py FSDirectoryItems.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/gateway_fs/FSClassificationSection.py 1.3 => 1.4 ===
--- Products/AdaptableStorage/gateway_fs/FSClassificationSection.py:1.3	Fri Dec  6 17:06:50 2002
+++ Products/AdaptableStorage/gateway_fs/FSClassificationSection.py	Sat Dec  7 00:59:12 2002
@@ -54,7 +54,8 @@
         classification['filename'] = self.getIdFrom(keychain)
         return ((classification,),), text.strip()
 
-    def store(self, object_mapper, keychain, classification):
+    def store(self, object_mapper, keychain, state):
+        classification = state[0][0]
         items = classification.items()
         items.sort()
         text = []


=== Products/AdaptableStorage/gateway_fs/FSDirectoryItems.py 1.4 => 1.5 ===
--- Products/AdaptableStorage/gateway_fs/FSDirectoryItems.py:1.4	Fri Dec  6 17:06:50 2002
+++ Products/AdaptableStorage/gateway_fs/FSDirectoryItems.py	Sat Dec  7 00:59:12 2002
@@ -41,8 +41,8 @@
 
     def load(self, object_mapper, keychain):
         c = self.fs_conn
-        assert c.readNodeType(keychain) == 'd'
-        names = c.readData(keychain)
+        assert c.readNodeType(keychain[-1]) == 'd'
+        names = c.readData(keychain[-1])
         names.sort()
         res = []
         for name in names: