David Price

Merge branch 'jul23-10pm'

...@@ -178,8 +178,6 @@ OPTIONAL { ...@@ -178,8 +178,6 @@ OPTIONAL {
178 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows" /> 178 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows" />
179 179
180 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" /> 180 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" />
181 -
182 - <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo_1" />
183 181
184 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" /> 182 <mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" />
185 183
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
17 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 17 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
18 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 18 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
19 19
20 -<file:///www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/BA_ASGARD/tqedits/MIKKEL-MONTH_2012-01-01_final-mprg-cargo.xml#r-2-2-1> 20 +<file:///www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/BA_ASGARD/tqedits/MIKKEL-MONTH_2012-01-01_final-mprg-cargo.xml#r-2-2-1-3>
21 - rdfs:label "STEP 20301a" . 21 + rdfs:label "20400e" .
22 22
23 <http://www.reportinghub.no/data/erh/Field-1630514-Flow-MIKKEL_ALLOCATED_TANKLIFT> 23 <http://www.reportinghub.no/data/erh/Field-1630514-Flow-MIKKEL_ALLOCATED_TANKLIFT>
24 ep-flow:hasMixedPart 24 ep-flow:hasMixedPart
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
31 rdf:type ep-fac:ProductionFacility . 31 rdf:type ep-fac:ProductionFacility .
32 32
33 <http://www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/BA_ASGARD/test-results/triples/MIKKEL-MONTH_2012-01-01_final-mprg-cargo> 33 <http://www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/BA_ASGARD/test-results/triples/MIKKEL-MONTH_2012-01-01_final-mprg-cargo>
34 - rdf:type owl:Ontology ;
35 owl:imports <http://www.reportinghub.no/data/erh> , <http://www.reportinghub.no/ep/schema/1.0/production> ; 34 owl:imports <http://www.reportinghub.no/data/erh> , <http://www.reportinghub.no/ep/schema/1.0/production> ;
36 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 35 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
37 36
...@@ -57,6 +56,10 @@ ...@@ -57,6 +56,10 @@
57 rdf:type ep-org:Organization ; 56 rdf:type ep-org:Organization ;
58 ep-core:name "STATOIL"^^xsd:string . 57 ep-core:name "STATOIL"^^xsd:string .
59 58
59 +<https://www.reportinghub.no/ep/data/organization/TOTAL>
60 + rdf:type ep-org:Organization ;
61 + ep-core:name "TOTAL"^^xsd:string .
62 +
60 <https://www.reportinghub.no/ep/data/productionReport/FIELD-1630514$2012-01-01$2012-01-31> 63 <https://www.reportinghub.no/ep/data/productionReport/FIELD-1630514$2012-01-01$2012-01-31>
61 rdf:type ep-report:FinalVersionOfAReport , ep-report:MonthlyProductionReport , ep-report:MonthlyProductionReportGovernment , ep-report:ProductionReport , ep-report:Report , <https://www.reportinghub.no/ep/data/productionReportKind/COPEX> ; 64 rdf:type ep-report:FinalVersionOfAReport , ep-report:MonthlyProductionReport , ep-report:MonthlyProductionReportGovernment , ep-report:ProductionReport , ep-report:Report , <https://www.reportinghub.no/ep/data/productionReportKind/COPEX> ;
62 ep-core:name "ÅSGARD"^^xsd:string ; 65 ep-core:name "ÅSGARD"^^xsd:string ;
...@@ -332,7 +335,9 @@ _:b2 rdf:type ep-material:QuantityOfMaterial , _:b6 ; ...@@ -332,7 +335,9 @@ _:b2 rdf:type ep-material:QuantityOfMaterial , _:b6 ;
332 ep-prodact:movedProduct 335 ep-prodact:movedProduct
333 _:b2 ; 336 _:b2 ;
334 ep-prodact:shipper 337 ep-prodact:shipper
335 - [ rdf:type ep-org:Organization 338 + [ rdf:type ep-org:Organization ;
339 + ep-core:temporalPartOf
340 + <https://www.reportinghub.no/ep/data/organization/TOTAL>
336 ] . 341 ] .
337 342
338 _:b3 rdf:type ep-material:QuantityOfMaterial , _:b10 ; 343 _:b3 rdf:type ep-material:QuantityOfMaterial , _:b10 ;
...@@ -379,7 +384,9 @@ _:b3 rdf:type ep-material:QuantityOfMaterial , _:b10 ; ...@@ -379,7 +384,9 @@ _:b3 rdf:type ep-material:QuantityOfMaterial , _:b10 ;
379 ep-prodact:movedProduct 384 ep-prodact:movedProduct
380 _:b3 ; 385 _:b3 ;
381 ep-prodact:shipper 386 ep-prodact:shipper
382 - [ rdf:type ep-org:Organization 387 + [ rdf:type ep-org:Organization ;
388 + ep-core:temporalPartOf
389 + <https://www.reportinghub.no/ep/data/organization/STATOIL>
383 ] . 390 ] .
384 391
385 _:b4 rdf:type ep-material:QuantityOfMaterial , _:b12 ; 392 _:b4 rdf:type ep-material:QuantityOfMaterial , _:b12 ;
...@@ -439,7 +446,9 @@ _:b4 rdf:type ep-material:QuantityOfMaterial , _:b12 ; ...@@ -439,7 +446,9 @@ _:b4 rdf:type ep-material:QuantityOfMaterial , _:b12 ;
439 ep-prodact:movedProduct 446 ep-prodact:movedProduct
440 _:b4 ; 447 _:b4 ;
441 ep-prodact:shipper 448 ep-prodact:shipper
442 - [ rdf:type ep-org:Organization 449 + [ rdf:type ep-org:Organization ;
450 + ep-core:temporalPartOf
451 + <https://www.reportinghub.no/ep/data/organization/ENI_NORGE>
443 ] . 452 ] .
444 453
445 _:b14 454 _:b14
......