David Price

product volumes table work

...@@ -144,8 +144,8 @@ dpr-tables:ProductVolumes ...@@ -144,8 +144,8 @@ dpr-tables:ProductVolumes
144 ] [ sp:varName "flowPurposeName"^^xsd:string 144 ] [ sp:varName "flowPurposeName"^^xsd:string
145 ] [ sp:varName "flowDefinitionName"^^xsd:string 145 ] [ sp:varName "flowDefinitionName"^^xsd:string
146 ] [ sp:varName "densityValue"^^xsd:string 146 ] [ sp:varName "densityValue"^^xsd:string
147 - ] [ sp:varName "temperatureValue"^^xsd:string
148 ] [ sp:varName "pressureValue"^^xsd:string 147 ] [ sp:varName "pressureValue"^^xsd:string
148 + ] [ sp:varName "temperatureValue"^^xsd:string
149 ]) ; 149 ]) ;
150 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 150 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
151 sp:predicate rdf:type ; 151 sp:predicate rdf:type ;
...@@ -183,6 +183,11 @@ dpr-tables:ProductVolumes ...@@ -183,6 +183,11 @@ dpr-tables:ProductVolumes
183 sp:subject 183 sp:subject
184 [ sp:varName "productionflownetwork"^^xsd:string 184 [ sp:varName "productionflownetwork"^^xsd:string
185 ] 185 ]
186 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ;
187 + sp:predicate rdf:type ;
188 + sp:subject
189 + [ sp:varName "flow"^^xsd:string
190 + ]
186 ] [ sp:object 191 ] [ sp:object
187 [ sp:varName "productionflownetwork"^^xsd:string 192 [ sp:varName "productionflownetwork"^^xsd:string
188 ] ; 193 ] ;
...@@ -204,11 +209,6 @@ dpr-tables:ProductVolumes ...@@ -204,11 +209,6 @@ dpr-tables:ProductVolumes
204 sp:subject 209 sp:subject
205 [ sp:varName "containingWholeFacility"^^xsd:string 210 [ sp:varName "containingWholeFacility"^^xsd:string
206 ] 211 ]
207 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ;
208 - sp:predicate rdf:type ;
209 - sp:subject
210 - [ sp:varName "flow"^^xsd:string
211 - ]
212 ] [ sp:object 212 ] [ sp:object
213 [ sp:varName "flowWhole"^^xsd:string 213 [ sp:varName "flowWhole"^^xsd:string
214 ] ; 214 ] ;
...@@ -228,10 +228,14 @@ dpr-tables:ProductVolumes ...@@ -228,10 +228,14 @@ dpr-tables:ProductVolumes
228 sp:subject 228 sp:subject
229 [ sp:varName "flowWhole"^^xsd:string 229 [ sp:varName "flowWhole"^^xsd:string
230 ] 230 ]
231 - ] [ sp:object 231 + ] [ rdf:type sp:TriplePath ;
232 + sp:object
232 [ sp:varName "flowInOutFacilityName"^^xsd:string 233 [ sp:varName "flowInOutFacilityName"^^xsd:string
233 ] ; 234 ] ;
234 - sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ; 235 + sp:path [ rdf:type sp:AltPath ;
236 + sp:path1 <http://www.reportinghub.no/ep/schema/core#name> ;
237 + sp:path2 <http://www.reportinghub.no/np/schema/npd#name>
238 + ] ;
235 sp:subject 239 sp:subject
236 [ sp:varName "flowInOutFacility"^^xsd:string 240 [ sp:varName "flowInOutFacility"^^xsd:string
237 ] 241 ]
...@@ -273,7 +277,8 @@ dpr-tables:ProductVolumes ...@@ -273,7 +277,8 @@ dpr-tables:ProductVolumes
273 sp:subject 277 sp:subject
274 [ sp:varName "flowDefinition"^^xsd:string 278 [ sp:varName "flowDefinition"^^xsd:string
275 ] 279 ]
276 - ] [ sp:object 280 + ] [ rdf:type sp:Optional ;
281 + sp:elements ([ sp:object
277 [ sp:varName "temperature"^^xsd:string 282 [ sp:varName "temperature"^^xsd:string
278 ] ; 283 ] ;
279 sp:predicate rdf:type ; 284 sp:predicate rdf:type ;
...@@ -331,8 +336,9 @@ dpr-tables:ProductVolumes ...@@ -331,8 +336,9 @@ dpr-tables:ProductVolumes
331 [ sp:varName "density"^^xsd:string 336 [ sp:varName "density"^^xsd:string
332 ] 337 ]
333 ]) 338 ])
339 + ])
334 ] ; 340 ] ;
335 - rhspin:tableHeaders ("Field"^^xsd:string "Facility Name"^^xsd:string "Flow Purpose"^^xsd:string "Flow Definition"^^xsd:string "Density"^^xsd:string "Pressure"^^xsd:string "Temperature"^^xsd:string) . 341 + rhspin:tableHeaders ("Field"^^xsd:string "Facility Name"^^xsd:string "Flow Purpose"^^xsd:string "Flow Definition"^^xsd:string "Flow Density"^^xsd:string "Flow Pressure"^^xsd:string "Flow Temperature"^^xsd:string) .
336 342
337 dpr-tables:ProductionOperationActivity 343 dpr-tables:ProductionOperationActivity
338 rdf:type rhspin:TableTemplate ; 344 rdf:type rhspin:TableTemplate ;
......