diff options
| author | Oliver Tappe | 2006-09-29 15:24:23 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2006-09-29 15:24:23 +0200 |
| commit | 61bdec66235ad9b18c61e483c0bc98184382c379 (patch) | |
| tree | 080cfd03c8fdcef4535878a114622107ab19dbae /config-db | |
| parent | * adjusted to changed naming of several configuration keys (diff) | |
| download | core-61bdec66235ad9b18c61e483c0bc98184382c379.tar.gz core-61bdec66235ad9b18c61e483c0bc98184382c379.tar.xz core-61bdec66235ad9b18c61e483c0bc98184382c379.zip | |
* minor cleanup
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@407 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db')
| -rw-r--r-- | config-db/OpenSLX/MetaDB/SQLite.pm | 5 | ||||
| -rw-r--r-- | config-db/OpenSLX/MetaDB/mysql.pm | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/config-db/OpenSLX/MetaDB/SQLite.pm b/config-db/OpenSLX/MetaDB/SQLite.pm index f40c618f..3af72128 100644 --- a/config-db/OpenSLX/MetaDB/SQLite.pm +++ b/config-db/OpenSLX/MetaDB/SQLite.pm @@ -37,11 +37,10 @@ sub connectConfigDB if (!defined $dbSpec) { # build $dbSpec from individual parameters: my $dbBasepath = $openslxConfig{'db-basepath'}; - my $dbDatadir = $openslxConfig{'db-datadir'} || 'openslxdata-sqlite'; + my $dbDatadir = $openslxConfig{'db-datadir'} || 'sqlite'; my $dbPath = "$dbBasepath/$dbDatadir"; mkdir $dbPath unless -e $dbPath; - my $dbName = $openslxConfig{'db-name'}; - $dbSpec = "dbname=$dbPath/$dbName"; + $dbSpec = "dbname=$dbPath/$openslxConfig{'db-name'}"; } vlog 1, "trying to connect to SQLite-database <$dbSpec>"; $self->{'dbh'} = DBI->connect("dbi:SQLite:$dbSpec", undef, undef, diff --git a/config-db/OpenSLX/MetaDB/mysql.pm b/config-db/OpenSLX/MetaDB/mysql.pm index dc6ef7d0..316bdab0 100644 --- a/config-db/OpenSLX/MetaDB/mysql.pm +++ b/config-db/OpenSLX/MetaDB/mysql.pm @@ -36,8 +36,7 @@ sub connectConfigDB my $dbSpec = $openslxConfig{'db-spec'}; if (!defined $dbSpec) { # build $dbSpec from individual parameters: - my $dbName = $openslxConfig{'db-name'}; - $dbSpec = "database=$dbName"; + $dbSpec = "database=$openslxConfig{'db-name'}"; } my $user = (getpwuid($>))[0]; vlog 1, "trying to connect user <$user> to mysql-database <$dbSpec>"; |