David Price

First cargo reworked, dups though

...@@ -64,23 +64,23 @@ mpr-tables:Cargo ...@@ -64,23 +64,23 @@ mpr-tables:Cargo
64 [ sp:varName "productVolumeReport"^^xsd:string 64 [ sp:varName "productVolumeReport"^^xsd:string
65 ] 65 ]
66 ] [ sp:object 66 ] [ sp:object
67 - [ sp:varName "productionFlowsInReportingPeriod"^^xsd:string 67 + [ sp:varName "productionFlowNetwork"^^xsd:string
68 ] ; 68 ] ;
69 sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ; 69 sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ;
70 sp:subject 70 sp:subject
71 [ sp:varName "productVolumeReport"^^xsd:string 71 [ sp:varName "productVolumeReport"^^xsd:string
72 ] 72 ]
73 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ; 73 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork> ;
74 sp:predicate rdf:type ; 74 sp:predicate rdf:type ;
75 sp:subject 75 sp:subject
76 - [ sp:varName "productionFlowsInReportingPeriod"^^xsd:string 76 + [ sp:varName "productionFlowNetwork"^^xsd:string
77 ] 77 ]
78 ] [ sp:object 78 ] [ sp:object
79 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string 79 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
80 ] ; 80 ] ;
81 - sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ; 81 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasNetworkPart> ;
82 sp:subject 82 sp:subject
83 - [ sp:varName "productionFlowsInReportingPeriod"^^xsd:string 83 + [ sp:varName "productionFlowNetwork"^^xsd:string
84 ] 84 ]
85 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ; 85 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ;
86 sp:predicate rdf:type ; 86 sp:predicate rdf:type ;
...@@ -105,13 +105,6 @@ mpr-tables:Cargo ...@@ -105,13 +105,6 @@ mpr-tables:Cargo
105 [ sp:varName "productionFlowWhole"^^xsd:string 105 [ sp:varName "productionFlowWhole"^^xsd:string
106 ] 106 ]
107 ] [ sp:object 107 ] [ sp:object
108 - [ sp:varName "productionFlowMixedPart"^^xsd:string
109 - ] ;
110 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
111 - sp:subject
112 - [ sp:varName "productionFlowWhole"^^xsd:string
113 - ]
114 - ] [ sp:object
115 [ sp:varName "productionFlowFacility"^^xsd:string 108 [ sp:varName "productionFlowFacility"^^xsd:string
116 ] ; 109 ] ;
117 sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ; 110 sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ;
...@@ -128,23 +121,23 @@ mpr-tables:Cargo ...@@ -128,23 +121,23 @@ mpr-tables:Cargo
128 ] [ sp:object 121 ] [ sp:object
129 [ sp:varName "productionFlowMixedPart"^^xsd:string 122 [ sp:varName "productionFlowMixedPart"^^xsd:string
130 ] ; 123 ] ;
131 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 124 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
132 - sp:subject
133 - [ sp:varName "productFlowPartOfMixedPart"^^xsd:string
134 - ]
135 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductFlow> ;
136 - sp:predicate rdf:type ;
137 sp:subject 125 sp:subject
138 - [ sp:varName "productFlowPartOfMixedPart"^^xsd:string 126 + [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
139 ] 127 ]
140 ] [ sp:object 128 ] [ sp:object
141 - [ sp:varName "productFlowPartOfMixedPart"^^xsd:string 129 + [ sp:varName "productionFlowMixedPart"^^xsd:string
142 ] ; 130 ] ;
143 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 131 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
144 sp:subject 132 sp:subject
145 [ sp:varName "productFlowInMonth"^^xsd:string 133 [ sp:varName "productFlowInMonth"^^xsd:string
146 ] 134 ]
147 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#FlowDuringMonth> ; 135 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductFlow> ;
136 + sp:predicate rdf:type ;
137 + sp:subject
138 + [ sp:varName "productFlowInMonth"^^xsd:string
139 + ]
140 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#PhysicalThingDuringOneMonth> ;
148 sp:predicate rdf:type ; 141 sp:predicate rdf:type ;
149 sp:subject 142 sp:subject
150 [ sp:varName "productFlowInMonth"^^xsd:string 143 [ sp:varName "productFlowInMonth"^^xsd:string
...@@ -222,6 +215,13 @@ mpr-tables:Cargo ...@@ -222,6 +215,13 @@ mpr-tables:Cargo
222 sp:subject 215 sp:subject
223 [ sp:varName "movementOfProduct"^^xsd:string 216 [ sp:varName "movementOfProduct"^^xsd:string
224 ] 217 ]
218 + ] [ sp:object
219 + [ sp:varName "productFlowWhole"^^xsd:string
220 + ] ;
221 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
222 + sp:subject
223 + [ sp:varName "productionFlowWhole"^^xsd:string
224 + ]
225 ] [ rdf:type sp:Optional ; 225 ] [ rdf:type sp:Optional ;
226 sp:elements ([ sp:object 226 sp:elements ([ sp:object
227 [ sp:varName "massQuantity"^^xsd:string 227 [ sp:varName "massQuantity"^^xsd:string
...@@ -413,7 +413,7 @@ mpr-tables:Cargo ...@@ -413,7 +413,7 @@ mpr-tables:Cargo
413 ] ; 413 ] ;
414 sp:predicate rdf:type ; 414 sp:predicate rdf:type ;
415 sp:subject 415 sp:subject
416 - [ sp:varName "productionFlowMixedPart"^^xsd:string 416 + [ sp:varName "productFlowWhole"^^xsd:string
417 ] 417 ]
418 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ; 418 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
419 sp:predicate rdf:type ; 419 sp:predicate rdf:type ;
......