gnue-common/src/datasources/drivers dbf/dbf/Dri...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         
Changes by:     Jan Ischebeck <address@hidden>  03/10/08 11:51:49

Modified files:
        src/datasources/drivers/dbf/dbf: Driver.py 
        src/datasources/drivers/DBSIG2: Driver.py 
        src/datasources/drivers/gadfly/gadfly: Driver.py 
        src/datasources/drivers/mysql/mysql: Driver.py 
        src/datasources/drivers/odbc/wodbc: Driver.py 

Log message:
        - enabling unicode for the other DBSIG2 drivers with own _loadnextRecord
        implementations.
        - make "non-unicode" warning a debug message (level 0)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/dbf/dbf/Driver.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/DBSIG2/Driver.py.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: gnue-common/src/datasources/drivers/DBSIG2/Driver.py
diff -c gnue-common/src/datasources/drivers/DBSIG2/Driver.py:1.74 
gnue-common/src/datasources/drivers/DBSIG2/Driver.py:1.75
*** gnue-common/src/datasources/drivers/DBSIG2/Driver.py:1.74   Tue Oct  7 
11:20:26 2003
--- gnue-common/src/datasources/drivers/DBSIG2/Driver.py        Wed Oct  8 
11:51:48 2003
***************
*** 271,277 ****
        elif type(value) == types.StringType:
  
          if self._unicodeMode:
!           print 'WARNING: non-unicode passed to the dbdriver (%s)' % 
str(value)
            
          return "'%s'" % string.replace(value,
                                         "'",
--- 271,277 ----
        elif type(value) == types.StringType:
  
          if self._unicodeMode:
!           GDebug.printMesg(0,'WARNING: non-unicode passed to the dbdriver 
(%s)' % value)
            
          return "'%s'" % string.replace(value,
                                         "'",
Index: gnue-common/src/datasources/drivers/dbf/dbf/Driver.py
diff -c gnue-common/src/datasources/drivers/dbf/dbf/Driver.py:1.8 
gnue-common/src/datasources/drivers/dbf/dbf/Driver.py:1.9
*** gnue-common/src/datasources/drivers/dbf/dbf/Driver.py:1.8   Wed Jun  4 
19:23:34 2003
--- gnue-common/src/datasources/drivers/dbf/dbf/Driver.py       Wed Oct  8 
11:51:48 2003
***************
*** 167,172 ****
--- 167,175 ----
        dict = {}
        c=0
        for f in self._dataObject._dataConnection.fields:
+         if self._dataObject._unicodeMode and type(f)==types.StringType:
+           f = f.decode(self._dataObject._databaseEncoding)
+                 
          dict[string.lower(f[0])] = row[c]
          c+=1
  
Index: gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py
diff -c gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py:1.10 
gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py:1.11
*** gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py:1.10    Wed Jun 
 4 19:23:34 2003
--- gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py Wed Oct  8 
11:51:48 2003
***************
*** 77,82 ****
--- 77,85 ----
              i = 0
              dict = {}
              for f in (rs):
+               if self._dataObject._unicodeMode and type(f)==types.StringType:
+                 f = f.decode(self._dataObject._databaseEncoding)
+                 
                dict[string.lower(self._fieldNames[i])] = f
                i += 1
              self._cachedRecords.append (self._recordSetClass(parent=self, \
Index: gnue-common/src/datasources/drivers/mysql/mysql/Driver.py
diff -c gnue-common/src/datasources/drivers/mysql/mysql/Driver.py:1.6 
gnue-common/src/datasources/drivers/mysql/mysql/Driver.py:1.7
*** gnue-common/src/datasources/drivers/mysql/mysql/Driver.py:1.6       Wed Sep 
17 16:09:43 2003
--- gnue-common/src/datasources/drivers/mysql/mysql/Driver.py   Wed Oct  8 
11:51:48 2003
***************
*** 95,100 ****
--- 95,103 ----
              i = 0
              dict = {}
              for f in (rs):
+               if self._dataObject._unicodeMode and type(f)==types.StringType:
+                 f = f.decode(self._dataObject._databaseEncoding)
+                 
                dict[string.lower(self._fieldNames[i])] = f
                i += 1
              self._cachedRecords.append (self._recordSetClass(parent=self, \
Index: gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py
diff -c gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py:1.22 
gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py:1.23
*** gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py:1.22       Wed Jun 
 4 19:23:34 2003
--- gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py    Wed Oct  8 
11:51:49 2003
***************
*** 207,212 ****
--- 207,215 ----
          i = 0
          dict = {}
          for f in (rs):
+           if self._dataObject._unicodeMode and type(f)==types.StringType:
+             f = f.decode(self._dataObject._databaseEncoding)                
+ 
            dict[self._fieldNames[i]] = f
            i = i + 1
          self._cachedRecords.append (self._recordSetClass(parent=self, \