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

[reinhard]

Author: reinhard
Date: 2005-04-12 02:50:49 -0500 (Tue, 12 Apr 2005)
New Revision: 7342

Modified:
   trunk/gnue-common/src/datasources/GConnections.py
   trunk/gnue-common/src/datasources/GIntrospection.py
   trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
   trunk/gnue-forms/src/GFObjects/GFBlock.py
   trunk/gnue-pointofsale/samples/oldtownemarket/pos_backend.py
Log:
Removed some methods from DataObject that have long been deprecated and are not
used any more.


Modified: trunk/gnue-common/src/datasources/GConnections.py
===================================================================
--- trunk/gnue-common/src/datasources/GConnections.py   2005-04-12 07:24:35 UTC 
(rev 7341)
+++ trunk/gnue-common/src/datasources/GConnections.py   2005-04-12 07:50:49 UTC 
(rev 7342)
@@ -35,7 +35,7 @@
 #
 # HISTORY:
 #
-# $Id: $
+# $Id$
 
 from ConfigParser import *
 from ConfigParser import RawConfigParser # is not in __all__
@@ -329,7 +329,6 @@
     # their own transactions, etc.
 
     self.loginToConnection(dataObject._connection)
-    dataObject.connect()
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-common/src/datasources/GIntrospection.py
===================================================================
--- trunk/gnue-common/src/datasources/GIntrospection.py 2005-04-12 07:24:35 UTC 
(rev 7341)
+++ trunk/gnue-common/src/datasources/GIntrospection.py 2005-04-12 07:50:49 UTC 
(rev 7342)
@@ -24,11 +24,6 @@
 # DESCRIPTION:
 #
 # NOTES:
-#   Old methods in GDataObjects and their new counterparts:
-#     * getSchemaTypes()       -->  types
-#     * getSchemaList()        -->  find(type='...')
-#     * getSchemaByName()      -->  findone(name='...')
-#     * writeSchema()          -->  write()
 #
 #  Preferred way to access these discovery routines is:
 #    connection.schema.<function>

Modified: trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-12 07:24:35 UTC (rev 7341)
+++ trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-12 07:50:49 UTC (rev 7342)
@@ -138,45 +138,6 @@
 
     self._detailObjects.append ([dataObject, handler])
 
-  #
-  # Connect to database from a GConnection object
-  #
-  def connect(self):
-    GDebug.printMesg(1,'WARNING: The use of DataObject.connect() is 
deprecated')
-
-  def commit(self):
-    GDebug.printMesg(1,'WARNING: The use of DataObject.commit() is deprecated')
-    if self._connection:
-      self._connection.commit()
-
-  def rollback(self):
-    GDebug.printMesg(1,'WARNING: The use of DataObject.rollback() is 
deprecated')
-    if self._connection:
-      self._connection.rollback()
-
-
-  #
-  # Schema (metadata) functions
-  #
-
-  # TODO: DEPRECATED!!!!!
-  def getSchemaTypes(self):
-    print "WARNING: Your app is calling GDataObject.getSchemaTypes()"
-    return self._connection.schema.types[:]
-
-  # TODO: DEPRECATED!!!!!
-  def getSchemaList(self, type=None):
-    print "WARNING: Your app is calling GDataObject.getSchemaList()"
-    return self._connection.schema.find(type=type)
-
-  # TODO: DEPRECATED!!!!!
-  def getSchemaByName(self, name, type=None):
-    print "WARNING: Your app is calling GDataObject.getSchemaByName()"
-    return self._connection.schema.findfirst(name=name, type=type)
-
-
-
-
   # Called when new record master in master/detail is queried
   def _masterRecordChanged(self, master):
     GDebug.printMesg (8, 'Master Record Changed')
@@ -205,7 +166,4 @@
              conditions=criteria, masterRecordSet=master.current))
       else:
         master.current.addDetailResultSet(self.createEmptyResultSet())
-##      master.current._cachedDetailResultSets[self] = \
-##          self.createResultSet(conditions=criteria, 
masterRecordSet=master.current)
     return master.current._cachedDetailResultSets[self]
-

Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2005-04-12 07:24:35 UTC (rev 
7341)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2005-04-12 07:50:49 UTC (rev 
7342)
@@ -553,7 +553,8 @@
   # processClear
   #
   def processClear(self):
-    self._dataSourceLink._dataObject.rollback()
+    if self._dataSourceLink._dataObject._connection is not None:
+      self._dataSourceLink._dataObject._connection.rollback ()
     if not self._dataSourceLink.hasMaster():
       self._dataSourceLink.createEmptyResultSet()
     else:

Modified: trunk/gnue-pointofsale/samples/oldtownemarket/pos_backend.py
===================================================================
--- trunk/gnue-pointofsale/samples/oldtownemarket/pos_backend.py        
2005-04-12 07:24:35 UTC (rev 7341)
+++ trunk/gnue-pointofsale/samples/oldtownemarket/pos_backend.py        
2005-04-12 07:50:49 UTC (rev 7342)
@@ -163,7 +163,7 @@
     ts.post()
     irs.post()
     trs.post()
-    ts._dataObject.commit()
+    self.instance.connections.commitAll()
 
     self.__ticket = 0