[gnue] r7409 - in trunk: gnue-common/src/datasources gnue-common/src/datasources/drivers/Base gnue-pointofsale/samples/oldtownemarket

[reinhard]

Author: reinhard
Date: 2005-04-18 17:38:52 -0500 (Mon, 18 Apr 2005)
New Revision: 7409

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
   trunk/gnue-pointofsale/samples/oldtownemarket/pos_backend.py
Log:
Phased out DataObject.triggerExtensios. GDataSource.extensions is kept for
compatibility.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-04-18 22:26:52 UTC 
(rev 7408)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-04-18 22:38:52 UTC 
(rev 7409)
@@ -222,7 +222,7 @@
     self.setConnectionManager(self._topObject._connections)
     self.initialize()
     self.connect()
-    self.extensions = self._dataObject.triggerExtensions
+    self.extensions = self._connection
 
 
   # ---------------------------------------------------------------------------
@@ -308,6 +308,8 @@
          self._connections.getDataObject (self.connection, self.type,
              datasource = self)
       gDebug (7, "GDataSource.py bound to %s " % dataObject)
+
+      self._connection = dataObject._connection
       
       # Check if the connection has a fixed primary key name
       primarykeyFields = dataObject._connection._primarykeyFields

Modified: trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-18 22:26:52 UTC (rev 7408)
+++ trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-18 22:38:52 UTC (rev 7409)
@@ -63,11 +63,6 @@
 
     self._defaultData = {}
 
-    # TODO: This is to keep old code from breaking.
-    # TODO: 0.5.1 was last version to support
-    # TODO triggerExtensions (functionality is now
-    # TODO: encapsulated in Connection objects.
-    self.triggerExtensions = connection
 
   # Do we have a master datasource?
   def hasMaster(self):

Modified: trunk/gnue-pointofsale/samples/oldtownemarket/pos_backend.py
===================================================================
--- trunk/gnue-pointofsale/samples/oldtownemarket/pos_backend.py        
2005-04-18 22:26:52 UTC (rev 7408)
+++ trunk/gnue-pointofsale/samples/oldtownemarket/pos_backend.py        
2005-04-18 22:38:52 UTC (rev 7409)
@@ -103,7 +103,7 @@
                                'name': 'dtsTicket',
                                'table': 'tickets' } )
 
-    self.__ticket = serial = 
datasource.triggerExtensions.getSequence('pos_ticket_id_seq')
+    self.__ticket = serial = 
datasource.extensions.getSequence('pos_ticket_id_seq')
 
     self.dispatchEvent('BeginTicket', serial=serial)