Skip to content
Snippets Groups Projects

Implements the annotations

Merged Amir MOHAMMADI requested to merge refactoring_2016 into master
5 files
+ 61
67
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -19,7 +19,7 @@ class File(BioFile):
@@ -19,7 +19,7 @@ class File(BioFile):
def __init__(self, f):
def __init__(self, f):
super(File, self).__init__(client_id=f.client_id, path=f.path,
super(File, self).__init__(client_id=f.client_id, path=f.path,
file_id=f.id)
file_id=f.id)
self.__f = f
self.__f = f
@@ -32,18 +32,19 @@ class Database(BioDatabase):
@@ -32,18 +32,19 @@ class Database(BioDatabase):
super(Database, self).__init__(name='utfvp', **kwargs)
super(Database, self).__init__(name='utfvp', **kwargs)
from bob.db.utfvp.query import Database as LowLevelDatabase
from bob.db.utfvp.query import Database as LowLevelDatabase
self.__db = LowLevelDatabase()
self._db = LowLevelDatabase()
def model_ids_with_protocol(self, groups=None, protocol=None, **kwargs):
def model_ids_with_protocol(self, groups=None, protocol=None, **kwargs):
protocol = protocol if protocol is not None else self.protocol
protocol = protocol if protocol is not None else self.protocol
return self.__db.model_ids(groups=groups, protocol=protocol)
return self._db.model_ids(groups=groups, protocol=protocol)
def objects(self, groups=None, protocol=None, purposes=None,
def objects(self, groups=None, protocol=None, purposes=None,
model_ids=None, **kwargs):
model_ids=None, **kwargs):
retval = self.__db.objects(groups=groups, protocol=protocol,
retval = self._db.objects(groups=groups, protocol=protocol,
purposes=purposes, model_ids=model_ids, **kwargs)
purposes=purposes, model_ids=model_ids, **kwargs)
return [File(f) for f in retval]
return [File(f) for f in retval]
 
 
def annotations(self, file):
 
return None
Loading