Calls of ddr:nameWellbore replaced with ep-spin-lib:nameWellbore
Showing
42 changed files
with
48 additions
and
67 deletions
... | @@ -7,7 +7,7 @@ | ... | @@ -7,7 +7,7 @@ |
7 | 7 | ||
8 | @prefix : <http://www.reportinghub.no/ep/spin/ddr-constraints#> . | 8 | @prefix : <http://www.reportinghub.no/ep/spin/ddr-constraints#> . |
9 | @prefix arg: <http://spinrdf.org/arg#> . | 9 | @prefix arg: <http://spinrdf.org/arg#> . |
10 | -@prefix ddr: <http://www.reportinghub.no/ep/schema/ddr#> . | 10 | +@prefix ddr: <http://www.witsml.org/schemas/1series#> . |
11 | @prefix fn: <http://www.w3.org/2005/xpath-functions#> . | 11 | @prefix fn: <http://www.w3.org/2005/xpath-functions#> . |
12 | @prefix normalization: <http://www.reportinghub.no/ep/transform/1.1/normalization#> . | 12 | @prefix normalization: <http://www.reportinghub.no/ep/transform/1.1/normalization#> . |
13 | @prefix owl: <http://www.w3.org/2002/07/owl#> . | 13 | @prefix owl: <http://www.w3.org/2002/07/owl#> . |
... | @@ -17,7 +17,6 @@ | ... | @@ -17,7 +17,6 @@ |
17 | @prefix sp: <http://spinrdf.org/sp#> . | 17 | @prefix sp: <http://spinrdf.org/sp#> . |
18 | @prefix spin: <http://spinrdf.org/spin#> . | 18 | @prefix spin: <http://spinrdf.org/spin#> . |
19 | @prefix spl: <http://spinrdf.org/spl#> . | 19 | @prefix spl: <http://spinrdf.org/spl#> . |
20 | -@prefix witsml: <http://www.witsml.org/schemas/1series#> . | ||
21 | @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . | 20 | @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . |
22 | 21 | ||
23 | <http://www.reportinghub.no/ep/spin/ddr-constraints> | 22 | <http://www.reportinghub.no/ep/spin/ddr-constraints> |
... | @@ -26,27 +25,7 @@ | ... | @@ -26,27 +25,7 @@ |
26 | owl:imports <http://spinrdf.org/spin> , <http://topbraid.org/sxml> , <http://www.reportinghub.no/np/schema/1.0/npd> , <http://www.reportinghub.no/spin/rh> , <http://www.witsml.org/schemas/1series> ; | 25 | owl:imports <http://spinrdf.org/spin> , <http://topbraid.org/sxml> , <http://www.reportinghub.no/np/schema/1.0/npd> , <http://www.reportinghub.no/spin/rh> , <http://www.witsml.org/schemas/1series> ; |
27 | owl:versionInfo "0.2.0"^^xsd:string . | 26 | owl:versionInfo "0.2.0"^^xsd:string . |
28 | 27 | ||
29 | -witsml:Obj_drillReport | 28 | +ddr:Obj_drillReport |
30 | - spin:constraint | ||
31 | - [ rdf:type sp:Ask ; | ||
32 | - rdfs:comment "DDRs can only be submitted if a user is logged in"^^xsd:string ; | ||
33 | - sp:where ([ rdf:type sp:Bind ; | ||
34 | - sp:expression | ||
35 | - [ rdf:type rhspin:companyName | ||
36 | - ] ; | ||
37 | - sp:variable | ||
38 | - [ sp:varName "companyName"^^xsd:string | ||
39 | - ] | ||
40 | - ] [ rdf:type sp:Filter ; | ||
41 | - sp:expression | ||
42 | - [ rdf:type sp:not ; | ||
43 | - sp:arg1 [ rdf:type sp:bound ; | ||
44 | - sp:arg1 [ sp:varName "companyName"^^xsd:string | ||
45 | - ] | ||
46 | - ] | ||
47 | - ] | ||
48 | - ]) | ||
49 | - ] ; | ||
50 | spin:constraint | 29 | spin:constraint |
51 | [ rdf:type sp:Construct ; | 30 | [ rdf:type sp:Construct ; |
52 | sp:templates ([ sp:object spin:ConstraintViolation ; | 31 | sp:templates ([ sp:object spin:ConstraintViolation ; |
... | @@ -55,7 +34,7 @@ witsml:Obj_drillReport | ... | @@ -55,7 +34,7 @@ witsml:Obj_drillReport |
55 | ] [ sp:object spin:_this ; | 34 | ] [ sp:object spin:_this ; |
56 | sp:predicate spin:violationRoot ; | 35 | sp:predicate spin:violationRoot ; |
57 | sp:subject _:b1 | 36 | sp:subject _:b1 |
58 | - ] [ sp:object witsml:nameWell ; | 37 | + ] [ sp:object ddr:nameWellbore ; |
59 | sp:predicate spin:violationPath ; | 38 | sp:predicate spin:violationPath ; |
60 | sp:subject _:b1 | 39 | sp:subject _:b1 |
61 | ] [ sp:object | 40 | ] [ sp:object |
... | @@ -65,35 +44,33 @@ witsml:Obj_drillReport | ... | @@ -65,35 +44,33 @@ witsml:Obj_drillReport |
65 | sp:subject _:b1 | 44 | sp:subject _:b1 |
66 | ]) ; | 45 | ]) ; |
67 | sp:where ([ sp:object | 46 | sp:where ([ sp:object |
68 | - [ sp:varName "wellName"^^xsd:string | 47 | + [ sp:varName "wellBoreName"^^xsd:string |
69 | ] ; | 48 | ] ; |
70 | - sp:predicate witsml:nameWell ; | 49 | + sp:predicate <http://www.reportinghub.no/ep/spin/lib#nameWellbore> ; |
71 | sp:subject spin:_this | 50 | sp:subject spin:_this |
72 | ] [ rdf:type sp:Bind ; | 51 | ] [ rdf:type sp:Bind ; |
73 | sp:expression | 52 | sp:expression |
74 | - [ rdf:type rhspin:wellByName ; | 53 | + [ rdf:type rhspin:wellBoreByName ; |
75 | - arg:wellName | 54 | + arg:wellBoreName |
76 | - [ sp:varName "wellName"^^xsd:string | 55 | + [ sp:varName "wellBoreName"^^xsd:string |
77 | ] | 56 | ] |
78 | ] ; | 57 | ] ; |
79 | sp:variable | 58 | sp:variable |
80 | - [ sp:varName "well"^^xsd:string | 59 | + [ sp:varName "wellBore"^^xsd:string |
81 | ] | 60 | ] |
82 | ] [ rdf:type sp:Filter ; | 61 | ] [ rdf:type sp:Filter ; |
83 | sp:expression | 62 | sp:expression |
84 | [ rdf:type sp:not ; | 63 | [ rdf:type sp:not ; |
85 | - sp:arg1 [ rdf:type rhspin:npdTripleExists ; | 64 | + sp:arg1 [ rdf:type sp:bound ; |
86 | - sp:arg1 [ sp:varName "well"^^xsd:string | 65 | + sp:arg1 [ sp:varName "wellBore"^^xsd:string |
87 | - ] ; | 66 | + ] |
88 | - sp:arg2 rdf:type ; | ||
89 | - sp:arg3 <http://www.reportinghub.no/ep/schema/well#Well> | ||
90 | ] | 67 | ] |
91 | ] | 68 | ] |
92 | ] [ rdf:type sp:Bind ; | 69 | ] [ rdf:type sp:Bind ; |
93 | sp:expression | 70 | sp:expression |
94 | [ rdf:type fn:concat ; | 71 | [ rdf:type fn:concat ; |
95 | - sp:arg1 "Unregistered well name " ; | 72 | + sp:arg1 "Unregistered well bore name " ; |
96 | - sp:arg2 [ sp:varName "wellName"^^xsd:string | 73 | + sp:arg2 [ sp:varName "wellBoreName"^^xsd:string |
97 | ] | 74 | ] |
98 | ] ; | 75 | ] ; |
99 | sp:variable | 76 | sp:variable |
... | @@ -102,6 +79,26 @@ witsml:Obj_drillReport | ... | @@ -102,6 +79,26 @@ witsml:Obj_drillReport |
102 | ]) | 79 | ]) |
103 | ] ; | 80 | ] ; |
104 | spin:constraint | 81 | spin:constraint |
82 | + [ rdf:type sp:Ask ; | ||
83 | + rdfs:comment "DDRs can only be submitted if a user is logged in"^^xsd:string ; | ||
84 | + sp:where ([ rdf:type sp:Bind ; | ||
85 | + sp:expression | ||
86 | + [ rdf:type rhspin:companyName | ||
87 | + ] ; | ||
88 | + sp:variable | ||
89 | + [ sp:varName "companyName"^^xsd:string | ||
90 | + ] | ||
91 | + ] [ rdf:type sp:Filter ; | ||
92 | + sp:expression | ||
93 | + [ rdf:type sp:not ; | ||
94 | + sp:arg1 [ rdf:type sp:bound ; | ||
95 | + sp:arg1 [ sp:varName "companyName"^^xsd:string | ||
96 | + ] | ||
97 | + ] | ||
98 | + ] | ||
99 | + ]) | ||
100 | + ] ; | ||
101 | + spin:constraint | ||
105 | [ rdf:type sp:Construct ; | 102 | [ rdf:type sp:Construct ; |
106 | sp:templates ([ sp:object spin:ConstraintViolation ; | 103 | sp:templates ([ sp:object spin:ConstraintViolation ; |
107 | sp:predicate rdf:type ; | 104 | sp:predicate rdf:type ; |
... | @@ -109,7 +106,7 @@ witsml:Obj_drillReport | ... | @@ -109,7 +106,7 @@ witsml:Obj_drillReport |
109 | ] [ sp:object spin:_this ; | 106 | ] [ sp:object spin:_this ; |
110 | sp:predicate spin:violationRoot ; | 107 | sp:predicate spin:violationRoot ; |
111 | sp:subject _:b2 | 108 | sp:subject _:b2 |
112 | - ] [ sp:object witsml:nameWellbore ; | 109 | + ] [ sp:object ddr:nameWell ; |
113 | sp:predicate spin:violationPath ; | 110 | sp:predicate spin:violationPath ; |
114 | sp:subject _:b2 | 111 | sp:subject _:b2 |
115 | ] [ sp:object | 112 | ] [ sp:object |
... | @@ -119,33 +116,35 @@ witsml:Obj_drillReport | ... | @@ -119,33 +116,35 @@ witsml:Obj_drillReport |
119 | sp:subject _:b2 | 116 | sp:subject _:b2 |
120 | ]) ; | 117 | ]) ; |
121 | sp:where ([ sp:object | 118 | sp:where ([ sp:object |
122 | - [ sp:varName "wellBoreName"^^xsd:string | 119 | + [ sp:varName "wellName"^^xsd:string |
123 | ] ; | 120 | ] ; |
124 | - sp:predicate witsml:nameWellbore ; | 121 | + sp:predicate ddr:nameWell ; |
125 | sp:subject spin:_this | 122 | sp:subject spin:_this |
126 | ] [ rdf:type sp:Bind ; | 123 | ] [ rdf:type sp:Bind ; |
127 | sp:expression | 124 | sp:expression |
128 | - [ rdf:type rhspin:wellBoreByName ; | 125 | + [ rdf:type rhspin:wellByName ; |
129 | - arg:wellBoreName | 126 | + arg:wellName |
130 | - [ sp:varName "wellBoreName"^^xsd:string | 127 | + [ sp:varName "wellName"^^xsd:string |
131 | ] | 128 | ] |
132 | ] ; | 129 | ] ; |
133 | sp:variable | 130 | sp:variable |
134 | - [ sp:varName "wellBore"^^xsd:string | 131 | + [ sp:varName "well"^^xsd:string |
135 | ] | 132 | ] |
136 | ] [ rdf:type sp:Filter ; | 133 | ] [ rdf:type sp:Filter ; |
137 | sp:expression | 134 | sp:expression |
138 | [ rdf:type sp:not ; | 135 | [ rdf:type sp:not ; |
139 | - sp:arg1 [ rdf:type sp:bound ; | 136 | + sp:arg1 [ rdf:type rhspin:npdTripleExists ; |
140 | - sp:arg1 [ sp:varName "wellBore"^^xsd:string | 137 | + sp:arg1 [ sp:varName "well"^^xsd:string |
141 | - ] | 138 | + ] ; |
139 | + sp:arg2 rdf:type ; | ||
140 | + sp:arg3 <http://www.reportinghub.no/ep/schema/well#Well> | ||
142 | ] | 141 | ] |
143 | ] | 142 | ] |
144 | ] [ rdf:type sp:Bind ; | 143 | ] [ rdf:type sp:Bind ; |
145 | sp:expression | 144 | sp:expression |
146 | [ rdf:type fn:concat ; | 145 | [ rdf:type fn:concat ; |
147 | - sp:arg1 "Unregistered well bore name " ; | 146 | + sp:arg1 "Unregistered well name " ; |
148 | - sp:arg2 [ sp:varName "wellBoreName"^^xsd:string | 147 | + sp:arg2 [ sp:varName "wellName"^^xsd:string |
149 | ] | 148 | ] |
150 | ] ; | 149 | ] ; |
151 | sp:variable | 150 | sp:variable | ... | ... |
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
-
Please register or login to post a comment