diff --git a/bob/bio/vein/database/__init__.py b/bob/bio/vein/database/__init__.py index e648729a12665612bedd501f52e0433613ae271f..1be8375267bfa7fdde81321179cc112c981121eb 100644 --- a/bob/bio/vein/database/__init__.py +++ b/bob/bio/vein/database/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # vim: set fileencoding=utf-8 : - +from .database import VeinBioFile from .biowave_test import BiowaveTestBioDatabase from .verafinger import VerafingerBioDatabase from .utfvp import UtfvpBioDatabase diff --git a/bob/bio/vein/database/biowave_test.py b/bob/bio/vein/database/biowave_test.py index 1d37f08fac12d8cbfaae4a398391ad3b4b87bbc1..dc6d57cc6594f8e5239d4dd4febb2d373831c3d5 100644 --- a/bob/bio/vein/database/biowave_test.py +++ b/bob/bio/vein/database/biowave_test.py @@ -45,7 +45,7 @@ class BiowaveTestBioDatabase(BioDatabase): def objects(self, protocol=None, groups=None, purposes=None, model_ids=None, **kwargs): retval = self.__db.objects(protocol=protocol, groups=groups, purposes=purposes, model_ids=model_ids) - return [VeinBioFile(f) for f in retval] + return [VeinBioFile(client_id=f.client_id, path=f.path, file_id=f.file_id) for f in retval] # the methodes are derived from: # bob.bio.db/bob/bio/db/database.py diff --git a/bob/bio/vein/database/database.py b/bob/bio/vein/database/database.py index b20eaab924d86305f07f43eeaf9fea8e015bb24f..3a252f358e2cf6405a7a696f2281e3476b2c0c5f 100644 --- a/bob/bio/vein/database/database.py +++ b/bob/bio/vein/database/database.py @@ -11,12 +11,12 @@ from bob.bio.base.database.file import BioFile class VeinBioFile(BioFile): - def __init__(self, f): + def __init__(self, client_id, path, file_id): """ Initializes this File object with an File equivalent for VoxForge database. """ - super(VeinBioFile, self).__init__(client_id=f.client_id, path=f.path, file_id=f.id) + super(VeinBioFile, self).__init__(client_id=client_id, path=path, file_id=file_id) self.__f = f diff --git a/bob/bio/vein/database/utfvp.py b/bob/bio/vein/database/utfvp.py index 548aea122919337b7a214cf1d90d67348a896d9f..fe27084e5e18f9cb3f6886c175c1bb6d1092bdef 100644 --- a/bob/bio/vein/database/utfvp.py +++ b/bob/bio/vein/database/utfvp.py @@ -26,4 +26,4 @@ class UtfvpBioDatabase(BioDatabase): retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [VeinBioFile(f) for f in retval] + return [VeinBioFile(client_id=f.client_id, path=f.path, file_id=f.file_id) for f in retval] diff --git a/bob/bio/vein/database/verafinger.py b/bob/bio/vein/database/verafinger.py index c4906bbf950f2e45467eadbbc4d9cb49089b15c2..5725b6e9bbdceb1b21ce1b9897553d2c6e188ef1 100644 --- a/bob/bio/vein/database/verafinger.py +++ b/bob/bio/vein/database/verafinger.py @@ -44,4 +44,4 @@ class VerafingerBioDatabase(BioDatabase): self.low_level_group_names, self.high_level_group_names) retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [VeinBioFile(f) for f in retval] + return [VeinBioFile(client_id=f.client_id, path=f.path, file_id=f.file_id) for f in retval] diff --git a/setup.py b/setup.py index f875c43ef6a6ad91850ea461cb0bbc8ce88aeaf7..dad90b06385255f6626cd20740a99ef005cd2a2a 100644 --- a/setup.py +++ b/setup.py @@ -32,8 +32,8 @@ setup( entry_points={ 'bob.bio.database': [ - 'verafinger = bob.bio.base.configurations.database.verafinger:database', - 'utfvp = bob.bio.base.configurations.database.utfvp:database', + 'verafinger = bob.bio.vein.configurations.database.verafinger:database', + 'utfvp = bob.bio.vein.configurations.database.utfvp:database', ], 'bob.bio.preprocessor': [