From ecd996012c367a3fb6ff0824b325ad2790da62a4 Mon Sep 17 00:00:00 2001 From: eblondel Date: Sat, 28 Jul 2018 23:17:29 +0200 Subject: [PATCH] #3 fix broken CSWClient 2.0.2 --- R/CSWConstraint.R | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/R/CSWConstraint.R b/R/CSWConstraint.R index 00f792e..5849198 100644 --- a/R/CSWConstraint.R +++ b/R/CSWConstraint.R @@ -31,7 +31,7 @@ CSWConstraint <- R6Class("CSWConstraint", stop("The argument 'filter' should be an object of class 'OGCFilter'") } self$CqlText = cqlText - if(!is.null(filter)) filter$setFilterVersion("2.0") + if(!is.null(filter) && serviceVersion=="3.0.0") filter$setFilterVersion("2.0") self$filter = filter }, @@ -40,6 +40,13 @@ CSWConstraint <- R6Class("CSWConstraint", nsVersion <- ifelse(serviceVersion=="3.0.0", "3.0", serviceVersion) private$xmlNamespace = paste(private$xmlNamespaceBase, nsVersion, sep="/") names(private$xmlNamespace) <- ifelse(serviceVersion=="3.0.0", "csw30", "csw") + if(!is.null(self$filter)){ + if(serviceVersion=="3.0.0"){ + self$filter$setFilterVersion("2.0") + }else{ + self$filter$setFilterVersion("1.1.0") + } + } } )