GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r984:a2f640a8dec0

17

18

namespace {

18

namespace {

19

20

/// URL of the default AMDA server

21

const auto AMDA_SERVER_URL = QStringLiteral("amda.irap.omp.eu");

22

23

/// URL of the AMDA test server

24

const auto AMDA_TEST_SERVER_URL = QStringLiteral("amdatest.irap.omp.eu");

25

20

/// URL format for a request on AMDA server. The parameters are as follows:

26

/// URL format for a request on AMDA server. The parameters are as follows:

21

/// - %1: s~~tart date~~

27

/// - %1: server URL

22

/// - %2: ~~end~~ date

28

/// - %2: start date

23

/// - %3: ~~parameter id~~

29

/// - %3: end date

30

/// - %4: parameter id

24

/// AMDA V2: http://amdatest.irap.omp.eu/php/rest/

31

/// AMDA V2: http://amdatest.irap.omp.eu/php/rest/

25

const auto AMDA_URL_FORMAT = QStringLiteral(

32

const auto AMDA_URL_FORMAT = QStringLiteral(

26

"http://~~amda.irap.omp.eu~~/php/rest/"

33

"http://%1/php/rest/"

27

"getParameter.php?startTime=%1&stopTime=%2&parameterID=%3&outputFormat=ASCII&"

34

"getParameter.php?startTime=%2&stopTime=%3&parameterID=%4&outputFormat=ASCII&"

28

"timeFormat=ISO8601&gzip=0");

35

"timeFormat=ISO8601&gzip=0");

29

36

30

/// Dates format passed in the URL (e.g 2013-09-23T09:00)

37

/// Dates format passed in the URL (e.g 2013-09-23T09:00)

37

return dateTime.toString(AMDA_TIME_FORMAT);

44

return dateTime.toString(AMDA_TIME_FORMAT);

38

}

45

}

39

46

47

/// Returns the URL of the AMDA server queried for requests, depending on the type of server passed

48

/// as a parameter

49

QString serverURL(const QString &server)

50

{

51

if (server == QString{"amdatest"}) {

52

return AMDA_TEST_SERVER_URL;

53

}

54

else {

55

return AMDA_SERVER_URL;

56

}

57

}

58

40

AmdaResultParser::ValueType valueType(const QString &valueType)

59

AmdaResultParser::ValueType valueType(const QString &valueType)

41

{

60

{

42

if (valueType == QStringLiteral("scalar")) {

61

if (valueType == QStringLiteral("scalar")) {

168

// scalar, vector...

187

// scalar, vector...

169

auto productValueType = valueType(data.value(AMDA_DATA_TYPE_KEY).toString());

188

auto productValueType = valueType(data.value(AMDA_DATA_TYPE_KEY).toString());

170

189

190

// Gets the server being queried to retrieve the product. It's then used to set the server URL

191

auto productServer = data.value(AMDA_SERVER_KEY).toString();

192

171

// /////////// //

193

// /////////// //

172

// Creates URL //

194

// Creates URL //

173

// /////////// //

195

// /////////// //

175

auto startDate = dateFormat(dateTime.m_TStart);

197

auto startDate = dateFormat(dateTime.m_TStart);

176

auto endDate = dateFormat(dateTime.m_TEnd);

198

auto endDate = dateFormat(dateTime.m_TEnd);

177

199

178

auto url = QUrl{QString{AMDA_URL_FORMAT}.arg(startDate, endDate, productId)};

200

auto url = QUrl{

201

QString{AMDA_URL_FORMAT}.arg(serverURL(productServer), startDate, endDate, productId)};

179

qCInfo(LOG_AmdaProvider()) << tr("TORM AmdaProvider::retrieveData url:") << url;

202

qCInfo(LOG_AmdaProvider()) << tr("TORM AmdaProvider::retrieveData url:") << url;

180

auto tempFile = std::make_shared<QTemporaryFile>();

203

auto tempFile = std::make_shared<QTemporaryFile>();

181

204

216

239

217

// Don't do anything if the reply was abort

240

// Don't do anything if the reply was abort

218

if (reply->error() == QNetworkReply::NoError) {

241

if (reply->error() == QNetworkReply::NoError) {

219

~~// AMDA v2:~~ auto downloadFileUrl = QUrl{QString{reply->readAll()}.trimmed()};

242

auto downloadFileUrl = QUrl{QString{reply->readAll()}.trimmed()};

220

auto downloadFileUrl = QUrl{QString{reply->readAll()}};

221

243

222

qCInfo(LOG_AmdaProvider())

244

qCInfo(LOG_AmdaProvider())

223

<< tr("TORM AmdaProvider::retrieveData downloadFileUrl:") << downloadFileUrl;

245

<< tr("TORM AmdaProvider::retrieveData downloadFileUrl:") << downloadFileUrl;

	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

             namespace {
+            /// URL of the default AMDA server
+            const auto AMDA_SERVER_URL = QStringLiteral("amda.irap.omp.eu");
+            /// URL of the AMDA test server
+            const auto AMDA_TEST_SERVER_URL = QStringLiteral("amdatest.irap.omp.eu");
             /// URL format for a request on AMDA server. The parameters are as follows:
-            /// - %1: start date
+            /// - %1: server URL
-            /// - %2: end date
+            /// - %2: start date
-            /// - %3: parameter id
+            /// - %3: end date
+            /// - %4: parameter id
             /// AMDA V2: http://amdatest.irap.omp.eu/php/rest/
             const auto AMDA_URL_FORMAT = QStringLiteral(
-                "http://amda.irap.omp.eu/php/rest/"
+                "http://%1/php/rest/"
-                "getParameter.php?startTime=%1&stopTime=%2&parameterID=%3&outputFormat=ASCII&"
+                "getParameter.php?startTime=%2&stopTime=%3&parameterID=%4&outputFormat=ASCII&"
                 "timeFormat=ISO8601&gzip=0");
             /// Dates format passed in the URL (e.g 2013-09-23T09:00)
                 return dateTime.toString(AMDA_TIME_FORMAT);
             }
+            /// Returns the URL of the AMDA server queried for requests, depending on the type of server passed
+            /// as a parameter
+            QString serverURL(const QString &server)
+            {
+                if (server == QString{"amdatest"}) {
+                    return AMDA_TEST_SERVER_URL;
+                }
+                else {
+                    return AMDA_SERVER_URL;
+                }
+            }
             AmdaResultParser::ValueType valueType(const QString &valueType)
             {
                 if (valueType == QStringLiteral("scalar")) {
                 // scalar, vector...
                 auto productValueType = valueType(data.value(AMDA_DATA_TYPE_KEY).toString());
+                // Gets the server being queried to retrieve the product. It's then used to set the server URL
+                auto productServer = data.value(AMDA_SERVER_KEY).toString();
                 // /////////// //
                 // Creates URL //
                 // /////////// //
                 auto startDate = dateFormat(dateTime.m_TStart);
                 auto endDate = dateFormat(dateTime.m_TEnd);
-                auto url = QUrl{QString{AMDA_URL_FORMAT}.arg(startDate, endDate, productId)};
+                auto url = QUrl{
+                    QString{AMDA_URL_FORMAT}.arg(serverURL(productServer), startDate, endDate, productId)};
                 qCInfo(LOG_AmdaProvider()) << tr("TORM AmdaProvider::retrieveData url:") << url;
                 auto tempFile = std::make_shared<QTemporaryFile>();
                           // Don't do anything if the reply was abort
                           if (reply->error() == QNetworkReply::NoError) {
-                              // AMDA v2: auto downloadFileUrl = QUrl{QString{reply->readAll()}.trimmed()};
+                              auto downloadFileUrl = QUrl{QString{reply->readAll()}.trimmed()};
-                              auto downloadFileUrl = QUrl{QString{reply->readAll()}};
                               qCInfo(LOG_AmdaProvider())
                                   << tr("TORM AmdaProvider::retrieveData downloadFileUrl:") << downloadFileUrl;