Преглед на файлове

Merge branch 'initialize-tagcache'

* initialize-tagcache:
  Give the tag cache connection the same name as the database connection
  Ensure tag cache is initialized with rest of database
Steve Pieper преди 12 години
родител
ревизия
770c39c8e3
променени са 1 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 5 1
      Libs/DICOM/Core/ctkDICOMDatabase.cpp

+ 5 - 1
Libs/DICOM/Core/ctkDICOMDatabase.cpp

@@ -283,6 +283,10 @@ void ctkDICOMDatabase::openDatabase(const QString databaseFile, const QString& c
   QFileInfo fileInfo(d->DatabaseFileName);
   d->TagCacheDatabaseFilename = QString( fileInfo.dir().path() + "/ctkDICOMTagCache.sql" );
   d->TagCacheVerified = false;
+  if ( !this->tagCacheExists() )
+    {
+    this->initializeTagCache();
+    }
 }
 
 
@@ -1464,7 +1468,7 @@ bool ctkDICOMDatabase::tagCacheExists()
   if ( !(d->TagCacheDatabase.isOpen()) )
     {
     qDebug() << "TagCacheDatabase not open\n";
-    d->TagCacheDatabase = QSqlDatabase::addDatabase("QSQLITE", "TagCache");
+    d->TagCacheDatabase = QSqlDatabase::addDatabase("QSQLITE", d->Database.connectionName() + "TagCache");
     d->TagCacheDatabase.setDatabaseName(d->TagCacheDatabaseFilename);
     if ( !(d->TagCacheDatabase.open()) )
       {