Changeset 7106

Timestamp:

01/10/17 09:26:33 (7 years ago)

Author:

Twan Goosen

Message:

Updated patterns for component registry locations for CMDI 1.1 and CMDI 1.2
in best practices schematron

File:

• CMDIValidator/trunk/cmdi-validator-core/src/main/resources/default.sch (modified) (2 diffs)

CMDIValidator/trunk/cmdi-validator-core/src/main/resources/default.sch

@@ -42 +42 @@
         <title>Test xsi:schemaLocation</title>
         <rule role="warning" context="/cmd11:CMD">
-            <assert test="contains(@xsi:schemaLocation,'http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/profiles/')">
-                [CMDI Best Practice] /cmd:CMD/@xsi:schemaLocation doesn't refer to a schema from the Component Registry! [Actual value was [<value-of select="@xsi:schemaLocation"/>]
+            <assert test="matches(@xsi:schemaLocation,'.*http(s?)://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/(1\.1/)?profiles/.*')">
+                [CMDI Best Practice] /cmd:CMD/@xsi:schemaLocation doesn't refer to a schema from the Component Registry or there is a version mismatch! [Actual value was [<value-of select="@xsi:schemaLocation"/>]
             </assert>
         </rule>
@@ -50 +50 @@
         <title>Test xsi:schemaLocation</title>
         <rule role="warning" context="/cmd12:CMD">
-            <assert test="contains(@xsi:schemaLocation,'http://alpha-vlo.clarin.eu/component-registry-rest/rest/registry/1.x/profiles/')">
-                [CMDI Best Practice] /cmd:CMD/@xsi:schemaLocation doesn't refer to a schema from the Component Registry! [Actual value was [<value-of select="@xsi:schemaLocation"/>]
+            <assert test="matches(@xsi:schemaLocation,'.*http(s?)://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/1\.[x23456789]/profiles/.*')">
+                [CMDI Best Practice] /cmd:CMD/@xsi:schemaLocation doesn't refer to a schema from the Component Registry or there is a version mismatch! [Actual value was [<value-of select="@xsi:schemaLocation"/>]
             </assert>
         </rule>