#181 support M1 - fix conflits between ISO 19115-3/19139 loaded schemas

R/ISOAbstractObject.R

@@ -1083,7 +1083,7 @@ ISOAbstractObject <- R6Class("ISOAbstractObject",
       }
 
       #proceed with schema xml schema validation
-      xsd <- getISOMetadataSchemas()
+      xsd <- getISOMetadataSchemas(version = getMetadataStandard())
       if(is(xml, "XMLInternalNode")) xml <- xmlDoc(xml)
       report <- xmlSchemaValidate(xsd, xml)
 

R/ISOMetadataNamespace.R

@@ -149,6 +149,11 @@ setISOMetadataNamespaces <- function(version = "19139"){
         id = "fcc", uri = "https://standards.iso.org/iso/19110/fcc/1.0",
         standard = data.frame(specification = "ISO/TS 19115-3:2023", schema = "ISO/TS 19139:2007", title = "Feature Catalog Common (FCC) Version: 1.0", stringsAsFactors = FALSE)
       ),
+      #GFC
+      ISOMetadataNamespace$new(
+        id = "gfc", uri = "https://standards.iso.org/iso/19110/gfc/1.1",
+        standard = data.frame(specification = "ISO/TS 19115-3:2023", schema = "ISO/TS 19139:2007", title = "General Feature Catalog (GFC) Version: 1.1", stringsAsFactors = FALSE)
+      ),
       #ISO 19115-3
       #----------------------------------------------------
       #CAT

R/ISOMetadataSchemas.R

@@ -5,23 +5,28 @@
 #' @description \code{registerISOMetadataSchema} allows to register a new schema
 #' in \pkg{geometa}
 #' 
-#' @usage registerISOMetadataSchema(xsdFile)
+#' @usage registerISOMetadataSchema(version, xsdFile)
 #' 
+#' @param version the schema version
 #' @param xsdFile the schema XSD file
 #' 
 #' @examples             
 #'   registerISOMetadataSchema(xsdFile = "http://www.isotc211.org/2005/gmd/gmd.xsd")
 #' 
 #' @author Emmanuel Blondel, \email{emmanuel.blondel1@@gmail.com}
 #
-registerISOMetadataSchema <- function(xsdFile){
+registerISOMetadataSchema <- function(version, xsdFile){
   schemas <- tryCatch(
     XML::xmlParse(
       xsdFile, isSchema = TRUE, xinclude = TRUE,
-      error = function (msg, code, domain, line, col, level, filename, class = "XMLError"){}
+      error = function (msg, code, domain, line, col, level, filename, class = "XMLError"){
+        print("=>")
+        print(filename)
+        print(msg)
+      }
     )
   )
-  .geometa.iso$schemas <- schemas
+  .geometa.iso$schemas[[version]] <- schemas
 }
 
 #'getISOMetadataSchemaFile
@@ -50,7 +55,7 @@ getISOMetadataSchemaFile <- function(version = "19139"){
 #'@export
 setISOMetadataSchemas <- function(version = "19139"){
   packageStartupMessage(sprintf("Loading ISO %s XML schemas...", version))
-  registerISOMetadataSchema(getISOMetadataSchemaFile(version = version))
+  registerISOMetadataSchema(version = version, getISOMetadataSchemaFile(version = version))
 }
 
 #' @name getISOMetadataSchemas
@@ -59,15 +64,21 @@ setISOMetadataSchemas <- function(version = "19139"){
 #' @export
 #' @description \code{getISOMetadataSchemas} gets the schemas registered in \pkg{geometa}
 #' 
-#' @usage getISOMetadataSchemas()
+#' @usage getISOMetadataSchemas(version)
 #' 
 #' @examples             
-#'   getISOMetadataSchemas()
+#'   getISOMetadataSchemas(version = "19115-3")
 #' 
 #' @author Emmanuel Blondel, \email{emmanuel.blondel1@@gmail.com}
 #
-getISOMetadataSchemas <- function(){
-  return(.geometa.iso$schemas)
+getISOMetadataSchemas <- function(version = "19139"){
+  available_versions <- c("19139","19115-3")
+  if(!version %in% available_versions){
+    errMsg <- sprintf("Version '%s' not among available schema versions (%s)",
+                      version, paste0(available_versions, collapse = ","))
+    stop(errMsg)
+  }
+  return(.geometa.iso$schemas[[version]])
 }