From b1302a165038ca0bef75324545167d6c3cfc9560 Mon Sep 17 00:00:00 2001 From: eblondel Date: Fri, 9 Jul 2021 16:30:25 +0200 Subject: [PATCH] missing capabilities in OWS Http requests --- R/CSWDescribeRecord.R | 2 +- R/CSWGetRecordById.R | 2 +- R/CSWGetRecords.R | 2 +- R/CSWHarvest.R | 2 +- R/CSWTransaction.R | 2 +- R/WFSDescribeFeatureType.R | 2 +- R/WFSGetFeature.R | 2 +- R/WMSGetFeatureInfo.R | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/R/CSWDescribeRecord.R b/R/CSWDescribeRecord.R index e115bf7..f2c3d3b 100644 --- a/R/CSWDescribeRecord.R +++ b/R/CSWDescribeRecord.R @@ -42,7 +42,7 @@ CSWDescribeRecord <- R6Class("CSWDescribeRecord", ) namedParams <- c(namedParams, namespace = namespace, typeName = typeName) - super$initialize(op, "GET", url, request = private$name, + super$initialize(capabilities, op, "GET", url, request = private$name, namedParams = namedParams, mimeType = "text/xml", logger = logger, ...) self$execute() diff --git a/R/CSWGetRecordById.R b/R/CSWGetRecordById.R index a19fd9e..a31ad0e 100644 --- a/R/CSWGetRecordById.R +++ b/R/CSWGetRecordById.R @@ -41,7 +41,7 @@ CSWGetRecordById <- R6Class("CSWGetRecordById", paste(allowedElementSetNames, collapse=","))) } self$ElementSetName = elementSetName - super$initialize(op, "POST", url, request = private$xmlElement, + super$initialize(capabilities, op, "POST", url, request = private$xmlElement, user = user, pwd = pwd, token = token, headers = headers, contentType = "text/xml", mimeType = "text/xml", logger = logger, ...) diff --git a/R/CSWGetRecords.R b/R/CSWGetRecords.R index 8729e76..53cc4b6 100644 --- a/R/CSWGetRecords.R +++ b/R/CSWGetRecords.R @@ -37,7 +37,7 @@ CSWGetRecords <- R6Class("CSWGetRecords", initialize = function(capabilities, op, url, serviceVersion = "2.0.2", user = NULL, pwd = NULL, token = NULL, headers = list(), query = NULL, logger = NULL, ...) { - super$initialize(op, "POST", url, request = private$xmlElement, + super$initialize(capabilities, op, "POST", url, request = private$xmlElement, user = user, pwd = pwd, token = token, headers = headers, contentType = "text/xml", mimeType = "text/xml", logger = logger, ...) diff --git a/R/CSWHarvest.R b/R/CSWHarvest.R index 28add43..4aaf511 100644 --- a/R/CSWHarvest.R +++ b/R/CSWHarvest.R @@ -37,7 +37,7 @@ CSWHarvest <- R6Class("CSWHarvest", resourceType = "http://www.isotc211.org/schemas/2005/gmd/", resourceFormat = "application/xml", logger = NULL, ...) { - super$initialize(op, "POST", url, request = private$xmlElement, + super$initialize(capabilities, op, "POST", url, request = private$xmlElement, user = user, pwd = pwd, token = token, headers = headers, contentType = "text/xml", mimeType = "text/xml", logger = logger, ...) diff --git a/R/CSWTransaction.R b/R/CSWTransaction.R index 9a57773..eef2941 100644 --- a/R/CSWTransaction.R +++ b/R/CSWTransaction.R @@ -39,7 +39,7 @@ CSWTransaction <- R6Class("CSWTransaction", recordProperty = recordProperty, constraint = constraint ) - super$initialize(op, "POST", url, request = private$xmlElement, + super$initialize(capabilities, op, "POST", url, request = private$xmlElement, user = user, pwd = pwd, token = token, headers = headers, contentType = "text/xml", mimeType = "text/xml", logger = logger, ...) diff --git a/R/WFSDescribeFeatureType.R b/R/WFSDescribeFeatureType.R index b8b5b7d..b7a1f53 100644 --- a/R/WFSDescribeFeatureType.R +++ b/R/WFSDescribeFeatureType.R @@ -25,7 +25,7 @@ WFSDescribeFeatureType <- R6Class("WFSDescribeFeatureType", public = list( initialize = function(capabilities, op, url, version, typeName, logger = NULL, ...) { namedParams <- list(service = "WFS", version = version, typeName = typeName) - super$initialize(op, "GET", url, request = private$name, + super$initialize(capabilities, op, "GET", url, request = private$name, namedParams = namedParams, mimeType = "text/xml", logger = logger, ...) self$execute() diff --git a/R/WFSGetFeature.R b/R/WFSGetFeature.R index 19496f7..da949c7 100644 --- a/R/WFSGetFeature.R +++ b/R/WFSGetFeature.R @@ -61,7 +61,7 @@ WFSGetFeature <- R6Class("WFSGetFeature", if(length(vendorParams)>0) namedParams <- c(namedParams, vendorParams) namedParams <- namedParams[!sapply(namedParams, is.null)] - super$initialize(op, "GET", url, request = private$name, + super$initialize(capabilities, op, "GET", url, request = private$name, namedParams = namedParams, mimeType = mimeType, logger = logger) self$execute() } diff --git a/R/WMSGetFeatureInfo.R b/R/WMSGetFeatureInfo.R index b9ec87d..ec8fa33 100644 --- a/R/WMSGetFeatureInfo.R +++ b/R/WMSGetFeatureInfo.R @@ -63,7 +63,7 @@ WMSGetFeatureInfo <- R6Class("WMSGetFeatureInfo", vendorParams <- list(...) if(length(vendorParams)>0) namedParams <- c(namedParams, vendorParams) namedParams <- namedParams[!sapply(namedParams, is.null)] - super$initialize(op, "GET", url, request = private$name, + super$initialize(capabilities, op, "GET", url, request = private$name, namedParams = namedParams, mimeType = mimeType, logger = logger) self$execute()