GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1151:7dc72cc510ff

Adds "hybrid" server mode...

Alexandre Leroux -

r1151:7dc72cc510ff

parent child

Context file:

r1151:7dc72cc510ff

Collapse all files

cmake/sciqlop_applications.cmake +2 -1

                 # Available values are:
                 # - "default": default AMDA server
                 # - "amdatest": AMDA test server
+                # - "hybrid": use both the default server and the test server (the server used is relative to each product, according to its "server" property in the JSON file)
                 # Any other value will lead to the use of the default server
-                ADD_DEFINITIONS(-DSCIQLOP_AMDA_SERVER="default")
+                ADD_DEFINITIONS(-DSCIQLOP_AMDA_SERVER="hybrid")
                 set(sciqlop-amda_DIR "${CMAKE_SOURCE_DIR}/plugins/amda/cmake")
                 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-amda_DIR}")

meson.build +2 -1

             # Available values are:
             # - "default": default AMDA server
             # - "amdatest": AMDA test server
+            # - "hybrid": use both the default server and the test server (the server used is relative to each product, according to its "server" property in the JSON file)
             # Any other value will lead to the use of the default server
-            add_project_arguments('-DSCIQLOP_AMDA_SERVER="default"', language : 'cpp')
+            add_project_arguments('-DSCIQLOP_AMDA_SERVER="hybrid"', language : 'cpp')
             subdir('core')
             subdir('gui')

plugins/amda/include/AmdaServer.h +3 -1

                 /// @return the name of the server
                 virtual QString name() const = 0;
+                /// @param properties used to generate url
                 /// @return the url of the server (used to retrieve data)
-                virtual QString url() const = 0;
+                virtual QString url(const QVariantHash &properties = {}) const = 0;
             };
             #endif // SCIQLOP_AMDASERVER_H

plugins/amda/src/AmdaProvider.cpp +3 -2

                 auto startDate = dateFormat(dateTime.m_TStart);
                 auto endDate = dateFormat(dateTime.m_TEnd);
-                auto url = QUrl{
+                QVariantHash urlProperties{{AMDA_SERVER_KEY, data.value(AMDA_SERVER_KEY)}};
-                    QString{AMDA_URL_FORMAT}.arg(AmdaServer::instance().url(), startDate, endDate, productId)};
+                auto url = QUrl{QString{AMDA_URL_FORMAT}.arg(AmdaServer::instance().url(urlProperties),
+                                                             startDate, endDate, productId)};
                 qCInfo(LOG_AmdaProvider()) << tr("TORM AmdaProvider::retrieveData url:") << url;
                 auto tempFile = std::make_shared<QTemporaryFile>();

plugins/amda/src/AmdaServer.cpp +35 -2

             #include "AmdaServer.h"
+            #include "AmdaDefs.h"
             Q_LOGGING_CATEGORY(LOG_AmdaServer, "AmdaServer")
             namespace {
+            /// URL of the default AMDA server
+            const auto AMDA_DEFAULT_SERVER_URL = QStringLiteral("amda.irap.omp.eu");
+            /// URL of the AMDA test server
+            const auto AMDA_TEST_SERVER_URL = QStringLiteral("amdatest.irap.omp.eu");
             /// Default AMDA server
             struct AmdaDefaultServer : public AmdaServer {
             public:
                 QString name() const override { return QStringLiteral("AMDA (default)"); }
-                QString url() const override { return QStringLiteral("amda.irap.omp.eu"); }
+                QString url(const QVariantHash &properties) const override
+                {
+                    Q_UNUSED(properties);
+                    return AMDA_DEFAULT_SERVER_URL;
+                }
             };
             /// Alternative AMDA server (tests)
             struct AmdaTestServer : public AmdaServer {
             public:
                 QString name() const override { return QStringLiteral("AMDA (test)"); }
-                QString url() const override { return QStringLiteral("amdatest.irap.omp.eu"); }
+                QString url(const QVariantHash &properties) const override
+                {
+                    Q_UNUSED(properties);
+                    return AMDA_TEST_SERVER_URL;
+                }
+            };
+            /// Hybrid AMDA server: use both of default and test server.
+            /// The server used is relative to each product for which to retrieve url, according to its "server"
+            /// property
+            struct AmdaHybridServer : public AmdaServer {
+            public:
+                QString name() const override { return QStringLiteral("AMDA (hybrid)"); }
+                QString url(const QVariantHash &properties) const override
+                {
+                    // Reads "server" property to determine which server url to use
+                    auto server = properties.value(AMDA_SERVER_KEY).toString();
+                    return server == QString{"amdatest"} ? AMDA_TEST_SERVER_URL : AMDA_DEFAULT_SERVER_URL;
+                }
             };
             /// @return an AMDA server instance created from the name of the server passed in parameter. If the
                 if (server == QString{"amdatest"}) {
                     return std::make_unique<AmdaTestServer>();
                 }
+                else if (server == QString{"hybrid"}) {
+                    return std::make_unique<AmdaHybridServer>();
+                }
                 else {
                     if (server != QString{"default"}) {
                         qCWarning(LOG_AmdaServer())

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages