浏览代码

BUG: ctkDICOMDatabase: Fix "not positioned on a valid record" error

This commit fixes warning like the following:

```
QSqlQuery::value: not positioned on a valid record
QSqlQuery::value: not positioned on a valid record
```

reported  each time a new file is indexed.

Within Slicer, this additional check reduces the import time
from "~3.30s" to "~2.90s" for ~550 files.
Jean-Christophe Fillion-Robin 7 年之前
父节点
当前提交
9766d3f001
共有 1 个文件被更改,包括 6 次插入7 次删除
  1. 6 7
      Libs/DICOM/Core/ctkDICOMDatabase.cpp

+ 6 - 7
Libs/DICOM/Core/ctkDICOMDatabase.cpp

@@ -1337,19 +1337,18 @@ void ctkDICOMDatabasePrivate::insert( const ctkDICOMItem& ctkDataset, const QStr
       logger.error("SQLITE ERROR: " + fileExistsQuery.lastError().driverText());
       return;
     }
-  fileExistsQuery.next();
-
-  QString databaseFilename(fileExistsQuery.value(1).toString());
-  QDateTime fileLastModified(QFileInfo(databaseFilename).lastModified());
-  QDateTime databaseInsertTimestamp(QDateTime::fromString(fileExistsQuery.value(0).toString(),Qt::ISODate));
-
+  bool found = fileExistsQuery.next();
   qDebug() << "inserting filePath: " << filePath;
-  if (databaseFilename == "")
+  if (!found)
     {
       qDebug() << "database filename for " << sopInstanceUID << " is empty - we should insert on top of it";
     }
   else
     {
+      QString databaseFilename(fileExistsQuery.value(1).toString());
+      QDateTime fileLastModified(QFileInfo(databaseFilename).lastModified());
+      QDateTime databaseInsertTimestamp(QDateTime::fromString(fileExistsQuery.value(0).toString(),Qt::ISODate));
+
       if ( databaseFilename == filePath && fileLastModified < databaseInsertTimestamp )
         {
           logger.debug ( "File " + databaseFilename + " already added" );