fix get point properties

ARPA-SIMC · Aug 20, 2024 · 4410284 · 4410284
1 parent 8506815
commit 4410284
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/dbMeteoPoints/download.cpp b/dbMeteoPoints/download.cpp
@@ -21,9 +21,9 @@ DbArkimet* Download::getDbArkimet()
     return _dbMeteo;
 }
 
-bool Download::getPointProperties(QList<QString> datasetList)
-{
 
+bool Download::getPointProperties(const QList<QString> &datasetList, QString &errorString)
+{
     bool result = true;
     QEventLoop loop;
 
@@ -43,7 +43,7 @@ bool Download::getPointProperties(QList<QString> datasetList)
 
     if (reply->error() != QNetworkReply::NoError)
     {
-            qDebug() << "Network Error: " << reply->error();
+            errorString =  "Network Error: " + reply->errorString();
             result = false;
     }
     else
@@ -56,7 +56,12 @@ bool Download::getPointProperties(QList<QString> datasetList)
         qDebug() << "err: " << error->errorString() << " -> " << error->offset;
 
         // check validity of the document
-        if(! doc.isNull() && doc.isArray() )
+        if(doc.isNull() || ! doc.isArray())
+        {
+            errorString = "Invalid JSON";
+            result = false;
+        }
+        else
         {
             QJsonArray jsonArr = doc.array();
 
@@ -68,28 +73,28 @@ bool Download::getPointProperties(QList<QString> datasetList)
 
                 if (jsonDataset.isUndefined())
                     qDebug() << "jsonDataset: key id does not exist";
-                else if (!jsonDataset.isString())
+                else if (! jsonDataset.isString())
                     qDebug() << "jsonDataset: value is not string";
                 else
+                {
                     foreach(QString item, _datasetsList)
+                    {
                         if (jsonDataset.toString().toUpper() == item.toUpper())
                         {
                             this->downloadMetadata(obj);
                         }
+                    }
+                }
             }
         }
-         else
-        {
-            qDebug() << "Invalid JSON...\n";
-            result = false;
-        }
     }
 
     delete reply;
     delete manager;
     return result;
 }
 
+
 QMap<QString, QString> Download::getArmiketIdList(QList<QString> datasetList)
 {
 

diff --git a/dbMeteoPoints/download.h b/dbMeteoPoints/download.h
@@ -12,7 +12,7 @@
             explicit Download(QString dbName, QObject* parent = nullptr);
             ~Download();
 
-            bool getPointProperties(QList<QString> datasetList);
+            bool getPointProperties(const QList<QString> &datasetList, QString &errorString);
             bool getPointPropertiesFromId(QString id, Crit3DMeteoPoint* pointProp);
             QMap<QString,QString> getArmiketIdList(QList<QString> datasetList);
             void downloadMetadata(QJsonObject obj);