David Price

First cargo reworked, dups though

......@@ -64,23 +64,23 @@ mpr-tables:Cargo
[ sp:varName "productVolumeReport"^^xsd:string
]
] [ sp:object
[ sp:varName "productionFlowsInReportingPeriod"^^xsd:string
[ sp:varName "productionFlowNetwork"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ;
sp:subject
[ sp:varName "productVolumeReport"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowsInReportingPeriod"^^xsd:string
[ sp:varName "productionFlowNetwork"^^xsd:string
]
] [ sp:object
[ sp:varName "productionFlowInReportingPeriod"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ;
sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasNetworkPart> ;
sp:subject
[ sp:varName "productionFlowsInReportingPeriod"^^xsd:string
[ sp:varName "productionFlowNetwork"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ;
sp:predicate rdf:type ;
......@@ -105,13 +105,6 @@ mpr-tables:Cargo
[ sp:varName "productionFlowWhole"^^xsd:string
]
] [ sp:object
[ sp:varName "productionFlowMixedPart"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
] [ sp:object
[ sp:varName "productionFlowFacility"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ;
......@@ -128,23 +121,23 @@ mpr-tables:Cargo
] [ sp:object
[ sp:varName "productionFlowMixedPart"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
sp:subject
[ sp:varName "productFlowPartOfMixedPart"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductFlow> ;
sp:predicate rdf:type ;
sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
sp:subject
[ sp:varName "productFlowPartOfMixedPart"^^xsd:string
[ sp:varName "productionFlowInReportingPeriod"^^xsd:string
]
] [ sp:object
[ sp:varName "productFlowPartOfMixedPart"^^xsd:string
[ sp:varName "productionFlowMixedPart"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
sp:subject
[ sp:varName "productFlowInMonth"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#FlowDuringMonth> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductFlow> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowInMonth"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#PhysicalThingDuringOneMonth> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productFlowInMonth"^^xsd:string
......@@ -222,6 +215,13 @@ mpr-tables:Cargo
sp:subject
[ sp:varName "movementOfProduct"^^xsd:string
]
] [ sp:object
[ sp:varName "productFlowWhole"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "massQuantity"^^xsd:string
......@@ -413,7 +413,7 @@ mpr-tables:Cargo
] ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowMixedPart"^^xsd:string
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
sp:predicate rdf:type ;
......