gnue gnue-common/etc/sample.gnue.conf gnue-comm...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/06/27 18:58:51

Modified files:
        gnue-common/etc: sample.gnue.conf 
        gnue-common/gnue/common/dbdrivers/geas: DBdriver.py 
        gnuef          : setup.py 
        gnuef/samples/geas: country.gfd users.gfd 
        gnuef/src      : UIwxpython.py 

Log message:
        Fixed geas driver issues
        Fixed button trigger support in UIwxpython
        Minor setup.py changes
        Misc config changes to make gnuef work with installed geas by default

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/etc/sample.gnue.conf.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/setup.py.diff?cvsroot=OldCVS&tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/geas/country.gfd.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/geas/users.gfd.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.101&tr2=1.102&r1=text&r2=text

Patches:
Index: gnue/gnue-common/etc/sample.gnue.conf
diff -u gnue/gnue-common/etc/sample.gnue.conf:1.2 
gnue/gnue-common/etc/sample.gnue.conf:1.3
--- gnue/gnue-common/etc/sample.gnue.conf:1.2   Thu Jun  7 08:10:18 2001
+++ gnue/gnue-common/etc/sample.gnue.conf       Wed Jun 27 18:58:51 2001
@@ -59,7 +59,7 @@
 msg_help=Display info about GNUe Forms. 
 
 #
-GEASDIR=../../geas/
+GEASDIR=/usr/local/
 
 # GNUe logo
 smallPNG=%(prefix)s/shared/images/gnue.png
Index: gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py
diff -u gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py:1.4 
gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py:1.5
--- gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py:1.4 Mon Jun 25 
21:32:46 2001
+++ gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py     Wed Jun 27 
18:58:51 2001
@@ -21,26 +21,28 @@
 #
 # GEAS database driver
 #
-# $Id: DBdriver.py,v 1.4 2001/06/26 04:32:46 jamest Exp $
+# $Id: DBdriver.py,v 1.5 2001/06/28 01:58:51 jamest Exp $
 #
 
 import sys
 import md5
 import string
-from gnue.forms import GFDebug
+from gnue.common import GDebug
 #from gnue.forms import GFOptions
 from gnue.common import GConfig
 from gnue.forms.GFError import DBError
 
 try:
     import CORBA
-    GDebug.printMesg(1,"IDL being loaded from %s" % 
(GConfig.get('GEASDIR')+"idl/geas.idl"))
+    idlFiles=GConfig.get('GEASDIR')+"/share/idl/geas.idl"
+    print idlFiles
+    GDebug.printMesg(1,"IDL being loaded from %s" % (idlFiles))
     # FIXME: Temporary hack to make this run with both orbit-python 0.1.x
     #        (uses load_idl) and 0.2.0 (uses _load_idl)
     if CORBA.__dict__.has_key("_load_idl"):
-        CORBA._load_idl(GConfig.get('GEASDIR')+"idl/geas.idl")    # this will 
remain
+        CORBA._load_idl(idlFiles)    # this will remain
     else:
-        CORBA.load_idl(GConfig.get('GEASDIR')+"idl/geas.idl")     # this will 
go away
+        CORBA.load_idl(idlFiles)     # this will go away
     # FIXME: end temporary hack
     import GEAS
     
@@ -64,7 +66,7 @@
         # find the object server base object
         self.orb = CORBA.ORB_init(() , CORBA.ORB_ID)
         try:
-            self.ior = 
open(GConfig.get('GEASDIR')+"src/geas-server.ior").readline()
+            self.ior = 
open(GConfig.get('GEASDIR')+"/var/run/geas-server.ior").readline()
         except (IOError), ex:
             print "*** Error: ior file for geas was not found...  is geas 
running?"
             print
@@ -103,7 +105,7 @@
 
 
     def query(self, table, mask = None, order_by=None):
-        GFDebug.printMesg(3, "query mask %s " % mask)
+        GDebug.printMesg(3, "query mask %s " % mask)
         (objectID, mask) = self.filterMask(mask)
         self.objlist = {}
         rs = []
Index: gnue/gnuef/samples/geas/country.gfd
diff -u gnue/gnuef/samples/geas/country.gfd:1.1 
gnue/gnuef/samples/geas/country.gfd:1.2
--- gnue/gnuef/samples/geas/country.gfd:1.1     Mon Mar  5 19:15:42 2001
+++ gnue/gnuef/samples/geas/country.gfd Wed Jun 27 18:58:51 2001
@@ -14,7 +14,7 @@
   <page>
     <block name="id" datasource="country" rows="5" >
       <label text="ID" x="1" y="1" width="4" alignment="center"/>
-      <entry name="id" field="id" x="1" y="2" width="4" height="1" 
maxlength="2">
+      <entry name="id" field="id" x="1" y="2" width="4" height="1" 
max_length="2">
        <options>
          <tip>2 Character code for country</tip>
        </options>
Index: gnue/gnuef/samples/geas/users.gfd
diff -u gnue/gnuef/samples/geas/users.gfd:1.2 
gnue/gnuef/samples/geas/users.gfd:1.3
--- gnue/gnuef/samples/geas/users.gfd:1.2       Thu Jun  7 18:36:52 2001
+++ gnue/gnuef/samples/geas/users.gfd   Wed Jun 27 18:58:51 2001
@@ -21,7 +21,7 @@
     if y == 0: nextchar = chr(ord('a') + x)
     if y == 1: nextchar = chr(ord('A') + x)
     if y == 2:
-        if x > 9: x = whrandom.randint(0,9)
+        if x &gt; 9: x = whrandom.randint(0,9)
        nextchar = chr(ord('0') + x)
     newpass = newpass + nextchar
 userid.fields.password = newpass
Index: gnue/gnuef/setup.py
diff -u gnue/gnuef/setup.py:1.27 gnue/gnuef/setup.py:1.28
--- gnue/gnuef/setup.py:1.27    Mon Jun 25 21:32:46 2001
+++ gnue/gnuef/setup.py Wed Jun 27 18:58:51 2001
@@ -25,6 +25,10 @@
 import os
 import os.path
 
+
+#print sys.prefix
+#print sys.exec_prefix
+
 def developer_install():
   pwd = os.getcwd()
   gfcvs = """     
@@ -74,12 +78,10 @@
 
   sys.exit()
 
-
 # bypass the install for devel installs
 if 'devel' in sys.argv:
   developer_install()
 
-
 try:
   from distutils.core import setup
   from distutils.command.build_scripts import build_scripts
@@ -102,7 +104,7 @@
 """
   raw_input ("Press Control-D to abort or any other key to continue") 
   
-if 'build' in sys.argv:
+if ('build' in sys.argv) or ('install' in sys.argv):
   # Verify that gnue-common is installed
 #  try:
 #    print "Checking for GNUe-Common....",
@@ -117,7 +119,7 @@
 #before gnuef will function.  You can
 #obtain a copy from 
 #
-#http://gnue.org/index.cgi/downloads
+#http://www.gnuenterprise.org/download.php
 #"""
 #    sys.exit()
 
@@ -187,7 +189,6 @@
       return
 
     dict = self.distribution.get_option_dict("install")
-    print dict
 
     gnue_env = \
            "#######\n" \
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.101 gnue/gnuef/src/UIwxpython.py:1.102
--- gnue/gnuef/src/UIwxpython.py:1.101  Sun Jun 24 15:28:38 2001
+++ gnue/gnuef/src/UIwxpython.py        Wed Jun 27 18:58:51 2001
@@ -571,7 +571,7 @@
       for key in self._formToUI.keys():
         for count in range(len(self._formToUI[key][0])):
           if self._formToUI[key][0][count].GetId() == object.GetId():
-            action = GFEvent('fireTRIGGER',key._trigger)
+            action = GFEvent('fireTRIGGER',key.trigger)
     #
     # Notebook tab events
     #