data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
Holger Knublauch
9c258c38 1 parent a63b3608

Rig checking now case insensitive

Inline Side-by-side
Showing 1 changed file with 36 additions and 31 deletions
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
15 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 15 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
16 @prefix rhspin: <http://www.reportinghub.no/spin/rh#> . 16 @prefix rhspin: <http://www.reportinghub.no/spin/rh#> .
17 @prefix sp: <http://spinrdf.org/sp#> . 17 @prefix sp: <http://spinrdf.org/sp#> .
18 +@prefix spif: <http://spinrdf.org/spif#> .
18 @prefix spin: <http://spinrdf.org/spin#> . 19 @prefix spin: <http://spinrdf.org/spin#> .
19 @prefix spl: <http://spinrdf.org/spl#> . 20 @prefix spl: <http://spinrdf.org/spl#> .
20 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 21 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
...@@ -93,9 +94,13 @@ ddr:Cs_drillReportWellboreInfo ...@@ -93,9 +94,13 @@ ddr:Cs_drillReportWellboreInfo
93 ] [ rdf:type sp:Filter ; 94 ] [ rdf:type sp:Filter ;
94 sp:expression 95 sp:expression
95 [ rdf:type sp:ne ; 96 [ rdf:type sp:ne ;
96 - sp:arg1 [ sp:varName "npdName"^^xsd:string 97 + sp:arg1 [ rdf:type spif:lowerCase ;
98 + sp:arg1 [ sp:varName "npdName"^^xsd:string
99 + ]
97 ] ; 100 ] ;
98 - sp:arg2 [ sp:varName "name"^^xsd:string 101 + sp:arg2 [ rdf:type spif:lowerCase ;
102 + sp:arg1 [ sp:varName "name"^^xsd:string
103 + ]
99 ] 104 ]
100 ] 105 ]
101 ] [ rdf:type sp:Bind ; 106 ] [ rdf:type sp:Bind ;
...@@ -140,11 +145,6 @@ ddr:Obj_drillReport ...@@ -140,11 +145,6 @@ ddr:Obj_drillReport
140 ] ; 145 ] ;
141 sp:predicate <http://www.reportinghub.no/ep/spin/lib#nameWellbore> ; 146 sp:predicate <http://www.reportinghub.no/ep/spin/lib#nameWellbore> ;
142 sp:subject spin:_this 147 sp:subject spin:_this
143 - ] [ sp:object
144 - [ sp:varName "wellBoreNumber"^^xsd:string
145 - ] ;
146 - sp:predicate <http://www.reportinghub.no/ep/spin/lib#numberWellbore> ;
147 - sp:subject spin:_this
148 ] [ rdf:type sp:Bind ; 148 ] [ rdf:type sp:Bind ;
149 sp:expression 149 sp:expression
150 [ rdf:type rhspin:wellBoreByName ; 150 [ rdf:type rhspin:wellBoreByName ;
...@@ -155,31 +155,19 @@ ddr:Obj_drillReport ...@@ -155,31 +155,19 @@ ddr:Obj_drillReport
155 sp:variable 155 sp:variable
156 [ sp:varName "wellBore"^^xsd:string 156 [ sp:varName "wellBore"^^xsd:string
157 ] 157 ]
158 - ] [ rdf:type sp:Bind ;
159 - sp:expression
160 - [ rdf:type rhspin:wellBoreById ;
161 - arg:id [ sp:varName "wellBoreNumber"^^xsd:string
162 - ]
163 - ] ;
164 - sp:variable
165 - [ sp:varName "wellBore2"^^xsd:string
166 - ]
167 ] [ rdf:type sp:Filter ; 158 ] [ rdf:type sp:Filter ;
168 sp:expression 159 sp:expression
169 - [ rdf:type sp:ne ; 160 + [ rdf:type sp:not ;
170 - sp:arg1 [ sp:varName "wellBore"^^xsd:string 161 + sp:arg1 [ rdf:type sp:bound ;
171 - ] ; 162 + sp:arg1 [ sp:varName "wellBore"^^xsd:string
172 - sp:arg2 [ sp:varName "wellBore2"^^xsd:string 163 + ]
173 ] 164 ]
174 ] 165 ]
175 ] [ rdf:type sp:Bind ; 166 ] [ rdf:type sp:Bind ;
176 sp:expression 167 sp:expression
177 [ rdf:type fn:concat ; 168 [ rdf:type fn:concat ;
178 - sp:arg1 "Well bore number " ; 169 + sp:arg1 "Unregistered well bore name " ;
179 - sp:arg2 [ sp:varName "wellBoreNumber"^^xsd:string 170 + sp:arg2 [ sp:varName "wellBoreName"^^xsd:string
180 - ] ;
181 - sp:arg3 "mismatches well bore name " ;
182 - sp:arg4 [ sp:varName "wellBoreName"^^xsd:string
183 ] 171 ]
184 ] ; 172 ] ;
185 sp:variable 173 sp:variable
...@@ -229,6 +217,11 @@ ddr:Obj_drillReport ...@@ -229,6 +217,11 @@ ddr:Obj_drillReport
229 ] ; 217 ] ;
230 sp:predicate <http://www.reportinghub.no/ep/spin/lib#nameWellbore> ; 218 sp:predicate <http://www.reportinghub.no/ep/spin/lib#nameWellbore> ;
231 sp:subject spin:_this 219 sp:subject spin:_this
220 + ] [ sp:object
221 + [ sp:varName "wellBoreNumber"^^xsd:string
222 + ] ;
223 + sp:predicate <http://www.reportinghub.no/ep/spin/lib#numberWellbore> ;
224 + sp:subject spin:_this
232 ] [ rdf:type sp:Bind ; 225 ] [ rdf:type sp:Bind ;
233 sp:expression 226 sp:expression
234 [ rdf:type rhspin:wellBoreByName ; 227 [ rdf:type rhspin:wellBoreByName ;
...@@ -239,19 +232,31 @@ ddr:Obj_drillReport ...@@ -239,19 +232,31 @@ ddr:Obj_drillReport
239 sp:variable 232 sp:variable
240 [ sp:varName "wellBore"^^xsd:string 233 [ sp:varName "wellBore"^^xsd:string
241 ] 234 ]
235 + ] [ rdf:type sp:Bind ;
236 + sp:expression
237 + [ rdf:type rhspin:wellBoreById ;
238 + arg:id [ sp:varName "wellBoreNumber"^^xsd:string
239 + ]
240 + ] ;
241 + sp:variable
242 + [ sp:varName "wellBore2"^^xsd:string
243 + ]
242 ] [ rdf:type sp:Filter ; 244 ] [ rdf:type sp:Filter ;
243 sp:expression 245 sp:expression
244 - [ rdf:type sp:not ; 246 + [ rdf:type sp:ne ;
245 - sp:arg1 [ rdf:type sp:bound ; 247 + sp:arg1 [ sp:varName "wellBore"^^xsd:string
246 - sp:arg1 [ sp:varName "wellBore"^^xsd:string 248 + ] ;
247 - ] 249 + sp:arg2 [ sp:varName "wellBore2"^^xsd:string
248 ] 250 ]
249 ] 251 ]
250 ] [ rdf:type sp:Bind ; 252 ] [ rdf:type sp:Bind ;
251 sp:expression 253 sp:expression
252 [ rdf:type fn:concat ; 254 [ rdf:type fn:concat ;
253 - sp:arg1 "Unregistered well bore name " ; 255 + sp:arg1 "Well bore number " ;
254 - sp:arg2 [ sp:varName "wellBoreName"^^xsd:string 256 + sp:arg2 [ sp:varName "wellBoreNumber"^^xsd:string
257 + ] ;
258 + sp:arg3 "mismatches well bore name " ;
259 + sp:arg4 [ sp:varName "wellBoreName"^^xsd:string
255 ] 260 ]
256 ] ; 261 ] ;
257 sp:variable 262 sp:variable
......