gnue/gnue-common/gnue/common GConnections.py GD...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/05 08:57:45

Modified files:
        gnue-common/gnue/common: GConnections.py GDataObjects.py 
        gnue-common/gnue/common/dbdrivers/_dbsig: DBdriver.py 
        gnue-common/gnue/common/dbdrivers/postgresql: DBdriver.py 

Log message:
        Minor changes for reports

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/common/GConnections.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/common/GDataObjects.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/common/dbdrivers/_dbsig/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/common/dbdrivers/postgresql/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/gnue-common/gnue/common/GConnections.py
diff -u gnue/gnue-common/gnue/common/GConnections.py:1.6 
gnue/gnue-common/gnue/common/GConnections.py:1.7
--- gnue/gnue-common/gnue/common/GConnections.py:1.6    Mon Jun  4 20:23:39 2001
+++ gnue/gnue-common/gnue/common/GConnections.py        Tue Jun  5 08:57:45 2001
@@ -219,11 +219,11 @@
   if sys.platform == 'win32':
     os.putenv('PYTHONCASEOK','1')
 
-  try: 
-    dbdriver = __import__("gnue/common/dbdrivers/%s/DBdriver" % (driver))
-  except ImportError: 
-    raise GDataObjects.ProviderNotSupportedError, \
-       "No drivers found for provider '%s'" % driver
+#  try: 
+  dbdriver = __import__("gnue/common/dbdrivers/%s/DBdriver" % (driver))
+#  except ImportError: 
+#    raise GDataObjects.ProviderNotSupportedError, \
+#       "No drivers found for provider '%s'" % driver
 
   try: 
     dd = dbdriver.supportedDataObjects[type]()
Index: gnue/gnue-common/gnue/common/GDataObjects.py
diff -u gnue/gnue-common/gnue/common/GDataObjects.py:1.6 
gnue/gnue-common/gnue/common/GDataObjects.py:1.7
--- gnue/gnue-common/gnue/common/GDataObjects.py:1.6    Tue May 29 19:54:11 2001
+++ gnue/gnue-common/gnue/common/GDataObjects.py        Tue Jun  5 08:57:45 2001
@@ -127,8 +127,8 @@
     criteria = {}
     for i in range(0, len(self._masterfields)): 
       GDebug.printMesg(10,"Adding criteria")
-      criteria[string.trim(self._detailfields[i])] = \
-          master.current.getField(string.trim(self._masterfields[i]))
+      criteria[string.strip(self._detailfields[i])] = \
+          master.current.getField(string.strip(self._masterfields[i]))
       GDebug.printMesg(10,master.current.getField(self._masterfields[i]))
     return self.createResultSet(criteria)
 
Index: gnue/gnue-common/gnue/common/dbdrivers/_dbsig/DBdriver.py
diff -u gnue/gnue-common/gnue/common/dbdrivers/_dbsig/DBdriver.py:1.4 
gnue/gnue-common/gnue/common/dbdrivers/_dbsig/DBdriver.py:1.5
--- gnue/gnue-common/gnue/common/dbdrivers/_dbsig/DBdriver.py:1.4       Tue May 
29 19:20:57 2001
+++ gnue/gnue-common/gnue/common/dbdrivers/_dbsig/DBdriver.py   Tue Jun  5 
08:57:45 2001
@@ -159,3 +159,27 @@
   'sql':    DBSIG_DataObject_SQL
 }
 
+
+conditionElements = {
+       'field':           ( 1,   1, '%s',                        None ),
+       'param':           ( 1,   1, '%s',                        None ),
+       'const':           ( 1,   1, "'%s'",                      None ),
+       'add':             ( 2, 999, '(%s)',                      '+'      ),
+       'sub':             ( 2, 999, '(%s)',                      '-'      ),
+       'mul':             ( 2, 999, '(%s)',                      '*'      ),
+       'div':             ( 2, 999, '(%s)',                      '/'      ),
+       'and':             ( 2, 999, '(%s)',                      ' AND '  ), 
+       'or':              ( 2, 999, '(%s)',                      ' OR '   ), 
+       'not':             ( 1,   1, '(NOT %s)',                  None     ), 
+       'negate':          ( 1,   1, '-%s',                       None     ),
+       'eq':              ( 2,   2, '(%s = %s)',                 None     ),
+       'ne':              ( 2,   2, '(%s != %s)',                None     ),
+       'gt':              ( 2,   2, '(%s > %s)',                 None     ),
+       'ge':              ( 2,   2, '(%s >= %s)',                None     ),
+       'lt':              ( 2,   2, '(%s < %s)',                 None     ),
+       'le':              ( 2,   2, '(%s <= %s)',                None     ),
+       'like':            ( 2,   2, '%s LIKE %s',                None     ),
+       'notlike':         ( 2,   2, '%s NOT LIKE %s',            None     ),
+       'between':         ( 3,   3, '%s BETWEEN %s AND %s',      None     ) }
+
+
Index: gnue/gnue-common/gnue/common/dbdrivers/postgresql/DBdriver.py
diff -u gnue/gnue-common/gnue/common/dbdrivers/postgresql/DBdriver.py:1.4 
gnue/gnue-common/gnue/common/dbdrivers/postgresql/DBdriver.py:1.5
--- gnue/gnue-common/gnue/common/dbdrivers/postgresql/DBdriver.py:1.4   Mon Jun 
 4 20:23:39 2001
+++ gnue/gnue-common/gnue/common/dbdrivers/postgresql/DBdriver.py       Tue Jun 
 5 08:57:45 2001
@@ -95,7 +95,7 @@
 class PG_DataObject(DBSIG_DataObject): 
   def __init__(self): 
     DBSIG_DataObject.__init__(self)
-    self._DatabaseError = pg.DatabaseError
+    self._DatabaseError = pgdb.DatabaseError
     #### When the PyGreSQL's .fetchone() bug is fixed, delete following line
     self._resultSetClass = PG_ResultSet
 
@@ -103,7 +103,7 @@
   def connect(self, connectData={}): 
     GDebug.printMesg(1,"Postgresql database driver initializing")
     try: 
-      self._dataConnection = pg.connect(user=connectData['_username'], 
+      self._dataConnection = pgdb.connect(user=connectData['_username'], 
                    password=connectData['_password'], 
                    host=connectData['host'], 
                    database=connectData['dbname'])