[Zope-CVS] CVS: Products/AdaptableStorage - Zope2SQL.py:1.2

[Shane Hathaway]

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

Modified Files:
	Zope2SQL.py 
Log Message:
With a few corrections and duct tape, all tests pass.  Woohoo!


=== Products/AdaptableStorage/Zope2SQL.py 1.1 => 1.2 ===
--- Products/AdaptableStorage/Zope2SQL.py:1.1	Tue Dec 10 15:37:51 2002
+++ Products/AdaptableStorage/Zope2SQL.py	Tue Dec 10 17:27:00 2002
@@ -28,7 +28,7 @@
      SQLFolderItems, SQLItemId, SQLKeychainGenerator, SQLRemainder
 
 
-def createMapper(params='', table_prefix='zodb'):
+def createMapper(params='', table_prefix='zodb', volatile=1):
     conn = PsycopgConnection(params, table_prefix)
 
     object_serializers = {}
@@ -65,7 +65,7 @@
     # root serializer
     s = ObjectSerializer('Persistence', 'PersistentMapping')
     aspect = FixedPersistentMapping()
-    aspect.add('Application', ('/',), ('OFS.Application.Application',))
+    aspect.add('Application', (0,), ('OFS.Application.Application',))
     s.addAspect('items', aspect)
     s.addAspect('roll_call', RollCall())
     root_serializer = s
@@ -75,7 +75,7 @@
     folder_items_gw = SQLFolderItems(conn)
     item_id_gw = SQLItemId(conn)
     remainder_gw = SQLRemainder(conn)
-    classification_gw = SQLClassificationSection(conn)
+    classification_gw = SQLClassification(conn)
     keychain_gen = SQLKeychainGenerator(conn)
     gws = (folder_items_gw, item_id_gw, remainder_gw, classification_gw,
            keychain_gen)
@@ -122,7 +122,7 @@
     classifier.registerDefaultLoader('Folder', 'OFS.Folder.Folder', 1)
     classifier.registerDefaultStorage('(folderish object)', 'anyfolder', 1)
     classifier.registerDefaultStorage('(fileish object)', 'anyfile', 0)
-    classifier.registerKey('Application', 'OFS.Application.Application', '/')
+    classifier.registerKey('Application', 'OFS.Application.Application', 0)
     classifier.register('CMF Skins Tool', 'anyfile')  # XXX workaround
     rm = ObjectMapper(
         None, root_serializer, root_gateway, classifier, keychain_gen)