From e376c18b2865cf75dfec522ae4cfcdac60aaba05 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 7 Jul 2019 16:38:27 +0200
Subject: [PATCH] Ref T701, check for model string in reader

---
 src/blackcore/db/modeldatareader.cpp | 6 ++++++
 src/blackcore/db/modeldatareader.h   | 4 ++++
 src/blackcore/webdataservices.cpp    | 6 ++++++
 src/blackcore/webdataservices.h      | 4 ++++
 4 files changed, 20 insertions(+)

diff --git a/src/blackcore/db/modeldatareader.cpp b/src/blackcore/db/modeldatareader.cpp
index 9e901dc9f..168d57606 100644
--- a/src/blackcore/db/modeldatareader.cpp
+++ b/src/blackcore/db/modeldatareader.cpp
@@ -106,6 +106,12 @@ namespace BlackCore
             return models.findFirstByModelStringOrDefault(modelString);
         }
 
+        bool CModelDataReader::containsModelString(const QString &modelString) const
+        {
+            if (modelString.isEmpty()) { return false; }
+            return this->getModels().containsModelString(modelString);
+        }
+
         CAircraftModel CModelDataReader::getModelForDbKey(int dbKey) const
         {
             if (dbKey < 0) { return CAircraftModel(); }
diff --git a/src/blackcore/db/modeldatareader.h b/src/blackcore/db/modeldatareader.h
index 6cc03195b..33d42d9af 100644
--- a/src/blackcore/db/modeldatareader.h
+++ b/src/blackcore/db/modeldatareader.h
@@ -81,6 +81,10 @@ namespace BlackCore
             //! \threadsafe
             BlackMisc::Simulation::CAircraftModel getModelForModelString(const QString &modelString) const;
 
+            //! Contains modelstring?
+            //! \threadsafe
+            bool containsModelString(const QString &modelString) const;
+
             //! Get model for DB key
             //! \threadsafe
             BlackMisc::Simulation::CAircraftModel getModelForDbKey(int dbKey) const;
diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp
index a7de115f3..816229305 100644
--- a/src/blackcore/webdataservices.cpp
+++ b/src/blackcore/webdataservices.cpp
@@ -668,6 +668,12 @@ namespace BlackCore
         return CAircraftModel();
     }
 
+    bool CWebDataServices::containsModelString(const QString &modelString) const
+    {
+        if (m_modelDataReader) { return m_modelDataReader->containsModelString(modelString); }
+        return false;
+    }
+
     CAircraftModel CWebDataServices::getModelForDbKey(int dbKey) const
     {
         if (m_modelDataReader) { return m_modelDataReader->getModelForDbKey(dbKey); }
diff --git a/src/blackcore/webdataservices.h b/src/blackcore/webdataservices.h
index 8e02abe75..ad1dd09a9 100644
--- a/src/blackcore/webdataservices.h
+++ b/src/blackcore/webdataservices.h
@@ -241,6 +241,10 @@ namespace BlackCore
         //! \threadsafe
         BlackMisc::Simulation::CAircraftModel getModelForModelString(const QString &modelString) const;
 
+        //! Existing modelstring?
+        //! \threadsafe
+        bool containsModelString(const QString &modelString) const;
+
         //! Model for key if any
         //! \threadsafe
         BlackMisc::Simulation::CAircraftModel getModelForDbKey(int dbKey) const;