David Price

Merge branch 'trygraph'

...@@ -68,7 +68,8 @@ mpr-tables:Cargo ...@@ -68,7 +68,8 @@ mpr-tables:Cargo
68 sp:subject 68 sp:subject
69 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string 69 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
70 ] 70 ]
71 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ; 71 + ] [ rdf:type sp:NamedGraph ;
72 + sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ;
72 sp:predicate rdf:type ; 73 sp:predicate rdf:type ;
73 sp:subject 74 sp:subject
74 [ sp:varName "productionFlowWhole"^^xsd:string 75 [ sp:varName "productionFlowWhole"^^xsd:string
...@@ -78,6 +79,8 @@ mpr-tables:Cargo ...@@ -78,6 +79,8 @@ mpr-tables:Cargo
78 sp:subject 79 sp:subject
79 [ sp:varName "productionFlowWhole"^^xsd:string 80 [ sp:varName "productionFlowWhole"^^xsd:string
80 ] 81 ]
82 + ]) ;
83 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
81 ] [ sp:object 84 ] [ sp:object
82 [ sp:varName "facilityName"^^xsd:string 85 [ sp:varName "facilityName"^^xsd:string
83 ] ; 86 ] ;
...@@ -337,6 +340,7 @@ mpr-tables:Cargo ...@@ -337,6 +340,7 @@ mpr-tables:Cargo
337 ] 340 ]
338 ]) 341 ])
339 ] [ rdf:type sp:Optional ; 342 ] [ rdf:type sp:Optional ;
343 + sp:elements ([ rdf:type sp:NamedGraph ;
340 sp:elements ([ sp:object 344 sp:elements ([ sp:object
341 [ sp:varName "productionFlowDefinitionType"^^xsd:string 345 [ sp:varName "productionFlowDefinitionType"^^xsd:string
342 ] ; 346 ] ;
...@@ -356,6 +360,8 @@ mpr-tables:Cargo ...@@ -356,6 +360,8 @@ mpr-tables:Cargo
356 sp:subject 360 sp:subject
357 [ sp:varName "productionFlowDefinitionType"^^xsd:string 361 [ sp:varName "productionFlowDefinitionType"^^xsd:string
358 ] 362 ]
363 + ]) ;
364 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
359 ]) 365 ])
360 ] [ rdf:type sp:Optional ; 366 ] [ rdf:type sp:Optional ;
361 sp:elements ([ sp:object 367 sp:elements ([ sp:object
...@@ -895,7 +901,8 @@ mpr-tables:GasSales ...@@ -895,7 +901,8 @@ mpr-tables:GasSales
895 sp:subject 901 sp:subject
896 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string 902 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
897 ] 903 ]
898 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ; 904 + ] [ rdf:type sp:NamedGraph ;
905 + sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ;
899 sp:predicate rdf:type ; 906 sp:predicate rdf:type ;
900 sp:subject 907 sp:subject
901 [ sp:varName "productionFlowWhole"^^xsd:string 908 [ sp:varName "productionFlowWhole"^^xsd:string
...@@ -919,6 +926,8 @@ mpr-tables:GasSales ...@@ -919,6 +926,8 @@ mpr-tables:GasSales
919 sp:subject 926 sp:subject
920 [ sp:varName "productionFlowFacility"^^xsd:string 927 [ sp:varName "productionFlowFacility"^^xsd:string
921 ] 928 ]
929 + ]) ;
930 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
922 ] [ sp:object 931 ] [ sp:object
923 [ sp:varName "productFlowMonth"^^xsd:string 932 [ sp:varName "productFlowMonth"^^xsd:string
924 ] ; 933 ] ;
...@@ -1188,6 +1197,7 @@ mpr-tables:GasSales ...@@ -1188,6 +1197,7 @@ mpr-tables:GasSales
1188 [ sp:varName "productFlowMaterialType"^^xsd:string 1197 [ sp:varName "productFlowMaterialType"^^xsd:string
1189 ] 1198 ]
1190 ] [ rdf:type sp:Optional ; 1199 ] [ rdf:type sp:Optional ;
1200 + sp:elements ([ rdf:type sp:NamedGraph ;
1191 sp:elements ([ sp:object 1201 sp:elements ([ sp:object
1192 [ sp:varName "productionFlowPurposeType"^^xsd:string 1202 [ sp:varName "productionFlowPurposeType"^^xsd:string
1193 ] ; 1203 ] ;
...@@ -1207,8 +1217,11 @@ mpr-tables:GasSales ...@@ -1207,8 +1217,11 @@ mpr-tables:GasSales
1207 sp:subject 1217 sp:subject
1208 [ sp:varName "productionFlowPurposeType"^^xsd:string 1218 [ sp:varName "productionFlowPurposeType"^^xsd:string
1209 ] 1219 ]
1220 + ]) ;
1221 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
1210 ]) 1222 ])
1211 ] [ rdf:type sp:Optional ; 1223 ] [ rdf:type sp:Optional ;
1224 + sp:elements ([ rdf:type sp:NamedGraph ;
1212 sp:elements ([ sp:object 1225 sp:elements ([ sp:object
1213 [ sp:varName "productionFlowDefinitionType"^^xsd:string 1226 [ sp:varName "productionFlowDefinitionType"^^xsd:string
1214 ] ; 1227 ] ;
...@@ -1228,6 +1241,8 @@ mpr-tables:GasSales ...@@ -1228,6 +1241,8 @@ mpr-tables:GasSales
1228 sp:subject 1241 sp:subject
1229 [ sp:varName "productionFlowDefinitionType"^^xsd:string 1242 [ sp:varName "productionFlowDefinitionType"^^xsd:string
1230 ] 1243 ]
1244 + ]) ;
1245 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
1231 ]) 1246 ])
1232 ]) 1247 ])
1233 ]) 1248 ])
...@@ -1298,7 +1313,8 @@ mpr-tables:ProductionFlows ...@@ -1298,7 +1313,8 @@ mpr-tables:ProductionFlows
1298 sp:subject 1313 sp:subject
1299 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string 1314 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
1300 ] 1315 ]
1301 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ; 1316 + ] [ rdf:type sp:NamedGraph ;
1317 + sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ;
1302 sp:predicate rdf:type ; 1318 sp:predicate rdf:type ;
1303 sp:subject 1319 sp:subject
1304 [ sp:varName "productionFlow"^^xsd:string 1320 [ sp:varName "productionFlow"^^xsd:string
...@@ -1317,7 +1333,10 @@ mpr-tables:ProductionFlows ...@@ -1317,7 +1333,10 @@ mpr-tables:ProductionFlows
1317 sp:subject 1333 sp:subject
1318 [ sp:varName "productionFlowFacility"^^xsd:string 1334 [ sp:varName "productionFlowFacility"^^xsd:string
1319 ] 1335 ]
1336 + ]) ;
1337 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
1320 ] [ rdf:type sp:Optional ; 1338 ] [ rdf:type sp:Optional ;
1339 + sp:elements ([ rdf:type sp:NamedGraph ;
1321 sp:elements ([ sp:object 1340 sp:elements ([ sp:object
1322 [ sp:varName "productionFlowName"^^xsd:string 1341 [ sp:varName "productionFlowName"^^xsd:string
1323 ] ; 1342 ] ;
...@@ -1325,8 +1344,11 @@ mpr-tables:ProductionFlows ...@@ -1325,8 +1344,11 @@ mpr-tables:ProductionFlows
1325 sp:subject 1344 sp:subject
1326 [ sp:varName "productionFlow"^^xsd:string 1345 [ sp:varName "productionFlow"^^xsd:string
1327 ] 1346 ]
1347 + ]) ;
1348 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
1328 ]) 1349 ])
1329 ] [ rdf:type sp:Optional ; 1350 ] [ rdf:type sp:Optional ;
1351 + sp:elements ([ rdf:type sp:NamedGraph ;
1330 sp:elements ([ sp:object 1352 sp:elements ([ sp:object
1331 [ sp:varName "productionFlowDefinitionType"^^xsd:string 1353 [ sp:varName "productionFlowDefinitionType"^^xsd:string
1332 ] ; 1354 ] ;
...@@ -1346,8 +1368,11 @@ mpr-tables:ProductionFlows ...@@ -1346,8 +1368,11 @@ mpr-tables:ProductionFlows
1346 sp:subject 1368 sp:subject
1347 [ sp:varName "productionFlowDefinitionType"^^xsd:string 1369 [ sp:varName "productionFlowDefinitionType"^^xsd:string
1348 ] 1370 ]
1371 + ]) ;
1372 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
1349 ]) 1373 ])
1350 ] [ rdf:type sp:Optional ; 1374 ] [ rdf:type sp:Optional ;
1375 + sp:elements ([ rdf:type sp:NamedGraph ;
1351 sp:elements ([ sp:object 1376 sp:elements ([ sp:object
1352 [ sp:varName "productionFlowDefinitionSubType"^^xsd:string 1377 [ sp:varName "productionFlowDefinitionSubType"^^xsd:string
1353 ] ; 1378 ] ;
...@@ -1367,8 +1392,11 @@ mpr-tables:ProductionFlows ...@@ -1367,8 +1392,11 @@ mpr-tables:ProductionFlows
1367 sp:subject 1392 sp:subject
1368 [ sp:varName "productionFlowDefinitionSubType"^^xsd:string 1393 [ sp:varName "productionFlowDefinitionSubType"^^xsd:string
1369 ] 1394 ]
1395 + ]) ;
1396 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
1370 ]) 1397 ])
1371 ] [ rdf:type sp:Optional ; 1398 ] [ rdf:type sp:Optional ;
1399 + sp:elements ([ rdf:type sp:NamedGraph ;
1372 sp:elements ([ sp:object 1400 sp:elements ([ sp:object
1373 [ sp:varName "productionFlowPurposeType"^^xsd:string 1401 [ sp:varName "productionFlowPurposeType"^^xsd:string
1374 ] ; 1402 ] ;
...@@ -1388,6 +1416,8 @@ mpr-tables:ProductionFlows ...@@ -1388,6 +1416,8 @@ mpr-tables:ProductionFlows
1388 sp:subject 1416 sp:subject
1389 [ sp:varName "productionFlowPurposeType"^^xsd:string 1417 [ sp:varName "productionFlowPurposeType"^^xsd:string
1390 ] 1418 ]
1419 + ]) ;
1420 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
1391 ]) 1421 ])
1392 ] [ rdf:type sp:Optional ; 1422 ] [ rdf:type sp:Optional ;
1393 sp:elements ([ sp:object 1423 sp:elements ([ sp:object
...@@ -2201,13 +2231,16 @@ mpr-tables:ProductionInventory ...@@ -2201,13 +2231,16 @@ mpr-tables:ProductionInventory
2201 sp:subject 2231 sp:subject
2202 [ sp:varName "productionInventoryWhole"^^xsd:string 2232 [ sp:varName "productionInventoryWhole"^^xsd:string
2203 ] 2233 ]
2204 - ] [ sp:object 2234 + ] [ rdf:type sp:NamedGraph ;
2235 + sp:elements ([ sp:object
2205 [ sp:varName "productionInventoryWholeName"^^xsd:string 2236 [ sp:varName "productionInventoryWholeName"^^xsd:string
2206 ] ; 2237 ] ;
2207 sp:predicate <http://www.reportinghub.no/ep/schema/erhfacts#name> ; 2238 sp:predicate <http://www.reportinghub.no/ep/schema/erhfacts#name> ;
2208 sp:subject 2239 sp:subject
2209 [ sp:varName "productionInventoryWhole"^^xsd:string 2240 [ sp:varName "productionInventoryWhole"^^xsd:string
2210 ] 2241 ]
2242 + ]) ;
2243 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
2211 ] [ rdf:type sp:Optional ; 2244 ] [ rdf:type sp:Optional ;
2212 sp:elements ([ sp:object 2245 sp:elements ([ sp:object
2213 [ sp:varName "productionInventoryType"^^xsd:string 2246 [ sp:varName "productionInventoryType"^^xsd:string
...@@ -2437,13 +2470,16 @@ mpr-tables:ProductionInventoryOwnership ...@@ -2437,13 +2470,16 @@ mpr-tables:ProductionInventoryOwnership
2437 sp:subject 2470 sp:subject
2438 [ sp:varName "productionInventoryWhole"^^xsd:string 2471 [ sp:varName "productionInventoryWhole"^^xsd:string
2439 ] 2472 ]
2440 - ] [ sp:object 2473 + ] [ rdf:type sp:NamedGraph ;
2474 + sp:elements ([ sp:object
2441 [ sp:varName "productionInventoryWholeName"^^xsd:string 2475 [ sp:varName "productionInventoryWholeName"^^xsd:string
2442 ] ; 2476 ] ;
2443 sp:predicate <http://www.reportinghub.no/ep/schema/erhfacts#name> ; 2477 sp:predicate <http://www.reportinghub.no/ep/schema/erhfacts#name> ;
2444 sp:subject 2478 sp:subject
2445 [ sp:varName "productionInventoryWhole"^^xsd:string 2479 [ sp:varName "productionInventoryWhole"^^xsd:string
2446 ] 2480 ]
2481 + ]) ;
2482 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
2447 ] [ rdf:type sp:Optional ; 2483 ] [ rdf:type sp:Optional ;
2448 sp:elements ([ sp:object 2484 sp:elements ([ sp:object
2449 [ sp:varName "productionInventoryType"^^xsd:string 2485 [ sp:varName "productionInventoryType"^^xsd:string
...@@ -2503,7 +2539,8 @@ mpr-tables:ProductionSales ...@@ -2503,7 +2539,8 @@ mpr-tables:ProductionSales
2503 sp:subject 2539 sp:subject
2504 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string 2540 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
2505 ] 2541 ]
2506 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ; 2542 + ] [ rdf:type sp:NamedGraph ;
2543 + sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ;
2507 sp:predicate rdf:type ; 2544 sp:predicate rdf:type ;
2508 sp:subject 2545 sp:subject
2509 [ sp:varName "productionFlowWhole"^^xsd:string 2546 [ sp:varName "productionFlowWhole"^^xsd:string
...@@ -2520,6 +2557,8 @@ mpr-tables:ProductionSales ...@@ -2520,6 +2557,8 @@ mpr-tables:ProductionSales
2520 sp:subject 2557 sp:subject
2521 [ sp:varName "productionFlowWhole"^^xsd:string 2558 [ sp:varName "productionFlowWhole"^^xsd:string
2522 ] 2559 ]
2560 + ]) ;
2561 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
2523 ] [ rdf:type sp:Filter ; 2562 ] [ rdf:type sp:Filter ;
2524 sp:expression 2563 sp:expression
2525 [ rdf:type sp:notExists ; 2564 [ rdf:type sp:notExists ;
...@@ -2589,6 +2628,7 @@ mpr-tables:ProductionSales ...@@ -2589,6 +2628,7 @@ mpr-tables:ProductionSales
2589 [ sp:varName "productFlowWhole"^^xsd:string 2628 [ sp:varName "productFlowWhole"^^xsd:string
2590 ] 2629 ]
2591 ] [ rdf:type sp:Optional ; 2630 ] [ rdf:type sp:Optional ;
2631 + sp:elements ([ rdf:type sp:NamedGraph ;
2592 sp:elements ([ sp:object 2632 sp:elements ([ sp:object
2593 [ sp:varName "productionFlowPurposeType"^^xsd:string 2633 [ sp:varName "productionFlowPurposeType"^^xsd:string
2594 ] ; 2634 ] ;
...@@ -2608,6 +2648,8 @@ mpr-tables:ProductionSales ...@@ -2608,6 +2648,8 @@ mpr-tables:ProductionSales
2608 sp:subject 2648 sp:subject
2609 [ sp:varName "productionFlowPurposeType"^^xsd:string 2649 [ sp:varName "productionFlowPurposeType"^^xsd:string
2610 ] 2650 ]
2651 + ]) ;
2652 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
2611 ]) 2653 ])
2612 ] [ rdf:type sp:Optional ; 2654 ] [ rdf:type sp:Optional ;
2613 sp:elements ([ sp:object 2655 sp:elements ([ sp:object
...@@ -2652,6 +2694,7 @@ mpr-tables:ProductionSales ...@@ -2652,6 +2694,7 @@ mpr-tables:ProductionSales
2652 ] 2694 ]
2653 ]) 2695 ])
2654 ] [ rdf:type sp:Optional ; 2696 ] [ rdf:type sp:Optional ;
2697 + sp:elements ([ rdf:type sp:NamedGraph ;
2655 sp:elements ([ sp:object 2698 sp:elements ([ sp:object
2656 [ sp:varName "productionFlowDefinitionType"^^xsd:string 2699 [ sp:varName "productionFlowDefinitionType"^^xsd:string
2657 ] ; 2700 ] ;
...@@ -2671,6 +2714,8 @@ mpr-tables:ProductionSales ...@@ -2671,6 +2714,8 @@ mpr-tables:ProductionSales
2671 sp:subject 2714 sp:subject
2672 [ sp:varName "productionFlowDefinitionType"^^xsd:string 2715 [ sp:varName "productionFlowDefinitionType"^^xsd:string
2673 ] 2716 ]
2717 + ]) ;
2718 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
2674 ]) 2719 ])
2675 ]) 2720 ])
2676 ] ; 2721 ] ;
......
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
29 ] ; 29 ] ;
30 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 30 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
31 sp:subject spin:_arg1 31 sp:subject spin:_arg1
32 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ; 32 + ] [ rdf:type sp:NamedGraph ;
33 + sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ;
33 sp:predicate rdf:type ; 34 sp:predicate rdf:type ;
34 sp:subject 35 sp:subject
35 [ sp:varName "productionFlowWhole"^^xsd:string 36 [ sp:varName "productionFlowWhole"^^xsd:string
...@@ -52,6 +53,8 @@ ...@@ -52,6 +53,8 @@
52 sp:subject 53 sp:subject
53 [ sp:varName "productionFlowFacility"^^xsd:string 54 [ sp:varName "productionFlowFacility"^^xsd:string
54 ] 55 ]
56 + ]) ;
57 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
55 ]) 58 ])
56 ] ; 59 ] ;
57 spin:constraint 60 spin:constraint
......