data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
07cc3311 1 parent 73a662ed

Fixed dup due to ep-core:name and npd:name for some items.

Inline Side-by-side
Showing 2 changed files with 52 additions and 29 deletions
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
12 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 12 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
13 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 13 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
14 @prefix rhspin: <http://www.reportinghub.no/spin/rh#> . 14 @prefix rhspin: <http://www.reportinghub.no/spin/rh#> .
15 +@prefix smf: <http://topbraid.org/sparqlmotionfunctions#> .
15 @prefix sp: <http://spinrdf.org/sp#> . 16 @prefix sp: <http://spinrdf.org/sp#> .
16 @prefix spin: <http://spinrdf.org/spin#> . 17 @prefix spin: <http://spinrdf.org/spin#> .
17 @prefix spl: <http://spinrdf.org/spl#> . 18 @prefix spl: <http://spinrdf.org/spl#> .
...@@ -4175,17 +4176,39 @@ dpr-tables:ProductionVolumes ...@@ -4175,17 +4176,39 @@ dpr-tables:ProductionVolumes
4175 sp:subject 4176 sp:subject
4176 [ sp:varName "flowWhole"^^xsd:string 4177 [ sp:varName "flowWhole"^^xsd:string
4177 ] 4178 ]
4178 - ] [ rdf:type sp:TriplePath ; 4179 + ] [ rdf:type sp:Optional ;
4179 - sp:object 4180 + sp:elements ([ sp:object
4180 - [ sp:varName "flowInOutFacilityName"^^xsd:string 4181 + [ sp:varName "flowInOutFacilityNameNPD"^^xsd:string
4181 ] ; 4182 ] ;
4182 - sp:path [ rdf:type sp:AltPath ; 4183 + sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
4183 - sp:path1 <http://www.reportinghub.no/ep/schema/core#name> ; 4184 + sp:subject
4184 - sp:path2 <http://www.reportinghub.no/np/schema/npd#name> 4185 + [ sp:varName "flowInOutFacility"^^xsd:string
4186 + ]
4187 + ])
4188 + ] [ rdf:type sp:Optional ;
4189 + sp:elements ([ sp:object
4190 + [ sp:varName "flowInOutFacilityNameEP"^^xsd:string
4185 ] ; 4191 ] ;
4192 + sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
4186 sp:subject 4193 sp:subject
4187 [ sp:varName "flowInOutFacility"^^xsd:string 4194 [ sp:varName "flowInOutFacility"^^xsd:string
4188 ] 4195 ]
4196 + ])
4197 + ] [ rdf:type sp:Bind ;
4198 + sp:expression
4199 + [ rdf:type smf:if ;
4200 + sp:arg1 [ rdf:type smf:isBound ;
4201 + sp:arg1 [ sp:varName "flowInOutFacilityNameNPD"^^xsd:string
4202 + ]
4203 + ] ;
4204 + sp:arg2 [ sp:varName "flowInOutFacilityNameNPD"^^xsd:string
4205 + ] ;
4206 + sp:arg3 [ sp:varName "flowInOutFacilityNameEP"^^xsd:string
4207 + ]
4208 + ] ;
4209 + sp:variable
4210 + [ sp:varName "flowInOutFacilityName"^^xsd:string
4211 + ]
4189 ] [ sp:object 4212 ] [ sp:object
4190 [ sp:varName "flowPurpose"^^xsd:string 4213 [ sp:varName "flowPurpose"^^xsd:string
4191 ] ; 4214 ] ;
...@@ -4239,12 +4262,19 @@ dpr-tables:ProductionVolumes ...@@ -4239,12 +4262,19 @@ dpr-tables:ProductionVolumes
4239 sp:subject 4262 sp:subject
4240 [ sp:varName "flow"^^xsd:string 4263 [ sp:varName "flow"^^xsd:string
4241 ] 4264 ]
4242 - ] [ sp:object 4265 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Temperature> ;
4243 - [ sp:varName "density"^^xsd:string
4244 - ] ;
4245 sp:predicate rdf:type ; 4266 sp:predicate rdf:type ;
4246 sp:subject 4267 sp:subject
4247 - [ sp:varName "flow"^^xsd:string 4268 + [ sp:varName "temperature"^^xsd:string
4269 + ]
4270 + ] [ rdf:type sp:Bind ;
4271 + sp:expression
4272 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4273 + sp:arg1 [ sp:varName "temperature"^^xsd:string
4274 + ]
4275 + ] ;
4276 + sp:variable
4277 + [ sp:varName "temperatureValue"^^xsd:string
4248 ] 4278 ]
4249 ] [ sp:object 4279 ] [ sp:object
4250 [ sp:varName "pressure"^^xsd:string 4280 [ sp:varName "pressure"^^xsd:string
...@@ -4258,33 +4288,26 @@ dpr-tables:ProductionVolumes ...@@ -4258,33 +4288,26 @@ dpr-tables:ProductionVolumes
4258 sp:subject 4288 sp:subject
4259 [ sp:varName "pressure"^^xsd:string 4289 [ sp:varName "pressure"^^xsd:string
4260 ] 4290 ]
4261 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Density> ;
4262 - sp:predicate rdf:type ;
4263 - sp:subject
4264 - [ sp:varName "density"^^xsd:string
4265 - ]
4266 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Temperature> ;
4267 - sp:predicate rdf:type ;
4268 - sp:subject
4269 - [ sp:varName "temperature"^^xsd:string
4270 - ]
4271 ] [ rdf:type sp:Bind ; 4291 ] [ rdf:type sp:Bind ;
4272 sp:expression 4292 sp:expression
4273 [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ; 4293 [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
4274 - sp:arg1 [ sp:varName "temperature"^^xsd:string 4294 + sp:arg1 [ sp:varName "pressure"^^xsd:string
4275 ] 4295 ]
4276 ] ; 4296 ] ;
4277 sp:variable 4297 sp:variable
4278 - [ sp:varName "temperatureValue"^^xsd:string 4298 + [ sp:varName "pressureValue"^^xsd:string
4279 ] 4299 ]
4280 - ] [ rdf:type sp:Bind ; 4300 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Density> ;
4281 - sp:expression 4301 + sp:predicate rdf:type ;
4282 - [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ; 4302 + sp:subject
4283 - sp:arg1 [ sp:varName "pressure"^^xsd:string 4303 + [ sp:varName "density"^^xsd:string
4284 ] 4304 ]
4305 + ] [ sp:object
4306 + [ sp:varName "density"^^xsd:string
4285 ] ; 4307 ] ;
4286 - sp:variable 4308 + sp:predicate rdf:type ;
4287 - [ sp:varName "pressureValue"^^xsd:string 4309 + sp:subject
4310 + [ sp:varName "flow"^^xsd:string
4288 ] 4311 ]
4289 ] [ rdf:type sp:Bind ; 4312 ] [ rdf:type sp:Bind ;
4290 sp:expression 4313 sp:expression
......
...@@ -81,7 +81,7 @@ WHERE { ...@@ -81,7 +81,7 @@ WHERE {
81 81
82 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionVolumes" /> 82 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionVolumes" />
83 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductFlows" /> 83 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductFlows" />
84 - /> 84 +
85 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:InjectionVolumes" /> 85 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:InjectionVolumes" />
86 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductFlowsInjection" /> 86 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductFlowsInjection" />
87 87
......