gnue/gnuef/src DBfactory.py GFForm.py GFObjects...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/01/29 14:50:34

Modified files:
        gnuef/src      : DBfactory.py GFForm.py GFObjects.py 
                         UIwxpython.py 
        gnuef/src/drivers/postgresql: DBdriver.py 

Log message:
        More changes needed to get this to run under windows
        Start of a transaction system

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/DBfactory.py.diff?r1=1.5&r2=1.6
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.63&r2=1.64
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.55&r2=1.56
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.54&r2=1.55
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/drivers/postgresql/DBdriver.py.diff?r1=1.10&r2=1.11

Patches:
Index: gnue/gnuef/src/DBfactory.py
diff -u gnue/gnuef/src/DBfactory.py:1.5 gnue/gnuef/src/DBfactory.py:1.6
--- gnue/gnuef/src/DBfactory.py:1.5     Fri Dec 22 10:03:09 2000
+++ gnue/gnuef/src/DBfactory.py Mon Jan 29 14:50:34 2001
@@ -1,10 +1,16 @@
 # DBfactory - create an instance of a specific driver
 
 import string
+import sys
+import os
 
 class DBfactory:
     def create(self, driver):
         driver = string.split(driver, '|')
+
+        if sys.platform == 'win32':
+          os.putenv('PYTHONCASEOK','1')
+
         DBdriver = __import__("gnue/forms/drivers/%s" % (driver[0])).DBdriver()
 
         if driver[0] == "odbc":
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.63 gnue/gnuef/src/GFForm.py:1.64
--- gnue/gnuef/src/GFForm.py:1.63       Mon Jan 29 13:35:26 2001
+++ gnue/gnuef/src/GFForm.py    Mon Jan 29 14:50:34 2001
@@ -328,6 +328,9 @@
     self.updateStatus()
 
   def executeCommit(self, event):
+    for key in self.datasourceDictionary.keys():
+      self.datasourceDictionary[key].beginTransaction()
+
     if not hasattr(self,'readonly'):
       for block in self.blockList:
         GFDebug.printMesg(1, "Saving %s"%block.name)
@@ -336,6 +339,10 @@
       self.updateRecordCounter()
     else:
       self.dispatchEvent(GFEvent('formALERT','Form is readonly'))
+
+    for key in self.datasourceDictionary.keys():
+      self.datasourceDictionary[key].commit()
+      
 
   def executeAbout(self,event):
      version = GFOptions.VERSION
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.55 gnue/gnuef/src/GFObjects.py:1.56
--- gnue/gnuef/src/GFObjects.py:1.55    Thu Jan 18 05:26:37 2001
+++ gnue/gnuef/src/GFObjects.py Mon Jan 29 14:50:34 2001
@@ -209,7 +209,7 @@
         for count in range(self.recordCount+1):
           self.dataSourceLink.setField(count,self.detail,fieldValue, TRUE)
     
-    self.dataSourceLink.commit()
+    #self.dataSourceLink.commit()
 
     self.recordCount = self.dataSourceLink.getLastRecordNumber()
 
@@ -469,7 +469,12 @@
               self.resultSet[count][key] = str(self.resultSet[count][key])
       else:
         self.clear()
-              
+        
+  def beginTransaction(self):
+    self.dataConnection.beginTransaction()
+
+  def rollback(self):  
+    self.dataConnection.rollback()
       
   def commit(self):
     if hasattr(self,'database'):
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.54 gnue/gnuef/src/UIwxpython.py:1.55
--- gnue/gnuef/src/UIwxpython.py:1.54   Mon Jan 29 13:35:26 2001
+++ gnue/gnuef/src/UIwxpython.py        Mon Jan 29 14:50:34 2001
@@ -55,7 +55,7 @@
     self.widgetConstructorFunction['GFLabel'] = self.labelHandler
     self.widgetConstructor = {
                               'GFBox':
-                              """wxStaticBox(container,-1,object.label,
+                              """wxStaticBox(container,-1,str(object.label),
                                 
wxPoint(int(object.x)*int(self.widgetWidth)+(int(self.widgetWidth)/2),
                                         
(int(object.y)+spacer)*int(self.widgetHeight)+(int(self.widgetHeight)/2)),
                                 
wxSize(int(object.width)*int(self.widgetWidth)-(int(self.widgetWidth)/2),
@@ -386,7 +386,6 @@
         object.visibleCount = 1
       
       count = int(object.visibleCount)
-
 
       for spacer in range(count):
         spacer = int(spacer)
Index: gnue/gnuef/src/drivers/postgresql/DBdriver.py
diff -u gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.10 
gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.11
--- gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.10  Mon Jan 29 13:35:26 2001
+++ gnue/gnuef/src/drivers/postgresql/DBdriver.py       Mon Jan 29 14:50:34 2001
@@ -33,12 +33,14 @@
   def disconnect(self):
     self.connection.close()
 
+  def beginTransaction(self):
+    self.connection.query('BEGIN')
+
   def commit(self):
-    #self.connection.commit()
-    pass
+    self.connection.query('COMMIT')
     
   def rollback(self):
-    self.connection.rollback()
+    self.connection.query('ROLLBACK')
 
   def insert(self,table,mask):
     for fieldname in mask.keys():