From 62c915928deadab5496bb44d8ccad7eaf7849ad4 Mon Sep 17 00:00:00 2001 From: fpdb-mme Date: Tue, 3 Nov 2009 10:50:13 +0100 Subject: [PATCH] - added a global const to config to point to "database" directory - adjusted fpdb_db.py to make use use of this const --- pyfpdb/Configuration.py | 4 ++++ pyfpdb/fpdb_db.py | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index 79958269..060aecff 100755 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -50,6 +50,10 @@ log.debug("config logger initialised") APPLICATION_NAME_SHORT = 'fpdb' APPLICATION_VERSION = 'xx.xx.xx' +DIR_SELF = os.path.dirname(os.path.abspath(__file__)) +#TODO: imo no good idea to place 'database' in parent dir +DIR_DATABASES = os.path.join(os.path.dirname(DIR_SELF), 'database') + DATABASE_TYPE_POSTGRESQL = 'postgresql' DATABASE_TYPE_SQLITE = 'sqlite' DATABASE_TYPE_MYSQL = 'mysql' diff --git a/pyfpdb/fpdb_db.py b/pyfpdb/fpdb_db.py index da0bbbe7..310c219b 100644 --- a/pyfpdb/fpdb_db.py +++ b/pyfpdb/fpdb_db.py @@ -33,12 +33,12 @@ except ImportError: import fpdb_simple import FpdbSQLQueries +import Configuration class fpdb_db: MYSQL_INNODB = 2 PGSQL = 3 SQLITE = 4 - sqlite_db_dir = ".." + os.sep + "database" def __init__(self): """Simple constructor, doesnt really do anything""" @@ -123,10 +123,10 @@ class fpdb_db: else: logging.warning("SQLite won't work well without 'sqlalchemy' installed.") - if not os.path.isdir(self.sqlite_db_dir): - print "Creating directory: '%s'" % (self.sqlite_db_dir) - os.mkdir(self.sqlite_db_dir) - self.db = sqlite3.connect( self.sqlite_db_dir + os.sep + database + if not os.path.isdir(Configuration.DIR_DATABASES): + print "Creating directory: '%s'" % (Configuration.DIR_DATABASES) + os.mkdir(Configuration.DIR_DATABASES) + self.db = sqlite3.connect( os.path.join(Configuration.DIR_DATABASES, database) , detect_types=sqlite3.PARSE_DECLTYPES ) sqlite3.register_converter("bool", lambda x: bool(int(x))) sqlite3.register_adapter(bool, lambda x: "1" if x else "0")