CVSROOT: /cvsroot/gnue

[Jason Cater]

Module name:    gnue-common
Branch:         datasource-cleanup
Changes by:     Jason Cater <address@hidden>    03/11/18 19:01:06
Reply-to: address@hidden

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         datasource-cleanup
Changes by:     Jason Cater <address@hidden>    03/11/18 19:01:06

Modified files:
        src/datasources: GConnection.py GConnections.py 

Log message:
        store the connection name in GConnection so methods can get additional 
parameters

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/GConnection.py.diff?only_with_tag=datasource-cleanup&tr1=1.1.2.3&tr2=1.1.2.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/GConnections.py.diff?only_with_tag=datasource-cleanup&tr1=1.52.2.2&tr2=1.52.2.3&r1=text&r2=text

Patches:
Index: gnue-common/src/datasources/GConnection.py
diff -c gnue-common/src/datasources/GConnection.py:1.1.2.3 
gnue-common/src/datasources/GConnection.py:1.1.2.4
*** gnue-common/src/datasources/GConnection.py:1.1.2.3  Sat Nov  8 11:14:55 2003
--- gnue-common/src/datasources/GConnection.py  Tue Nov 18 19:01:05 2003
***************
*** 37,45 ****
  #       +--
  #
  class Connection:
!   def __init__(self, connections, parameters):
      self.manager = connections
      self.parameters = parameters
      
      self._encoding = 'iso8859-1'  # encoding used by database
  
--- 37,46 ----
  #       +--
  #
  class Connection:
!   def __init__(self, connections, name, parameters):
      self.manager = connections
      self.parameters = parameters
+     self.name = name
      
      self._encoding = 'iso8859-1'  # encoding used by database
  
Index: gnue-common/src/datasources/GConnections.py
diff -c gnue-common/src/datasources/GConnections.py:1.52.2.2 
gnue-common/src/datasources/GConnections.py:1.52.2.3
*** gnue-common/src/datasources/GConnections.py:1.52.2.2        Sat Nov  8 
11:14:55 2003
--- gnue-common/src/datasources/GConnections.py Tue Nov 18 19:01:05 2003
***************
*** 199,209 ****
      # Specify as 'gnue:1', 'gnue:2', etc, to open
      # two actual connections to 'gnue', each with
      # their own transactions, etc.
!     try:
!       connection_base = connection_name.split(':',1)[0]
!     except:
!       connection_base = connection_name
!       extra = ""
  
      print "connection_base=%s" % connection_base
  
--- 199,205 ----
      # Specify as 'gnue:1', 'gnue:2', etc, to open
      # two actual connections to 'gnue', each with
      # their own transactions, etc.
!     connection_base = connection_name.split(':')[0]
  
      print "connection_base=%s" % connection_base
  
***************
*** 240,246 ****
        raise GDataObjects.ProviderNotSupportedError, tmsg
  
  
!     conn = dbdriver.Connection(self, parameters)
      self._openConnections[connection_name] = conn
      return conn
  
--- 236,242 ----
        raise GDataObjects.ProviderNotSupportedError, tmsg
  
  
!     conn = dbdriver.Connection(self, connection_name, parameters)
      self._openConnections[connection_name] = conn
      return conn
  
***************
*** 294,300 ****
  
    def loginToConnection(self, connection):
  
!     print dir(connection)
  
      print "loginToConnection: %s" % connection
      try:
--- 290,297 ----
  
    def loginToConnection(self, connection):
  
!     connection_name = connection.name
!     connection_base = connection_name.split(':')[0]
  
      print "loginToConnection: %s" % connection
      try:
***************
*** 316,322 ****
        #  set the HOME environement variable [SET HOME=...])
  
          netrcData = netrc.netrc().authenticators(
!               "'gnue://%s/'" % base )
          if netrcData!=None:
            GDebug.printMesg(5, 'Read the user\'s .netrc file')
            loginData['_username'] = netrcData[0][1:-1]
--- 313,319 ----
        #  set the HOME environement variable [SET HOME=...])
  
          netrcData = netrc.netrc().authenticators(
!               "'gnue://%s/'" % connection_base )
          if netrcData!=None:
            GDebug.printMesg(5, 'Read the user\'s .netrc file')
            loginData['_username'] = netrcData[0][1:-1]