From 935a34173cd396689177055ca705e3ec31a66d8b Mon Sep 17 00:00:00 2001
From: adustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8>
Date: Fri, 6 Apr 2001 21:25:13 +0000
Subject: [PATCH] Transaction fixes.

---
 ZMySQLDA/lib/python/Products/ZMySQLDA/DA.py   |  1 -
 .../Products/ZMySQLDA/connectionStatus.dtml   | 45 -------------------
 ZMySQLDA/lib/python/Products/ZMySQLDA/db.py   |  4 +-
 3 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 ZMySQLDA/lib/python/Products/ZMySQLDA/connectionStatus.dtml

diff --git a/ZMySQLDA/lib/python/Products/ZMySQLDA/DA.py b/ZMySQLDA/lib/python/Products/ZMySQLDA/DA.py
index 820bae1..225f780 100644
--- a/ZMySQLDA/lib/python/Products/ZMySQLDA/DA.py
+++ b/ZMySQLDA/lib/python/Products/ZMySQLDA/DA.py
@@ -113,7 +113,6 @@ class Connection(DABase.Connection):
     icon='misc_/Z%sDA/conn' % database_type
 
     manage_properties=HTMLFile('connectionEdit', globals())
-    manage_main=HTMLFile('connectionStatus', globals())
 
     def factory(self): return DB
 
diff --git a/ZMySQLDA/lib/python/Products/ZMySQLDA/connectionStatus.dtml b/ZMySQLDA/lib/python/Products/ZMySQLDA/connectionStatus.dtml
deleted file mode 100644
index 055fd9a..0000000
--- a/ZMySQLDA/lib/python/Products/ZMySQLDA/connectionStatus.dtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html lang="en">
-  <head><title><dtml-var title_or_id> Status</title></head>
-  <body bgcolor="#FFFFFF" link="#000099" vlink="#555555" alink="#77003B">
-    <dtml-var manage_tabs>
-    
-    <h2><dtml-var title_or_id> Status</h2>
-
-      <table cellspacing="2">
-
-        <tr>
-	  <th align="LEFT" valign="TOP">Id</th>
-	  <td align="LEFT" valign="TOP"><dtml-var id></td>
-	</tr>
-
-	<tr>
-	  <th align="LEFT" valign="TOP"><em>Title</em></th>
-	  <td align="LEFT" valign="TOP"><dtml-var title></td>
-	</tr>
-
-	<tr>
-	  <th align="LEFT" valign="TOP">Database Connection String</th>
-	  <td align="LEFT" valign="TOP"><dtml-var connection_string></td>
-	</tr>
-
-<tr></tr><tr>
-<td colspan=2>
-Transactions are <dtml-if transactions><em>enabled</em><dtml-else><em>disabled</em></dtml-if>.<BR>
-<dtml-if connected>
-  The database connection is <em>open</em>.<br>
-  <form action="manage_close_connection" method="get">
-     <input type="SUBMIT" value="Close Database Connection">
-  </form>
-<dtml-else>
-  The database connection is <em>not open</em>.<br>
-  <form action="manage_open_connection" method="get">
-     <input type="SUBMIT" value="Open Database Connection">
-  </form>
-</dtml-if>
-</td>
-<tr>
-  </table>
-
-  </body>
-</html>
diff --git a/ZMySQLDA/lib/python/Products/ZMySQLDA/db.py b/ZMySQLDA/lib/python/Products/ZMySQLDA/db.py
index 93f8a4e..929d665 100644
--- a/ZMySQLDA/lib/python/Products/ZMySQLDA/db.py
+++ b/ZMySQLDA/lib/python/Products/ZMySQLDA/db.py
@@ -261,10 +261,10 @@ class DB(TM):
         self.db.query("BEGIN")
 	self.db.store_result()
         
-    def commit(self, *ignored):
+    def _commit(self, *ignored):
         self.db.query("COMMIT")
 	self.db.store_result()
 
-    def rollback(self, *ignored):
+    def _abort(self, *ignored):
 	self.db.query("ROLLBACK")
 	self.db.store_result()