From ce7056d27d63d33c9fd38f41abfacb8afb1eaaf4 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Tue, 9 Dec 2014 22:21:52 +0100 Subject: store and allow fetching of parse / file missing errors --- tests/hawd/datasetdefinition.cpp | 15 +++++++++++++-- tests/hawd/datasetdefinition.h | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/hawd/datasetdefinition.cpp b/tests/hawd/datasetdefinition.cpp index 2fa96cf..4d1028b 100644 --- a/tests/hawd/datasetdefinition.cpp +++ b/tests/hawd/datasetdefinition.cpp @@ -108,7 +108,8 @@ DatasetDefinition::DatasetDefinition(const QString &path) QJsonDocument jsonDoc = QJsonDocument::fromJson(file.readAll(), &error); if (jsonDoc.isNull()) { - std::cerr << QObject::tr("Dataset definition file malformed at character %1: %2").arg(error.offset).arg(error.errorString()).toStdString() << std::endl; + m_lastError = QObject::tr("Dataset definition file malformed at character %1: %2").arg(error.offset).arg(error.errorString()); + std::cerr << m_lastError.toStdString() << std::endl; } else { m_valid = true; QJsonObject json = jsonDoc.object(); @@ -126,15 +127,25 @@ DatasetDefinition::DatasetDefinition(const QString &path) } } } + } else { + m_lastError = QObject::tr("Could not open file for parsing: ").arg(path); } -} + if (!m_lastError.isEmpty()) { + std::cerr << m_lastError.toStdString() << std::endl; + } +} bool DatasetDefinition::isValid() const { return m_valid; } +QString DatasetDefinition::lastError() const +{ + return m_lastError; +} + QString DatasetDefinition::name() const { return m_name; diff --git a/tests/hawd/datasetdefinition.h b/tests/hawd/datasetdefinition.h index eb4b780..21655a7 100644 --- a/tests/hawd/datasetdefinition.h +++ b/tests/hawd/datasetdefinition.h @@ -54,6 +54,7 @@ public: bool isValid() const; + QString lastError() const; QString name() const; QString description() const; QHash columns() const; @@ -62,6 +63,7 @@ private: bool m_valid; QString m_name; QString m_description; + QString m_lastError; QHash m_columns; }; -- cgit v1.2.3