David Price

Completed Cargo Info, removing need for Cargo Ownership separate table

......@@ -45,6 +45,8 @@ mpr-tables:Cargo
] [ sp:varName "shipperName"^^xsd:string
] [ sp:varName "destinationName"^^xsd:string
] [ sp:varName "countryName"^^xsd:string
] [ sp:varName "ownerName"^^xsd:string
] [ sp:varName "ownedPercent"^^xsd:string
]) ;
sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
sp:predicate rdf:type ;
......@@ -154,29 +156,41 @@ mpr-tables:Cargo
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#spatialPartOf> ;
sp:subject
[ sp:varName "spatialPartOfProductFlowInMonth"^^xsd:string
[ sp:varName "spatialPartOfMaterialFlowedInMonth"^^xsd:string
]
] [ sp:object
[ sp:varName "spatialPartOfProductFlowInMonth"^^xsd:string
[ sp:varName "spatialPartOfMaterialFlowedInMonth"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
sp:subject
[ sp:varName "movedProduct"^^xsd:string
]
] [ sp:object
[ sp:varName "cargoNumber"^^xsd:string
[ sp:varName "movedProduct"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#cargoNumber> ;
sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#movedProduct> ;
sp:subject
[ sp:varName "movedProduct"^^xsd:string
[ sp:varName "movementOfProduct"^^xsd:string
]
] [ sp:object
[ sp:varName "cargoBatchNumber"^^xsd:string
[ sp:varName "massQuantity"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#cargoBatchNumber> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "movedProduct"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mass> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "massQuantity"^^xsd:string
]
] [ sp:object
[ sp:varName "massValue"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#kilogram> ;
sp:subject
[ sp:varName "massQuantity"^^xsd:string
]
] [ sp:object
[ sp:varName "movedProduct"^^xsd:string
] ;
......@@ -206,118 +220,83 @@ mpr-tables:Cargo
] [ sp:object
[ sp:varName "movedProduct"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#movedProduct> ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
sp:subject
[ sp:varName "movementOfProduct"^^xsd:string
[ sp:varName "densityOfMovedProduct"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#MovementOfProduct> ;
] [ sp:object
[ sp:varName "densityQuantity"^^xsd:string
] ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "movementOfProduct"^^xsd:string
[ sp:varName "densityOfMovedProduct"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Density> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "densityQuantity"^^xsd:string
]
] [ sp:object
[ sp:varName "productFlowWhole"^^xsd:string
[ sp:varName "densityValue"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#kilogram_m-3> ;
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
[ sp:varName "densityQuantity"^^xsd:string
]
] [ sp:object
[ sp:varName "cargoNumber"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#cargoNumber> ;
sp:subject
[ sp:varName "movedProduct"^^xsd:string
]
] [ sp:object
[ sp:varName "cargoBatchNumber"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#cargoBatchNumber> ;
sp:subject
[ sp:varName "movedProduct"^^xsd:string
]
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "massQuantity"^^xsd:string
] ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "movedProduct"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mass> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "massQuantity"^^xsd:string
]
] [ sp:object
[ sp:varName "massValue"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#kilogram> ;
sp:subject
[ sp:varName "massQuantity"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "movedProduct"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
sp:subject
[ sp:varName "densityOfMovedProduct"^^xsd:string
]
] [ sp:object
[ sp:varName "densityQuantity"^^xsd:string
[ sp:varName "productionFlowPurposeType"^^xsd:string
] ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "densityOfMovedProduct"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Density> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "densityQuantity"^^xsd:string
]
] [ sp:object
[ sp:varName "densityValue"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#kilogram_m-3> ;
sp:subject
[ sp:varName "densityQuantity"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "ladingPartOfMovementOfProduct"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ;
sp:subject
[ sp:varName "movementOfProduct"^^xsd:string
]
] [ sp:object
[ sp:varName "billOfLading"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ;
sp:subject
[ sp:varName "ladingPartOfMovementOfProduct"^^xsd:string
[ sp:varName "productionFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#IssueBillOfLading> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "billOfLading"^^xsd:string
[ sp:varName "productionFlowPurposeType"^^xsd:string
]
] [ sp:object
[ sp:varName "billOfLadingDate"^^xsd:string
[ sp:varName "purposeTypeName"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/activity#nominallyAt> ;
sp:predicate rdfs:label ;
sp:subject
[ sp:varName "billOfLading"^^xsd:string
[ sp:varName "productionFlowPurposeType"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "movementOfProductType"^^xsd:string
[ sp:varName "productionFlowDefinitionType"^^xsd:string
] ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "movementOfProduct"^^xsd:string
[ sp:varName "productionFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#MovementOfProductType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "movementOfProductType"^^xsd:string
[ sp:varName "productionFlowDefinitionType"^^xsd:string
]
] [ sp:object
[ sp:varName "movementType"^^xsd:string
[ sp:varName "definitionTypeName"^^xsd:string
] ;
sp:predicate rdfs:label ;
sp:subject
[ sp:varName "movementOfProductType"^^xsd:string
[ sp:varName "productionFlowDefinitionType"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
......@@ -354,10 +333,14 @@ mpr-tables:Cargo
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
sp:elements ([ rdf:type sp:TriplePath ;
sp:object
[ sp:varName "destinationName"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
sp:path [ rdf:type sp:AltPath ;
sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
] ;
sp:subject
[ sp:varName "destination"^^xsd:string
]
......@@ -378,80 +361,158 @@ mpr-tables:Cargo
sp:subject
[ sp:varName "shipperPart"^^xsd:string
]
] [ sp:object
] [ rdf:type sp:TriplePath ;
sp:object
[ sp:varName "shipperName"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
sp:path [ rdf:type sp:AltPath ;
sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
] ;
sp:subject
[ sp:varName "shipper"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "productionFlowPurposeType"^^xsd:string
[ sp:varName "productFlowWhole"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
sp:subject
[ sp:varName "productionFlowMixedPart"^^xsd:string
]
] [ sp:object
[ sp:varName "productFlowMaterialType"^^xsd:string
] ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowPurposeType"^^xsd:string
[ sp:varName "productFlowMaterialType"^^xsd:string
]
] [ sp:object
[ sp:varName "purposeTypeName"^^xsd:string
[ sp:varName "materialTypeName"^^xsd:string
] ;
sp:predicate rdfs:label ;
sp:subject
[ sp:varName "productionFlowPurposeType"^^xsd:string
[ sp:varName "productFlowMaterialType"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "productFlowMaterialType"^^xsd:string
[ sp:varName "movementOfProductType"^^xsd:string
] ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowWhole"^^xsd:string
[ sp:varName "movementOfProduct"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#MovementOfProductType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
[ sp:varName "movementOfProductType"^^xsd:string
]
] [ sp:object
[ sp:varName "materialTypeName"^^xsd:string
[ sp:varName "movementType"^^xsd:string
] ;
sp:predicate rdfs:label ;
sp:subject
[ sp:varName "productFlowMaterialType"^^xsd:string
[ sp:varName "movementOfProductType"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "productionFlowDefinitionType"^^xsd:string
[ sp:varName "ladingPartOfMovementOfProduct"^^xsd:string
] ;
sp:predicate rdf:type ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ;
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
[ sp:varName "movementOfProduct"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
] [ sp:object
[ sp:varName "salesMovedProduct"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#movedProduct> ;
sp:subject
[ sp:varName "ladingPartOfMovementOfProduct"^^xsd:string
]
] [ sp:object
[ sp:varName "movedProduct"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#spatialPartOf> ;
sp:subject
[ sp:varName "salesMovedProduct"^^xsd:string
]
] [ sp:object
[ sp:varName "ownerPart"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/organization#owner> ;
sp:subject
[ sp:varName "salesMovedProduct"^^xsd:string
]
] [ sp:object
[ sp:varName "owner"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
sp:subject
[ sp:varName "ownerPart"^^xsd:string
]
] [ rdf:type sp:TriplePath ;
sp:object
[ sp:varName "ownerName"^^xsd:string
] ;
sp:path [ rdf:type sp:AltPath ;
sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
] ;
sp:subject
[ sp:varName "owner"^^xsd:string
]
] [ sp:object
[ sp:varName "salesMovedProduct"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/material#partMaterialOfPair> ;
sp:subject
[ sp:varName "ownedShare"^^xsd:string
]
] [ sp:object
[ sp:varName "ownedVolumeRatio"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/material#volumeRatio> ;
sp:subject
[ sp:varName "ownedShare"^^xsd:string
]
] [ sp:object
[ sp:varName "ownedPercent"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#percent> ;
sp:subject
[ sp:varName "ownedVolumeRatio"^^xsd:string
]
] [ sp:object
[ sp:varName "billOfLading"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ;
sp:subject
[ sp:varName "ladingPartOfMovementOfProduct"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#IssueBillOfLading> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowDefinitionType"^^xsd:string
[ sp:varName "billOfLading"^^xsd:string
]
] [ sp:object
[ sp:varName "definitionTypeName"^^xsd:string
[ sp:varName "billOfLadingDate"^^xsd:string
] ;
sp:predicate rdfs:label ;
sp:predicate <http://www.reportinghub.no/ep/schema/activity#nominallyAt> ;
sp:subject
[ sp:varName "productionFlowDefinitionType"^^xsd:string
[ sp:varName "billOfLading"^^xsd:string
]
])
])
] ;
rhspin:tableHeaders ("Facility"^^xsd:string "Purpose"^^xsd:string "Material"^^xsd:string "Flow type"^^xsd:string "Movement Type"^^xsd:string "Cargo Number"^^xsd:string "Cargo Batch"^^xsd:string "Bill of Lading"^^xsd:string "Volume"^^xsd:string "Mass"^^xsd:string "Density"^^xsd:string "Shipper"^^xsd:string "Destination"^^xsd:string "Country"^^xsd:string) .
rhspin:tableHeaders ("Facility"^^xsd:string "Purpose"^^xsd:string "Material"^^xsd:string "Flow type"^^xsd:string "Movement Type"^^xsd:string "Cargo Number"^^xsd:string "Cargo Batch"^^xsd:string "Bill of Lading"^^xsd:string "Volume"^^xsd:string "Mass"^^xsd:string "Density"^^xsd:string "Shipper"^^xsd:string "Destination"^^xsd:string "Country"^^xsd:string "Owner"^^xsd:string "Share"^^xsd:string) .
mpr-tables:CargoOwnership
rdf:type rhspin:TableTemplate ;
......@@ -1570,6 +1631,13 @@ mpr-tables:ProductionFlowsAll
]
])
] [ rdf:type sp:NotExists ;
sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#HydrocarbonAccounting> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
])
] [ rdf:type sp:NotExists ;
sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#Sale> ;
sp:predicate rdf:type ;
sp:subject
......