David Price

Merge branch 'jul23-10pm'

......@@ -178,8 +178,6 @@ OPTIONAL {
<mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:WellProductionFlows" />
<mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo" />
<mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:Cargo_1" />
<mprgswp:Table arg:report="{= ?report }" arg:template="mpr-tables:CargoOwnership" />
......
......@@ -17,8 +17,8 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
<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>
rdfs:label "STEP 20301a" .
<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>
rdfs:label "20400e" .
<http://www.reportinghub.no/data/erh/Field-1630514-Flow-MIKKEL_ALLOCATED_TANKLIFT>
ep-flow:hasMixedPart
......@@ -31,7 +31,6 @@
rdf:type ep-fac:ProductionFacility .
<http://www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/BA_ASGARD/test-results/triples/MIKKEL-MONTH_2012-01-01_final-mprg-cargo>
rdf:type owl:Ontology ;
owl:imports <http://www.reportinghub.no/data/erh> , <http://www.reportinghub.no/ep/schema/1.0/production> ;
owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......@@ -57,6 +56,10 @@
rdf:type ep-org:Organization ;
ep-core:name "STATOIL"^^xsd:string .
<https://www.reportinghub.no/ep/data/organization/TOTAL>
rdf:type ep-org:Organization ;
ep-core:name "TOTAL"^^xsd:string .
<https://www.reportinghub.no/ep/data/productionReport/FIELD-1630514$2012-01-01$2012-01-31>
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> ;
ep-core:name "ÅSGARD"^^xsd:string ;
......@@ -332,7 +335,9 @@ _:b2 rdf:type ep-material:QuantityOfMaterial , _:b6 ;
ep-prodact:movedProduct
_:b2 ;
ep-prodact:shipper
[ rdf:type ep-org:Organization
[ rdf:type ep-org:Organization ;
ep-core:temporalPartOf
<https://www.reportinghub.no/ep/data/organization/TOTAL>
] .
_:b3 rdf:type ep-material:QuantityOfMaterial , _:b10 ;
......@@ -379,7 +384,9 @@ _:b3 rdf:type ep-material:QuantityOfMaterial , _:b10 ;
ep-prodact:movedProduct
_:b3 ;
ep-prodact:shipper
[ rdf:type ep-org:Organization
[ rdf:type ep-org:Organization ;
ep-core:temporalPartOf
<https://www.reportinghub.no/ep/data/organization/STATOIL>
] .
_:b4 rdf:type ep-material:QuantityOfMaterial , _:b12 ;
......@@ -439,7 +446,9 @@ _:b4 rdf:type ep-material:QuantityOfMaterial , _:b12 ;
ep-prodact:movedProduct
_:b4 ;
ep-prodact:shipper
[ rdf:type ep-org:Organization
[ rdf:type ep-org:Organization ;
ep-core:temporalPartOf
<https://www.reportinghub.no/ep/data/organization/ENI_NORGE>
] .
_:b14
......