David Price

Fixed facility flow name for cargo

...@@ -79,14 +79,25 @@ mpr-tables:Cargo ...@@ -79,14 +79,25 @@ mpr-tables:Cargo
79 sp:subject 79 sp:subject
80 [ sp:varName "productionFlowWhole"^^xsd:string 80 [ sp:varName "productionFlowWhole"^^xsd:string
81 ] 81 ]
82 + ] [ sp:object
83 + [ sp:varName "productionFlowFacility"^^xsd:string
84 + ] ;
85 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ;
86 + sp:subject
87 + [ sp:varName "productionFlowWhole"^^xsd:string
88 + ]
82 ]) ; 89 ]) ;
83 sp:graphNameNode <http://www.reportinghub.no/data/erh> 90 sp:graphNameNode <http://www.reportinghub.no/data/erh>
84 - ] [ sp:object 91 + ] [ rdf:type sp:TriplePath ;
92 + sp:object
85 [ sp:varName "facilityName"^^xsd:string 93 [ sp:varName "facilityName"^^xsd:string
86 ] ; 94 ] ;
87 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowInOutFacility> ; 95 + sp:path [ rdf:type sp:AltPath ;
96 + sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
97 + sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
98 + ] ;
88 sp:subject 99 sp:subject
89 - [ sp:varName "productionFlowInReportingPeriod"^^xsd:string 100 + [ sp:varName "productionFlowFacility"^^xsd:string
90 ] 101 ]
91 ] [ sp:object 102 ] [ sp:object
92 [ sp:varName "productionFlowMixedPart"^^xsd:string 103 [ sp:varName "productionFlowMixedPart"^^xsd:string
...@@ -348,20 +359,20 @@ mpr-tables:Cargo ...@@ -348,20 +359,20 @@ mpr-tables:Cargo
348 sp:subject 359 sp:subject
349 [ sp:varName "productionFlowWhole"^^xsd:string 360 [ sp:varName "productionFlowWhole"^^xsd:string
350 ] 361 ]
351 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
352 - sp:predicate rdf:type ;
353 - sp:subject
354 - [ sp:varName "productionFlowDefinitionType"^^xsd:string
355 - ]
356 - ] [ sp:object
357 - [ sp:varName "definitionTypeName"^^xsd:string
358 - ] ;
359 - sp:predicate rdfs:label ;
360 - sp:subject
361 - [ sp:varName "productionFlowDefinitionType"^^xsd:string
362 - ]
363 ]) ; 362 ]) ;
364 sp:graphNameNode <http://www.reportinghub.no/data/erh> 363 sp:graphNameNode <http://www.reportinghub.no/data/erh>
364 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
365 + sp:predicate rdf:type ;
366 + sp:subject
367 + [ sp:varName "productionFlowDefinitionType"^^xsd:string
368 + ]
369 + ] [ sp:object
370 + [ sp:varName "definitionTypeName"^^xsd:string
371 + ] ;
372 + sp:predicate rdfs:label ;
373 + sp:subject
374 + [ sp:varName "productionFlowDefinitionType"^^xsd:string
375 + ]
365 ]) 376 ])
366 ] [ rdf:type sp:Optional ; 377 ] [ rdf:type sp:Optional ;
367 sp:elements ([ sp:object 378 sp:elements ([ sp:object
...@@ -2636,20 +2647,20 @@ mpr-tables:ProductionSales ...@@ -2636,20 +2647,20 @@ mpr-tables:ProductionSales
2636 sp:subject 2647 sp:subject
2637 [ sp:varName "productionFlowWhole"^^xsd:string 2648 [ sp:varName "productionFlowWhole"^^xsd:string
2638 ] 2649 ]
2639 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
2640 - sp:predicate rdf:type ;
2641 - sp:subject
2642 - [ sp:varName "productionFlowPurposeType"^^xsd:string
2643 - ]
2644 - ] [ sp:object
2645 - [ sp:varName "purposeTypeName"^^xsd:string
2646 - ] ;
2647 - sp:predicate rdfs:label ;
2648 - sp:subject
2649 - [ sp:varName "productionFlowPurposeType"^^xsd:string
2650 - ]
2651 ]) ; 2650 ]) ;
2652 sp:graphNameNode <http://www.reportinghub.no/data/erh> 2651 sp:graphNameNode <http://www.reportinghub.no/data/erh>
2652 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
2653 + sp:predicate rdf:type ;
2654 + sp:subject
2655 + [ sp:varName "productionFlowPurposeType"^^xsd:string
2656 + ]
2657 + ] [ sp:object
2658 + [ sp:varName "purposeTypeName"^^xsd:string
2659 + ] ;
2660 + sp:predicate rdfs:label ;
2661 + sp:subject
2662 + [ sp:varName "productionFlowPurposeType"^^xsd:string
2663 + ]
2653 ]) 2664 ])
2654 ] [ rdf:type sp:Optional ; 2665 ] [ rdf:type sp:Optional ;
2655 sp:elements ([ sp:object 2666 sp:elements ([ sp:object
...@@ -2702,20 +2713,20 @@ mpr-tables:ProductionSales ...@@ -2702,20 +2713,20 @@ mpr-tables:ProductionSales
2702 sp:subject 2713 sp:subject
2703 [ sp:varName "productionFlowWhole"^^xsd:string 2714 [ sp:varName "productionFlowWhole"^^xsd:string
2704 ] 2715 ]
2705 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
2706 - sp:predicate rdf:type ;
2707 - sp:subject
2708 - [ sp:varName "productionFlowDefinitionType"^^xsd:string
2709 - ]
2710 - ] [ sp:object
2711 - [ sp:varName "definitionTypeName"^^xsd:string
2712 - ] ;
2713 - sp:predicate rdfs:label ;
2714 - sp:subject
2715 - [ sp:varName "productionFlowDefinitionType"^^xsd:string
2716 - ]
2717 ]) ; 2716 ]) ;
2718 sp:graphNameNode <http://www.reportinghub.no/data/erh> 2717 sp:graphNameNode <http://www.reportinghub.no/data/erh>
2718 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
2719 + sp:predicate rdf:type ;
2720 + sp:subject
2721 + [ sp:varName "productionFlowDefinitionType"^^xsd:string
2722 + ]
2723 + ] [ sp:object
2724 + [ sp:varName "definitionTypeName"^^xsd:string
2725 + ] ;
2726 + sp:predicate rdfs:label ;
2727 + sp:subject
2728 + [ sp:varName "productionFlowDefinitionType"^^xsd:string
2729 + ]
2719 ]) 2730 ])
2720 ]) 2731 ])
2721 ] ; 2732 ] ;
...@@ -3479,43 +3490,46 @@ mpr-tables:WellProductionFlows ...@@ -3479,43 +3490,46 @@ mpr-tables:WellProductionFlows
3479 sp:subject 3490 sp:subject
3480 [ sp:varName "productionFlowWhole"^^xsd:string 3491 [ sp:varName "productionFlowWhole"^^xsd:string
3481 ] 3492 ]
3482 - ] [ rdf:type sp:Filter ; 3493 + ] [ rdf:type sp:NamedGraph ;
3483 - sp:expression 3494 + sp:elements ([ rdf:type sp:Filter ;
3484 - [ rdf:type sp:notExists ; 3495 + sp:expression
3485 - sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#SaleableFlow> ; 3496 + [ rdf:type sp:notExists ;
3486 - sp:predicate rdf:type ; 3497 + sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#SaleableFlow> ;
3487 - sp:subject 3498 + sp:predicate rdf:type ;
3488 - [ sp:varName "productionFlowWhole"^^xsd:string 3499 + sp:subject
3489 - ] 3500 + [ sp:varName "productionFlowWhole"^^xsd:string
3490 - ]) 3501 + ]
3491 - ] 3502 + ])
3492 - ] [ rdf:type sp:Filter ; 3503 + ]
3493 - sp:expression 3504 + ] [ rdf:type sp:Filter ;
3494 - [ rdf:type sp:notExists ; 3505 + sp:expression
3495 - sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#HydrocarbonAccountingFlow> ; 3506 + [ rdf:type sp:notExists ;
3496 - sp:predicate rdf:type ; 3507 + sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#HydrocarbonAccountingFlow> ;
3497 - sp:subject 3508 + sp:predicate rdf:type ;
3498 - [ sp:varName "productionFlowWhole"^^xsd:string 3509 + sp:subject
3499 - ] 3510 + [ sp:varName "productionFlowWhole"^^xsd:string
3500 - ]) 3511 + ]
3501 - ] 3512 + ])
3502 - ] [ rdf:type sp:Filter ; 3513 + ]
3503 - sp:expression 3514 + ] [ rdf:type sp:Filter ;
3504 - [ rdf:type sp:notExists ; 3515 + sp:expression
3505 - sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#FlowToSale> ; 3516 + [ rdf:type sp:notExists ;
3506 - sp:predicate rdf:type ; 3517 + sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#FlowToSale> ;
3507 - sp:subject 3518 + sp:predicate rdf:type ;
3508 - [ sp:varName "productionFlowWhole"^^xsd:string 3519 + sp:subject
3509 - ] 3520 + [ sp:varName "productionFlowWhole"^^xsd:string
3510 - ]) 3521 + ]
3511 - ] 3522 + ])
3512 - ] [ sp:object 3523 + ]
3513 - [ sp:varName "productionFlowFacility"^^xsd:string 3524 + ] [ sp:object
3514 - ] ; 3525 + [ sp:varName "productionFlowFacility"^^xsd:string
3515 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ; 3526 + ] ;
3516 - sp:subject 3527 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ;
3517 - [ sp:varName "productionFlowWhole"^^xsd:string 3528 + sp:subject
3518 - ] 3529 + [ sp:varName "productionFlowWhole"^^xsd:string
3530 + ]
3531 + ]) ;
3532 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
3519 ] [ sp:object <http://www.reportinghub.no/ep/schema/well#WellBore> ; 3533 ] [ sp:object <http://www.reportinghub.no/ep/schema/well#WellBore> ;
3520 sp:predicate rdf:type ; 3534 sp:predicate rdf:type ;
3521 sp:subject 3535 sp:subject
...@@ -3668,13 +3682,16 @@ mpr-tables:WellProductionFlows ...@@ -3668,13 +3682,16 @@ mpr-tables:WellProductionFlows
3668 [ sp:varName "productFlowWhole"^^xsd:string 3682 [ sp:varName "productFlowWhole"^^xsd:string
3669 ] 3683 ]
3670 ] [ rdf:type sp:Optional ; 3684 ] [ rdf:type sp:Optional ;
3671 - sp:elements ([ sp:object 3685 + sp:elements ([ rdf:type sp:NamedGraph ;
3672 - [ sp:varName "productionFlowPurposeType"^^xsd:string 3686 + sp:elements ([ sp:object
3673 - ] ; 3687 + [ sp:varName "productionFlowPurposeType"^^xsd:string
3674 - sp:predicate rdf:type ; 3688 + ] ;
3675 - sp:subject 3689 + sp:predicate rdf:type ;
3676 - [ sp:varName "productionFlowWhole"^^xsd:string 3690 + sp:subject
3677 - ] 3691 + [ sp:varName "productionFlowWhole"^^xsd:string
3692 + ]
3693 + ]) ;
3694 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
3678 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ; 3695 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
3679 sp:predicate rdf:type ; 3696 sp:predicate rdf:type ;
3680 sp:subject 3697 sp:subject
...@@ -3731,13 +3748,16 @@ mpr-tables:WellProductionFlows ...@@ -3731,13 +3748,16 @@ mpr-tables:WellProductionFlows
3731 ] 3748 ]
3732 ]) 3749 ])
3733 ] [ rdf:type sp:Optional ; 3750 ] [ rdf:type sp:Optional ;
3734 - sp:elements ([ sp:object 3751 + sp:elements ([ rdf:type sp:NamedGraph ;
3735 - [ sp:varName "productionFlowDefinitionType"^^xsd:string 3752 + sp:elements ([ sp:object
3736 - ] ; 3753 + [ sp:varName "productionFlowDefinitionType"^^xsd:string
3737 - sp:predicate rdf:type ; 3754 + ] ;
3738 - sp:subject 3755 + sp:predicate rdf:type ;
3739 - [ sp:varName "productionFlowWhole"^^xsd:string 3756 + sp:subject
3740 - ] 3757 + [ sp:varName "productionFlowWhole"^^xsd:string
3758 + ]
3759 + ]) ;
3760 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
3741 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ; 3761 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
3742 sp:predicate rdf:type ; 3762 sp:predicate rdf:type ;
3743 sp:subject 3763 sp:subject
......
...@@ -24,37 +24,28 @@ ...@@ -24,37 +24,28 @@
24 [ rdf:type sp:Select ; 24 [ rdf:type sp:Select ;
25 sp:resultVariables ([ sp:varName "name"^^xsd:string 25 sp:resultVariables ([ sp:varName "name"^^xsd:string
26 ]) ; 26 ]) ;
27 - sp:where ([ sp:object 27 + sp:where ([ rdf:type sp:NamedGraph ;
28 - [ sp:varName "productionFlowWhole"^^xsd:string
29 - ] ;
30 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
31 - sp:subject spin:_arg1
32 - ] [ rdf:type sp:NamedGraph ;
33 sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ; 28 sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ;
34 sp:predicate rdf:type ; 29 sp:predicate rdf:type ;
35 - sp:subject 30 + sp:subject spin:_arg1
36 - [ sp:varName "productionFlowWhole"^^xsd:string
37 - ]
38 ] [ sp:object 31 ] [ sp:object
39 [ sp:varName "productionFlowFacility"^^xsd:string 32 [ sp:varName "productionFlowFacility"^^xsd:string
40 ] ; 33 ] ;
41 sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ; 34 sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ;
42 - sp:subject 35 + sp:subject spin:_arg1
43 - [ sp:varName "productionFlowWhole"^^xsd:string
44 - ]
45 - ] [ rdf:type sp:TriplePath ;
46 - sp:object
47 - [ sp:varName "name"^^xsd:string
48 - ] ;
49 - sp:path [ rdf:type sp:AltPath ;
50 - sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
51 - sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
52 - ] ;
53 - sp:subject
54 - [ sp:varName "productionFlowFacility"^^xsd:string
55 - ]
56 ]) ; 36 ]) ;
57 sp:graphNameNode <http://www.reportinghub.no/data/erh> 37 sp:graphNameNode <http://www.reportinghub.no/data/erh>
38 + ] [ rdf:type sp:TriplePath ;
39 + sp:object
40 + [ sp:varName "name"^^xsd:string
41 + ] ;
42 + sp:path [ rdf:type sp:AltPath ;
43 + sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
44 + sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
45 + ] ;
46 + sp:subject
47 + [ sp:varName "productionFlowFacility"^^xsd:string
48 + ]
58 ]) 49 ])
59 ] ; 50 ] ;
60 spin:constraint 51 spin:constraint
......