gnue/gnuef src/GFOptions.py src/drivers/geas/DB...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/03/05 19:15:43

Modified files:
        gnuef/src      : GFOptions.py 
        gnuef/src/drivers/geas: DBdriver.py 
Added files:
        gnuef/samples/geas: country.gfd person.gfd 
Removed files:
        gnuef/samples/geas: customer.gfd 

Log message:
        GEAS driver working for basic stuff
        demo forms added

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/samples/geas/country.gfd.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/samples/geas/person.gfd.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/samples/geas/customer.gfd.diff?r1=1.3&r2=NONE
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFOptions.py.diff?r1=1.22&r2=1.23
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/drivers/geas/DBdriver.py.diff?r1=1.12&r2=1.13

Patches:
Index: gnue/gnuef/src/GFOptions.py
diff -u gnue/gnuef/src/GFOptions.py:1.22 gnue/gnuef/src/GFOptions.py:1.23
--- gnue/gnuef/src/GFOptions.py:1.22    Sun Mar  4 16:54:17 2001
+++ gnue/gnuef/src/GFOptions.py Mon Mar  5 19:15:42 2001
@@ -39,7 +39,7 @@
 msg_help="Display info about GNUe Forms." 
 
 #
-GEASDIR="/home/jamest/cvs/gnue/geas/"
+GEASDIR="../../geas/"
 
 
 # GNUe logo
Index: gnue/gnuef/src/drivers/geas/DBdriver.py
diff -u gnue/gnuef/src/drivers/geas/DBdriver.py:1.12 
gnue/gnuef/src/drivers/geas/DBdriver.py:1.13
--- gnue/gnuef/src/drivers/geas/DBdriver.py:1.12        Sun Mar  4 16:54:17 2001
+++ gnue/gnuef/src/drivers/geas/DBdriver.py     Mon Mar  5 19:15:42 2001
@@ -1,7 +1,7 @@
 #
 # GEAS database driver
 #
-# $Id: DBdriver.py,v 1.12 2001/03/05 00:54:17 jamest Exp $
+# $Id: DBdriver.py,v 1.13 2001/03/06 03:15:42 jamest Exp $
 #
 
 import sys
@@ -9,6 +9,7 @@
 import string
 from gnue.forms import GFDebug
 from gnue.forms import GFOptions
+from gnue.forms.GFError import DBError
 
 try:
     import CORBA
@@ -33,7 +34,6 @@
         self.objlist = {}
 
     def connect(self, host, dbname, user, passwd):
-        print "connect"
         # find the object server base object
         if GFOptions.DEBUG:
             print "IDL being loaded from %s" % 
(GFOptions.GEASDIR+"idl/geas.idl")
@@ -44,6 +44,7 @@
             print "*** Error: could not find IDL files, please recompile"
             print "           and ./configure --with-idldir=/path/to/idl"
             print
+      
         self.orb = CORBA.ORB_init(() , CORBA.ORB_ID)
         try:
             self.ior = open(GFOptions.GEASDIR+"src/geas-server.ior").readline()
@@ -68,7 +69,6 @@
                 digest = self._make_passkey(user, passwd, random)
                 self.database = self.factory.getConnection(user, digest)
 
-            print self.database
             ## Now make connection
             #self.database.connect()
         except (GEAS.UnknownConnection,
@@ -77,16 +77,26 @@
             print "Failed to connect to database. Exiting."
             print ex.detail;
             sys.exit(0)
-        else:
-            print "Connected to database"
 
     def disconnect(self):
         print "disconnect"
         self.database.disconnect();
        self.database.release();
 
+    def beginTransaction(self):
+        pass
+
+
+    def commit(self):
+        pass
+
+
+    def rollback(self):
+        pass
+
+
     def query(self, table, mask = None, order_by=None):
-        GFDebug.printMesg(3, "query mask %s" % mask)
+        GFDebug.printMesg(3, "query mask %s " % mask)
         (objectID, mask) = self.filterMask(mask)
         self.objlist = {}
         rs = []
@@ -102,7 +112,7 @@
             if not maskfield and objectID:
                 maskfield = "objectID"
                 maskdata = str(objectID)
-                
+
             if maskfield:
                 self.data = self.database.loadObjects(table, maskfield, 
maskdata)
             else:
@@ -119,15 +129,12 @@
         return rs
 
     def commit(self):
-        print "commit"
         pass
 
     def rollback(self):
-        print "rollback"
         pass
 
     def insert(self,table,mask):
-        print "insert"
         (objectID, mask) = self.filterMask(mask)
         obj = self.database.newObject(table)
         for m in mask.keys():
@@ -142,7 +149,6 @@
         return mask
         
     def delete(self,table,mask):
-        print "delete"
         (objectID, mask) = self.filterMask(mask)
         obj = self.objlist[objectID]
         if obj:
@@ -150,7 +156,6 @@
             obj.flush()
 
     def update(self,table,mask):
-        print "update"
         (objectID, mask) = self.filterMask(mask)
         obj = self.objlist[objectID]
         if obj:
@@ -162,27 +167,21 @@
         return [self.buildMask(obj)]
 
     def getFieldList(self,table):
-        print "getFieldList"
-
         list = {}
         self.fieldlist = {}
-        #
-        # commented out as geas can't return this info yet
-        #cd = self.database.getFullClassDefinition(table)
-        #if cd:
-        #    for field in cd.fields:
-        #        if field.type == 1:
-        #            list[field.name] = field.type
-        #
+        cd = self.database.getFullClassDefinition(table)
+        if cd:
+            for field in cd.fields:
+                if field.type == 1:
+                    list[field.name] = field.type
+        
         self.fieldlist = list
         return list
 
     def getUniqueKey(self, table):
-        print "getUniqueKey"
         return self.uniqueKey
 
     def filterMask(self, mask):
-        print "fliterMask", mask
         objectID = None
         nmask = {}
         if mask != None:
@@ -195,7 +194,6 @@
         return (objectID, nmask)
 
     def buildMask(self, obj):
-        print "buildMask"
         r = {}
         # add objectID into field list
         r[self.uniqueKey] = obj.objectID
@@ -205,12 +203,10 @@
         return r
 
     def _make_passkey(self, user, passwd, random):
-        print "_make_passkey"
         m = md5.new(user + '-' + passwd + '-' + random)
         return self._hexstr(m.digest())
 
     def _hexstr(self, s):
-        print "hexstr"
         h = string.hexdigits
         r = ''
         for c in s: