gnue/gnuef INSTALL README.windows TODO src/driv...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/01/31 11:16:29

Modified files:
        gnuef          : INSTALL README.windows TODO 
        gnuef/src/drivers/mysql: DBdriver.py 
        gnuef/src/drivers/odbc: DBdriver.py 
Added files:
        gnuef          : INSTALL.win32 

Log message:
        Updates to make mysql and odbc drivers work (Completely Untested!!!!!!)
        Updates INSTALL instructions

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/INSTALL.win32.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/INSTALL.diff?r1=1.7&r2=1.8
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/README.windows.diff?r1=1.1&r2=1.2
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/TODO.diff?r1=1.41&r2=1.42
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/drivers/mysql/DBdriver.py.diff?r1=1.5&r2=1.6
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/drivers/odbc/DBdriver.py.diff?r1=1.1&r2=1.2

Patches:
Index: gnue/gnuef/INSTALL
diff -u gnue/gnuef/INSTALL:1.7 gnue/gnuef/INSTALL:1.8
--- gnue/gnuef/INSTALL:1.7      Mon Jan 29 13:35:26 2001
+++ gnue/gnuef/INSTALL  Wed Jan 31 11:16:29 2001
@@ -33,7 +33,6 @@
                wxGTK. 
 postgresql-dev postgresql-devel Version 6.5.3-23 Header files for
                libpq (postgresql library)  
-libtools       required for gnuef compilation (not really, but...).
 cvs            required for gnuef-"download".
 
 There will eventually be a bunch of dependend packages that will
@@ -53,6 +52,7 @@
 software.
 
 Distutils-1.0.1.tar.gz:                 www.python.org 
+        Not needed for Python 2.0 or newer
        Untar in some place (e.g. /usr/local/src). Enter in the
        directory Distutils-1.0.1, issue "./setup.py build" and as
        root "./setup.py install".
@@ -65,7 +65,7 @@
        "ln -s /usr/include/postgresql /usr/include/pgsql".
        As root issue finally "./setup.py install".
 
-PyXML-0.6.1.tar.gz:      pyxml.sourceforge.net/topics/download.html
+PyXML-0.6.x.tar.gz:      pyxml.sourceforge.net/topics/download.html
   ->sourceforge.net/project/showfiles.php?group_id=6473&release_id=13315
        Untar in some place. Enter in the directory PyXML-0.6.1, issue
        "python setup.py build" and as root "python setup.py install".
@@ -88,6 +88,7 @@
 If you want to play with the curses-client you can download:
 
 pyncurses-0.3.tar.gz:   pyncurses.sourceforge.net
+        Only needed for older text interface (pytext)
         Untar in some place. Enter in the directory pyncurses-0.3,
         issue "debian/apply-patch.sh", "python setup.py build" and as
         root "python setup.py install".
@@ -134,7 +135,7 @@
 
 
 Note: the current cvs defines two graphics splashScreenBMP and smallBMP in the 
GFOptions.py
-file. They are installed by default in /usr/local/gnue/shared
+file. They are installed by default in /usr/local/gnue/shared/images
  
 chmod -R o+rx /usr/local/gnue
 
Index: gnue/gnuef/README.windows
diff -u gnue/gnuef/README.windows:1.1 gnue/gnuef/README.windows:1.2
--- gnue/gnuef/README.windows:1.1       Wed Jan 24 19:13:19 2001
+++ gnue/gnuef/README.windows   Wed Jan 31 11:16:29 2001
@@ -4,8 +4,5 @@
 is the lack of a stable python-orbit binding 
 for win32 and the lack of db drivers for win32.
 
-An PyGreSql module for win32 machines can be found at
-  http://highqualdev.com  GNUe Forms has not yet been 
-  tested with gnuef.
-
-I believe the MySQL driver should work.
+See the INSTALL.win32 file for more instructions on
+how to install.
Index: gnue/gnuef/TODO
diff -u gnue/gnuef/TODO:1.41 gnue/gnuef/TODO:1.42
--- gnue/gnuef/TODO:1.41        Tue Jan 30 20:21:51 2001
+++ gnue/gnuef/TODO     Wed Jan 31 11:16:29 2001
@@ -1,9 +1,7 @@
 A name inside of [] means that person has taken that task
 
 **MUST HAVES for 0.0.6 
-**  windows support right now widget navigation is broken
-**  win32 install instructions
-**  completed DBError support
+**  complete DBError support
 
    Bugs 
     I've broken msgboxs in triggers
Index: gnue/gnuef/src/drivers/mysql/DBdriver.py
diff -u gnue/gnuef/src/drivers/mysql/DBdriver.py:1.5 
gnue/gnuef/src/drivers/mysql/DBdriver.py:1.6
--- gnue/gnuef/src/drivers/mysql/DBdriver.py:1.5        Fri Dec 22 09:54:35 2000
+++ gnue/gnuef/src/drivers/mysql/DBdriver.py    Wed Jan 31 11:16:29 2001
@@ -29,42 +29,77 @@
   def connect(self, dbhost, dbname, dbuser, dbpasswd):
     if GFOptions.DEBUG:
       print "connecting"
-    self.connection = MySQLdb.connect(db=dbname, host=dbhost, user=dbuser, 
passwd=dbpasswd)
-    self.connection.cursorclass = MySQLdb.DictCursor
-    self.cursor = self.connection.cursor()
+    try:
+      self.connection = MySQLdb.connect(db=dbname, host=dbhost, user=dbuser, 
passwd=dbpasswd)
+      self.connection.cursorclass = MySQLdb.DictCursor
+      self.cursor = self.connection.cursor()
+    except Error, value:
+      raise DBError, value
     
   def disconnect(self):
-    self.connection.close()
+    try:
+      self.connection.close()
+    except Error, value:
+      raise DBError, value
 
+
+  def beginTransaction(self):
+    try:
+      pass
+    except Error, value:
+      raise DBError, value
+
   def commit(self):
-    pass
-    
+    try:
+      pass
+    except Error, value:
+      raise DBError, value
+
   def rollback(self):
-    pass
+    try:
+      pass
+    except Error, value:
+      raise DBError, value
 
+
   def insert(self, table, mask):
     for fieldname in mask.keys():
       if mask[fieldname] == None or len(mask[fieldname]) == 0:
         del mask[fieldname]
 
     command = self.constructSQL('insert', table, mask)
-    self.cursor.execute(command)
+    try:
+      self.cursor.execute(command)
+    except Error, value:
+      raise DBError, value
+
     mask[self.uniqueKey] = self.getMaskCount()
     return mask
   
   def delete(self, table, mask):
     command = self.constructSQL('delete', table, mask)
-    self.cursor.execute(command)
+    try:
+      self.cursor.execute(command)
+    except Error, value:
+      raise DBError, value
 
+
   def update(self, table, mask):
     command = self.constructSQL('update', table, mask)
-    self.cursor.execute(command)
+    try:
+      self.cursor.execute(command)
+    except Error, value:
+      raise DBError, value
+
 
   def getFieldList(self, table):
     l = {}
-    cr = self.connection.cursor()
-    cr.execute('DESCRIBE %s' % table)
-    rs = cr.fetchallDict()
+    try:
+      cr = self.connection.cursor()
+      cr.execute('DESCRIBE %s' % table)
+      rs = cr.fetchallDict()
+    except Error, value:
+      raise DBError, value
     self.getUniqueKey(table)
     for r in rs:
       l[r["Field"]] = "text"
@@ -80,8 +115,11 @@
 
   def query(self, table, mask, order_by = None):
     command = self.constructSQL('query',table, mask)
-    self.cursor.execute(command)
-    rs = self.cursor.fetchallDict()
+    try:
+      self.cursor.execute(command)
+      rs = self.cursor.fetchallDict()
+    except Error, value:
+      raise DBError, value
     self.oldMaskData = {}
     self.maskCount = 1
     for r in rs:
Index: gnue/gnuef/src/drivers/odbc/DBdriver.py
diff -u gnue/gnuef/src/drivers/odbc/DBdriver.py:1.1 
gnue/gnuef/src/drivers/odbc/DBdriver.py:1.2
--- gnue/gnuef/src/drivers/odbc/DBdriver.py:1.1 Fri Dec 22 10:44:50 2000
+++ gnue/gnuef/src/drivers/odbc/DBdriver.py     Wed Jan 31 11:16:29 2001
@@ -27,42 +27,74 @@
   def connect(self, dbhost, dbname, dbuser, dbpasswd):
     if GFOptions.DEBUG:
       print "connecting"
-    self.connection = self.driver.DriverConnect(self.dsn)
-    self.cursor = self.connection.cursor()
-    
+    try:
+      self.connection = self.driver.DriverConnect(self.dsn)
+      self.cursor = self.connection.cursor()
+    except Error, value:
+      raise DBError, value
+
   def disconnect(self):
-    self.connection.close()
+    try:
+      self.connection.close()
+    except Error, value:
+      raise DBError, value
+
+  def beginTransaction(self):
+    try:
+      pass
+    except Error, value:
+      raise DBError, value
 
   def commit(self):
-    pass
-    
+    try:
+      pass
+    except Error, value:
+      raise DBError, value
+
   def rollback(self):
-    pass
+    try:
+      pass
+    except Error, value:
+      raise DBError, value
 
+
   def insert(self, table, mask):
     for fieldname in mask.keys():
       if mask[fieldname] == None or len(mask[fieldname]) == 0:
         del mask[fieldname]
 
     command = self.constructSQL('insert', table, mask)
-    self.cursor.execute(command)
+    try:
+      self.cursor.execute(command)
+    except Error, value:
+      raise DBError, value
     mask[self.uniqueKey] = self.getMaskCount()
     return mask
   
   def delete(self, table, mask):
     command = self.constructSQL('delete', table, mask)
-    self.cursor.execute(command)
+    try:
+      self.cursor.execute(command)
+    except Error, value:
+      raise DBError, value
 
   def update(self, table, mask):
     command = self.constructSQL('update', table, mask)
-    self.cursor.execute(command)
+    try:
+      self.cursor.execute(command)
+    except Error, value:
+      raise DBError, value
 
   def getFieldList(self, table):
     l = {}
     self.fieldlist = {}
     self.fieldlistmap = {}
     self.cursor.columns(None, None, table, None)
-    rs = self.cursor.fetchall()
+    try:
+      rs = self.cursor.fetchall()
+    except Error, value:
+      raise DBError, value
+
     self.getUniqueKey(table)
     self.fieldlistmap[self.uniqueKey] = 0
     i = 1
@@ -76,7 +108,10 @@
 
   def query(self, table, mask, order_by = None):
     command = self.constructSQL('query',table, mask)
-    self.cursor.execute(command)
+    try:
+      self.cursor.execute(command)
+    except Error, value:
+      raise DBError, value
     rs = self.cursor.fetchall()
     self.oldMaskData = {}
     self.maskCount = 1