database constructor now accepts original_directory and original_extension...

database constructor now accepts original_directory and original_extension bob#235

bob/db/mobio/models.py

@@ -155,9 +155,10 @@ class File(Base, bob.db.base.File):
 
   def __init__(self, client_id, path, session_id, speech_type, shot_id, environment, device, channel_id):
     # call base class constructor
-    bob.db.base.File.__init__(self, client_id=client_id, path=path)
+    bob.db.base.File.__init__(self, path=path)
 
     # fill the remaining bits of the file information
+    self.client_id = client_id
     self.session_id = session_id
     self.speech_type = speech_type
     self.shot_id = shot_id

bob/db/mobio/query.py

@@ -39,7 +39,7 @@ class Database(bob.db.base.SQLiteDatabase):
 
   def __init__(self, original_directory=None, original_extension=None, annotation_directory=None, annotation_extension='.pos'):
     # call base class constructors to open a session to the database
-    super(Database, self).__init__(SQLITE_FILE, File)
+    super(Database, self).__init__(SQLITE_FILE, File, original_directory, original_extension)
 
     self.annotation_directory = annotation_directory
     self.annotation_extension = annotation_extension