[Zope-CVS] CVS: Products/Ape - component.xml:1.7 datatypes.py:1.4

[Shane Hathaway]

Update of /cvs-repository/Products/Ape
In directory cvs.zope.org:/tmp/cvs-serv461

Modified Files:
	component.xml datatypes.py 
Log Message:
Made conflict debugging a ZConfig option.

It is useful to turn on when writing gateways.


=== Products/Ape/component.xml 1.6 => 1.7 ===
--- Products/Ape/component.xml:1.6	Wed Mar 24 22:17:07 2004
+++ Products/Ape/component.xml	Thu Mar 25 23:01:08 2004
@@ -65,6 +65,13 @@
         files.  See Products/Ape/doc/apexml.txt.
       </description>
     </key>
+    <key name="debug-conflicts" required="no"
+        datatype="boolean" default="False">
+      <description>
+        If enabled, storage conflicts will be handled as runtime errors rather
+        than ZODB conflicts, making it easier to debug mappers.
+      </description>
+    </key>
     <multisection type="apelib.Connection" name="+" attribute="connections">
       <description>
         Defines a database connector for use with this storage.


=== Products/Ape/datatypes.py 1.3 => 1.4 ===
--- Products/Ape/datatypes.py:1.3	Wed Mar 24 10:52:07 2004
+++ Products/Ape/datatypes.py	Thu Mar 25 23:01:08 2004
@@ -32,7 +32,8 @@
         conf = load_conf(config.mapper_variation, search_products=1)
         r = resource.StaticResource(conf)
         return storage.ApeStorage(
-            conf_resource=r, connections=conns, name=self.name)
+            conf_resource=r, connections=conns, name=self.name,
+            debug_conflicts=config.debug_conflicts)
 
 
 class Database(ZopeDatabase):