Browse Source

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 years ago
parent
commit
9766d3f001
1 changed files with 6 additions and 7 deletions
  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());
       logger.error("SQLITE ERROR: " + fileExistsQuery.lastError().driverText());
       return;
       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;
   qDebug() << "inserting filePath: " << filePath;
-  if (databaseFilename == "")
+  if (!found)
     {
     {
       qDebug() << "database filename for " << sopInstanceUID << " is empty - we should insert on top of it";
       qDebug() << "database filename for " << sopInstanceUID << " is empty - we should insert on top of it";
     }
     }
   else
   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 )
       if ( databaseFilename == filePath && fileLastModified < databaseInsertTimestamp )
         {
         {
           logger.debug ( "File " + databaseFilename + " already added" );
           logger.debug ( "File " + databaseFilename + " already added" );