Merge pull request #367 from inspire-eu-validation/issue-161

Add support for new schemaLocation links on MD 1.3 Corresponding community issue: #161
inspire-eu-validation · Nov 21, 2019 · 745eed6 · 745eed6
2 parents 75242b2 + ad20caa
commit 745eed6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/metadata/1.3/xml/ets-md-xml-bsxets.xml b/metadata/1.3/xml/ets-md-xml-bsxets.xml
@@ -100,8 +100,9 @@ let $messages :=
         return 
             if ($file/element()/@xsi:schemaLocation) then 
                 let $result :=
-                    if ( contains($file/element()/@xsi:schemaLocation, 'http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/gmd/gmd.xsd') or contains($file/element()/@xsi:schemaLocation, 'http://www.isotc211.org/2005/gmd/gmd.xsd')) then
-                        try{ validate:xsd($file, 'https://inspire.ec.europa.eu/draft-schemas/inspire-md-schemas-temp/apiso-inspire/apiso-inspire.xsd') } catch * {  $err:description }
+                    if (contains($file/element()/@xsi:schemaLocation, 'http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/gmd/gmd.xsd') or contains($file/element()/@xsi:schemaLocation, 'http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd') or contains($file/element()/@xsi:schemaLocation, 'http://www.isotc211.org/2005/gmd/gmd.xsd') or contains($file/element()/@xsi:schemaLocation, 'http://schemas.opengis.net/csw/2.0.2/profiles/apiso/1.0.0/apiso.xsd')) then
+                        try{ 
+							validate:xsd($file, 'https://inspire.ec.europa.eu/draft-schemas/inspire-md-schemas-temp/apiso-inspire/apiso-inspire.xsd') } catch * {  $err:description }
                     else
                         try{ validate:xsd($file) } catch * {  $err:description }
                 return
@@ -112,7 +113,7 @@ let $messages :=
                 for $record in $records
                 let $rid := $record/gmd:fileIdentifier/*/text()
                 let $result := 
-                    if ( contains($record/element()/@xsi:schemaLocation, 'http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/gmd/gmd.xsd') or contains($record/element()/@xsi:schemaLocation, 'http://www.isotc211.org/2005/gmd/gmd.xsd')) then
+                    if ( contains($file/element()/@xsi:schemaLocation, 'http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/gmd/gmd.xsd') or contains($file/element()/@xsi:schemaLocation, 'http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd') or contains($file/element()/@xsi:schemaLocation, 'http://www.isotc211.org/2005/gmd/gmd.xsd') or contains($file/element()/@xsi:schemaLocation, 'http://schemas.opengis.net/csw/2.0.2/profiles/apiso/1.0.0/apiso.xsd')) then
                         try{ validate:xsd($record, 'https://inspire.ec.europa.eu/draft-schemas/inspire-md-schemas-temp/apiso-inspire/apiso-inspire.xsd') } catch * {  $err:description }
                     else
                         try{ validate:xsd($record) } catch * {  $err:description }