gnue/common/src/datasources GDataSource.py

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jan Ischebeck <address@hidden>  03/03/18 16:16:22

Modified files:
        common/src/datasources: GDataSource.py 

Log message:
        Fix getCondition/setCondition
        reenable Datasource extensions (now dts.__properties__.extensions)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/GDataSource.py.diff?tr1=1.60&tr2=1.61&r1=text&r2=text

Patches:
Index: gnue/common/src/datasources/GDataSource.py
diff -c gnue/common/src/datasources/GDataSource.py:1.60 
gnue/common/src/datasources/GDataSource.py:1.61
*** gnue/common/src/datasources/GDataSource.py:1.60     Tue Feb 18 09:59:23 2003
--- gnue/common/src/datasources/GDataSource.py  Tue Mar 18 16:16:22 2003
***************
*** 84,89 ****
--- 84,92 ----
                                'setCondition':{'function':self.setCondition},
                                }
  
+     self._triggerProperties = {'extensions':{'get':self.getExtensions,
+                                            'direct':1}}
+ 
    def __getattr__(self, attr):
      if self._dataObject and attr[1] != '_' and hasattr(self._dataObject,attr):
        return getattr(self._dataObject,attr)
***************
*** 153,166 ****
    # the static condition is build out of the <condition> child
    # elements below a datasource XML definition
    #
!   def setCondition(mycondition):
      dataObject._staticCondition = mycondition
  #   dataObject.invalidateCachedConditions()
  
!   def getCondition():
      return dataObject._staticCondition
  
    #
    # This method should be called after the object is created
    # but before any other methods are called
    #
--- 156,175 ----
    # the static condition is build out of the <condition> child
    # elements below a datasource XML definition
    #
!   def setCondition(self, mycondition):
      dataObject._staticCondition = mycondition
  #   dataObject.invalidateCachedConditions()
  
!   def getCondition(self):
      return dataObject._staticCondition
  
    #
+   # get the dbdriver extension object
+   #
+   def getExtensions(self):
+     return self.extensions
+ 
+   #
    # This method should be called after the object is created
    # but before any other methods are called
    #
***************
*** 308,316 ****
      self.setConnectionManager(self._topObject._connections)
      self.initialize()
      self.connect()
!     # TODO: For now, adding to dtsrc to avoid a global namespace conflict 
(jcater)
!     # TODO: I have not a clue to do with this at this time...originally from 
GFDataSource.py
!     self.extensions = self._dataObject.triggerExtensions
  
    # TODO: Merged into GDataSource per the TODOs in reports and forms however
    # TODO: self._topObject._datasourceDictionary implies that the top object
--- 317,323 ----
      self.setConnectionManager(self._topObject._connections)
      self.initialize()
      self.connect()
!     self.extensions = self._dataObject.triggerExtensions    
  
    # TODO: Merged into GDataSource per the TODOs in reports and forms however
    # TODO: self._topObject._datasourceDictionary implies that the top object