[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/gnue-common/gnue/common/dbdrivers/geas DBd...
From: |
James Thompson |
Subject: |
gnue/gnue-common/gnue/common/dbdrivers/geas DBd... |
Date: |
Thu, 07 Jun 2001 20:48:50 -0700 |
CVSROOT: /cvs
Module name: gnue
Changes by: James Thompson <address@hidden> 01/06/07 20:48:50
Modified files:
gnue-common/gnue/common/dbdrivers/geas: DBdriver.py
Log message:
Changes to hopefully make geas driver play nice with new config system
(untested)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py
diff -u gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py:1.1
gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py:1.2
--- gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py:1.1 Sun Apr 15
18:33:50 2001
+++ gnue/gnue-common/gnue/common/dbdrivers/geas/DBdriver.py Thu Jun 7
20:48:50 2001
@@ -21,7 +21,7 @@
#
# GEAS database driver
#
-# $Id: DBdriver.py,v 1.1 2001/04/16 01:33:50 jamest Exp $
+# $Id: DBdriver.py,v 1.2 2001/06/08 03:48:50 jamest Exp $
#
import sys
@@ -29,18 +29,19 @@
import string
from gnue.forms import GFDebug
from gnue.forms import GFOptions
+from gnue.common import GConfig
from gnue.forms.GFError import DBError
try:
import CORBA
if GFOptions.DEBUG:
- print "IDL being loaded from %s" % (GFOptions.GEASDIR+"idl/geas.idl")
+ print "IDL being loaded from %s" % (GConf.get('GEASDIR')+"idl/geas.idl")
# 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(GFOptions.GEASDIR+"idl/geas.idl") # this will remain
+ CORBA._load_idl(GConf.get('GEASDIR')+"idl/geas.idl") # this will
remain
else:
- CORBA.load_idl(GFOptions.GEASDIR+"idl/geas.idl") # this will go
away
+ CORBA.load_idl(GConf.get('GEASDIR')+"idl/geas.idl") # this will go
away
# FIXME: end temporary hack
import GEAS
@@ -65,7 +66,7 @@
# find the object server base object
self.orb = CORBA.ORB_init(() , CORBA.ORB_ID)
try:
- self.ior = open(GFOptions.GEASDIR+"src/geas-server.ior").readline()
+ self.ior =
open(GConf.get('GEASDIR')+"src/geas-server.ior").readline()
except (IOError), ex:
print "*** Error: ior file for geas was not found... is geas
running?"
print
- gnue/gnue-common/gnue/common/dbdrivers/geas DBd...,
James Thompson <=