Showing
1 changed file
with
6 additions
and
6 deletions
... | @@ -89,11 +89,6 @@ arg:kindRef | ... | @@ -89,11 +89,6 @@ arg:kindRef |
89 | ] ; | 89 | ] ; |
90 | spin:constraint | 90 | spin:constraint |
91 | [ rdf:type mpr-proxy-constraints:CheckId ; | 91 | [ rdf:type mpr-proxy-constraints:CheckId ; |
92 | - arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_field> ; | ||
93 | - arg:type <http://www.reportinghub.no/ep/schema/facility#Field> | ||
94 | - ] ; | ||
95 | - spin:constraint | ||
96 | - [ rdf:type mpr-proxy-constraints:CheckId ; | ||
97 | arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_platform> ; | 92 | arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_platform> ; |
98 | arg:type <http://www.reportinghub.no/ep/schema/facility#Platform> | 93 | arg:type <http://www.reportinghub.no/ep/schema/facility#Platform> |
99 | ] ; | 94 | ] ; |
... | @@ -109,6 +104,11 @@ arg:kindRef | ... | @@ -109,6 +104,11 @@ arg:kindRef |
109 | ] ; | 104 | ] ; |
110 | spin:constraint | 105 | spin:constraint |
111 | [ rdf:type mpr-proxy-constraints:CheckName ; | 106 | [ rdf:type mpr-proxy-constraints:CheckName ; |
107 | + arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_field> ; | ||
108 | + arg:type <http://www.reportinghub.no/ep/schema/facility#Field> | ||
109 | + ] ; | ||
110 | + spin:constraint | ||
111 | + [ rdf:type mpr-proxy-constraints:CheckName ; | ||
112 | arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_platform> ; | 112 | arg:kindRef <http://www.epim.no/schemas/mprml/1#RF_platform> ; |
113 | arg:type <http://www.reportinghub.no/ep/schema/facility#Platform> | 113 | arg:type <http://www.reportinghub.no/ep/schema/facility#Platform> |
114 | ] ; | 114 | ] ; |
... | @@ -324,7 +324,7 @@ mpr-proxy-constraints:CheckIdAndNameMatch | ... | @@ -324,7 +324,7 @@ mpr-proxy-constraints:CheckIdAndNameMatch |
324 | ] | 324 | ] |
325 | ] [ rdf:type sp:Filter ; | 325 | ] [ rdf:type sp:Filter ; |
326 | sp:expression | 326 | sp:expression |
327 | - [ rdf:type sp:or ; | 327 | + [ rdf:type sp:and ; |
328 | sp:arg1 [ rdf:type sp:or ; | 328 | sp:arg1 [ rdf:type sp:or ; |
329 | sp:arg1 [ rdf:type sp:bound ; | 329 | sp:arg1 [ rdf:type sp:bound ; |
330 | sp:arg1 [ sp:varName "byId"^^xsd:string | 330 | sp:arg1 [ sp:varName "byId"^^xsd:string | ... | ... |
-
Please register or login to post a comment