OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 06:38:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Osdu: extract constants to separate namespace.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2024-06-14 17:31:22 +02:00
1 parent a85fd12989
commit 44ca21636a
5 files changed
+117 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Commands/OsduImportCommands/RiaOsduConnector.cpp
+8 -7
View File
@@ -1,6 +1,7 @@
#include "RiaOsduConnector.h"
#include "RiaFileDownloader.h"
#include "RiaLogging.h"
#include "RiaOsduDefines.h"
#include "RiaOsduOAuthHttpServerReplyHandler.h"
#include <QAbstractOAuth>
@@ -124,7 +125,7 @@ void RiaOsduConnector::requestFieldsByName( const QString& fieldName )
void RiaOsduConnector::requestFieldsByName( const QString& server, const QString& dataPartitionId, const QString& token, const QString& fieldName )
{
std::map<QString, QString> params;
params["kind"] = FIELD_KIND;
params["kind"] = RiaDefines::osduFieldKind();
params["limit"] = "10000";
params["query"] = "data.FieldName:" + fieldName;
@@ -154,7 +155,7 @@ void RiaOsduConnector::requestWellsByFieldId( const QString& fieldId )
void RiaOsduConnector::requestWellsByFieldId( const QString& server, const QString& dataPartitionId, const QString& token, const QString& fieldId )
{
std::map<QString, QString> params;
params["kind"] = WELL_KIND;
params["kind"] = RiaDefines::osduWellKind();
params["limit"] = "10000";
params["query"] = QString( "nested(data.GeoContexts, (FieldID:\"%1\"))" ).arg( fieldId );
@@ -184,7 +185,7 @@ void RiaOsduConnector::requestWellboresByWellId( const QString& wellId )
void RiaOsduConnector::requestWellboresByWellId( const QString& server, const QString& dataPartitionId, const QString& token, const QString& wellId )
{
std::map<QString, QString> params;
params["kind"] = WELLBORE_KIND;
params["kind"] = RiaDefines::osduWellboreKind();
params["limit"] = "10000";
params["query"] = "data.WellID: \"" + wellId + "\"";
@@ -232,7 +233,7 @@ void RiaOsduConnector::requestWellLogsByWellboreId( const QString& server,
const QString& wellboreId )
{
std::map<QString, QString> params;
params["kind"] = WELL_LOG_KIND;
params["kind"] = RiaDefines::osduWellLogKind();
params["limit"] = "10000";
params["query"] = "data.WellboreID: \"" + wellboreId + "\"";
@@ -265,7 +266,7 @@ void RiaOsduConnector::requestWellboreTrajectoryByWellboreId( const QString& ser
const QString& wellboreId )
{
std::map<QString, QString> params;
params["kind"] = WELLBORE_TRAJECTORY_KIND;
params["kind"] = RiaDefines::osduWellboreTrajectoryKind();
params["limit"] = "10000";
params["query"] = "data.WellboreID: \"" + wellboreId + "\"";
@@ -340,7 +341,7 @@ QNetworkReply* RiaOsduConnector::makeSearchRequest( const std::map<QString, QStr
QNetworkRequest m_networkRequest;
m_networkRequest.setUrl( QUrl( constructSearchUrl( server ) ) );
addStandardHeader( m_networkRequest, token, dataPartitionId, CONTENT_TYPE_JSON );
addStandardHeader( m_networkRequest, token, dataPartitionId, RiaDefines::contentTypeJson() );
QJsonObject obj;
for ( auto [key, value] : parameters )
@@ -675,7 +676,7 @@ void RiaOsduConnector::requestParquetData( const QString& url, const QString& da
{
RiaLogging::info( "Requesting download of parquet from: " + url );
auto reply = makeDownloadRequest( url, dataPartitionId, token, CONTENT_TYPE_PARQUET );
auto reply = makeDownloadRequest( url, dataPartitionId, token, RiaDefines::contentTypeParquet() );
connect( reply,
&QNetworkReply::finished,
[this, reply, url]()
ApplicationLibCode/Commands/OsduImportCommands/RiaOsduConnector.h
-9
View File
@@ -149,13 +149,4 @@ private:
std::map<QString, std::vector<OsduWellboreTrajectory>> m_wellboreTrajectories;
std::map<QString, std::vector<OsduWellLog>> m_wellLogs;
QByteArray m_parquetData;
static inline const QString FIELD_KIND = "osdu:wks:master-data--Field:1.0.0";
static inline const QString WELL_KIND = "osdu:wks:master-data--Well:1.*.*";
static inline const QString WELLBORE_KIND = "osdu:wks:master-data--Wellbore:1.*.*";
static inline const QString WELLBORE_TRAJECTORY_KIND = "osdu:wks:work-product-component--WellboreTrajectory:1.*.*";
static inline const QString WELL_LOG_KIND = "osdu:wks:work-product-component--WellLog:1.*.*";
static inline const QString CONTENT_TYPE_JSON = "application/json";
static inline const QString CONTENT_TYPE_PARQUET = "application/x-parquet";
};