gnue/gnuef/src GFParser.py GFObjects/GFDatabase...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/08/13 16:15:28

Modified files:
        gnuef/src      : GFParser.py 
        gnuef/src/GFObjects: GFDatabase.py GFObj.py 

Log message:
        Fixed support for <database> tags, although I do not recommend them 
(but I suppose there are cases where it is needed)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFParser.py.diff?cvsroot=OldCVS&tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFDatabase.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFObj.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue/gnuef/src/GFObjects/GFDatabase.py
diff -u gnue/gnuef/src/GFObjects/GFDatabase.py:1.2 
gnue/gnuef/src/GFObjects/GFDatabase.py:1.3
--- gnue/gnuef/src/GFObjects/GFDatabase.py:1.2  Thu Jul 12 20:56:13 2001
+++ gnue/gnuef/src/GFObjects/GFDatabase.py      Mon Aug 13 16:15:28 2001
@@ -16,95 +16,40 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place 
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000. 2001 Free Software Foundation
+# Copyright 2000, 2001 Free Software Foundation
 #
 #
 # FILE:
-# GFObjects.py
+# GFDatabase.py
 #
 # DESCRIPTION:
-# The majority of the objects that make up a form
+# Handles the <database> tag.  
 #
 # NOTES:
+# Only under special circumstances should the database tag be used. 
+# Usually, the connections are defined in the connections.conf file. 
 #
 # HISTORY:
-# Copyright (c) 2000 Free Software Foundation
 #
 
-from gnue.common.GObjects import * 
-from gnue.common.dbdrivers.factory import factory
-from GFObj import GFObj
-
 from gnue.common import GDebug
-from gnue.common import GConfig
-
-import string
-import types
+from GFObj import GFObj
 
-# These should really go somewhere else
-TRUE = 1
-FALSE = 0
 
-############################################################
-# GFDatabase
-#
-# A wrapper for the various database drivers.  Presents
-# a consistant API to all database drivers
-#
 class GFDatabase(GFObj):
   def __init__(self, parent=None):
-    GFObj.__init__(self, parent)
-    self._type = "GFDatabase"
-    self.uniqueKey = None
+    GFObj.__init__(self, parent, "GFDatabase")
     self.comment = ""
-    self.triggerNamespace = None
-
-  def initialize(self,user,passwd):
-    self.factory = factory()
-    self.link = self.factory.create(self.provider)
-    self.link.connect(self.host,self.dbname,user,passwd)
-
-    # Add the database connection's trigger extensions to 
-    # the trigger namespace under the name of the connection. 
-    # (e.g., if database name="gnue", then add "gnue" to 
-    # namespace as a reference to the trigger extensions
-    if hasattr(self.link, 'triggerExtensions'):  
-      self.triggerNamespace = self.link.triggerExtensions
-
-  def query(self, table, mask, order_by):
-    results = self.link.query(table,mask,order_by)
-    return results
-
-  def beginTransaction(self):
-    self.link.beginTransaction()
-    
-  def rollback(self):
-    self.link.rollback()
-    
-  def commit(self):
-    self.link.commit()
-
-  def update(self, table, mask):
-    results = self.link.update(table,mask)
-    return results
-      
-  def insert(self, table, mask):
-    results = self.link.insert(table,mask)
-    return results
-  
-  def delete(self, table, mask):
-    self.link.delete(table,mask)
-
-  def getFieldList(self,table):
-    return self.link.getFieldList(table)
-
-  def getUniqueKey(self,table):
-    return self.link.getUniqueKey(table)
-
-
-
-
-
+    self.name = ""
 
+  def initialize(self): 
+    # Add our database connection information to the connections  
+    # manager, then let it handle everything from there.
+    self.findParentOfType('GFForm')._app.connections.\
+        addConnectionSpecification(self.name, {
+           'name': self.name, 
+           'provider': self.provider, 
+           'dbname': self.dbname, 
+           'host': self.host } )
 
 
Index: gnue/gnuef/src/GFObjects/GFObj.py
diff -u gnue/gnuef/src/GFObjects/GFObj.py:1.5 
gnue/gnuef/src/GFObjects/GFObj.py:1.6
--- gnue/gnuef/src/GFObjects/GFObj.py:1.5       Sun Aug 12 12:55:27 2001
+++ gnue/gnuef/src/GFObjects/GFObj.py   Mon Aug 13 16:15:28 2001
@@ -39,10 +39,9 @@
 # Base internal object for GNUE Forms
 #
 class GFObj(GObj, GFTriggerAware):
-  def __init__(self, parent=None):
+  def __init__(self, parent=None, type='GFObj'):
     GFTriggerAware.__init__(self)
-    GObj.__init__(self, parent)
-    self._type = 'GFObj'
+    GObj.__init__(self, parent, type)
     self.hidden = 0
     self.readonly = 0
     self._visibleIndex = 0
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.52 gnue/gnuef/src/GFParser.py:1.53
--- gnue/gnuef/src/GFParser.py:1.52     Sun Aug 12 12:55:27 2001
+++ gnue/gnuef/src/GFParser.py  Mon Aug 13 16:15:28 2001
@@ -141,6 +141,9 @@
             'dbname': {
                'Required': 1, 
                'Typecast': GTypecast.text }, 
+            'comment': {
+               'Required': 0, 
+               'Typecast': GTypecast.text }, 
             'host': {
                'Required': 1, 
                'Typecast': GTypecast.text } },