Showing
2 changed files
with
35 additions
and
24 deletions
... | @@ -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,6 +359,8 @@ mpr-tables:Cargo | ... | @@ -348,6 +359,8 @@ mpr-tables:Cargo |
348 | sp:subject | 359 | sp:subject |
349 | [ sp:varName "productionFlowWhole"^^xsd:string | 360 | [ sp:varName "productionFlowWhole"^^xsd:string |
350 | ] | 361 | ] |
362 | + ]) ; | ||
363 | + sp:graphNameNode <http://www.reportinghub.no/data/erh> | ||
351 | ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ; | 364 | ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ; |
352 | sp:predicate rdf:type ; | 365 | sp:predicate rdf:type ; |
353 | sp:subject | 366 | sp:subject |
... | @@ -360,8 +373,6 @@ mpr-tables:Cargo | ... | @@ -360,8 +373,6 @@ mpr-tables:Cargo |
360 | sp:subject | 373 | sp:subject |
361 | [ sp:varName "productionFlowDefinitionType"^^xsd:string | 374 | [ sp:varName "productionFlowDefinitionType"^^xsd:string |
362 | ] | 375 | ] |
363 | - ]) ; | ||
364 | - sp:graphNameNode <http://www.reportinghub.no/data/erh> | ||
365 | ]) | 376 | ]) |
366 | ] [ rdf:type sp:Optional ; | 377 | ] [ rdf:type sp:Optional ; |
367 | sp:elements ([ sp:object | 378 | sp:elements ([ sp:object |
... | @@ -2636,6 +2647,8 @@ mpr-tables:ProductionSales | ... | @@ -2636,6 +2647,8 @@ mpr-tables:ProductionSales |
2636 | sp:subject | 2647 | sp:subject |
2637 | [ sp:varName "productionFlowWhole"^^xsd:string | 2648 | [ sp:varName "productionFlowWhole"^^xsd:string |
2638 | ] | 2649 | ] |
2650 | + ]) ; | ||
2651 | + sp:graphNameNode <http://www.reportinghub.no/data/erh> | ||
2639 | ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ; | 2652 | ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ; |
2640 | sp:predicate rdf:type ; | 2653 | sp:predicate rdf:type ; |
2641 | sp:subject | 2654 | sp:subject |
... | @@ -2648,8 +2661,6 @@ mpr-tables:ProductionSales | ... | @@ -2648,8 +2661,6 @@ mpr-tables:ProductionSales |
2648 | sp:subject | 2661 | sp:subject |
2649 | [ sp:varName "productionFlowPurposeType"^^xsd:string | 2662 | [ sp:varName "productionFlowPurposeType"^^xsd:string |
2650 | ] | 2663 | ] |
2651 | - ]) ; | ||
2652 | - sp:graphNameNode <http://www.reportinghub.no/data/erh> | ||
2653 | ]) | 2664 | ]) |
2654 | ] [ rdf:type sp:Optional ; | 2665 | ] [ rdf:type sp:Optional ; |
2655 | sp:elements ([ sp:object | 2666 | sp:elements ([ sp:object |
... | @@ -2702,6 +2713,8 @@ mpr-tables:ProductionSales | ... | @@ -2702,6 +2713,8 @@ mpr-tables:ProductionSales |
2702 | sp:subject | 2713 | sp:subject |
2703 | [ sp:varName "productionFlowWhole"^^xsd:string | 2714 | [ sp:varName "productionFlowWhole"^^xsd:string |
2704 | ] | 2715 | ] |
2716 | + ]) ; | ||
2717 | + sp:graphNameNode <http://www.reportinghub.no/data/erh> | ||
2705 | ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ; | 2718 | ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ; |
2706 | sp:predicate rdf:type ; | 2719 | sp:predicate rdf:type ; |
2707 | sp:subject | 2720 | sp:subject |
... | @@ -2714,8 +2727,6 @@ mpr-tables:ProductionSales | ... | @@ -2714,8 +2727,6 @@ mpr-tables:ProductionSales |
2714 | sp:subject | 2727 | sp:subject |
2715 | [ sp:varName "productionFlowDefinitionType"^^xsd:string | 2728 | [ sp:varName "productionFlowDefinitionType"^^xsd:string |
2716 | ] | 2729 | ] |
2717 | - ]) ; | ||
2718 | - sp:graphNameNode <http://www.reportinghub.no/data/erh> | ||
2719 | ]) | 2730 | ]) |
2720 | ]) | 2731 | ]) |
2721 | ] ; | 2732 | ] ; |
... | @@ -3479,7 +3490,8 @@ mpr-tables:WellProductionFlows | ... | @@ -3479,7 +3490,8 @@ 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 ; |
3494 | + sp:elements ([ rdf:type sp:Filter ; | ||
3483 | sp:expression | 3495 | sp:expression |
3484 | [ rdf:type sp:notExists ; | 3496 | [ rdf:type sp:notExists ; |
3485 | sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#SaleableFlow> ; | 3497 | sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#SaleableFlow> ; |
... | @@ -3516,6 +3528,8 @@ mpr-tables:WellProductionFlows | ... | @@ -3516,6 +3528,8 @@ mpr-tables:WellProductionFlows |
3516 | sp:subject | 3528 | sp:subject |
3517 | [ sp:varName "productionFlowWhole"^^xsd:string | 3529 | [ sp:varName "productionFlowWhole"^^xsd:string |
3518 | ] | 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,6 +3682,7 @@ mpr-tables:WellProductionFlows | ... | @@ -3668,6 +3682,7 @@ 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 ; |
3685 | + sp:elements ([ rdf:type sp:NamedGraph ; | ||
3671 | sp:elements ([ sp:object | 3686 | sp:elements ([ sp:object |
3672 | [ sp:varName "productionFlowPurposeType"^^xsd:string | 3687 | [ sp:varName "productionFlowPurposeType"^^xsd:string |
3673 | ] ; | 3688 | ] ; |
... | @@ -3675,6 +3690,8 @@ mpr-tables:WellProductionFlows | ... | @@ -3675,6 +3690,8 @@ mpr-tables:WellProductionFlows |
3675 | sp:subject | 3690 | sp:subject |
3676 | [ sp:varName "productionFlowWhole"^^xsd:string | 3691 | [ sp:varName "productionFlowWhole"^^xsd:string |
3677 | ] | 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,6 +3748,7 @@ mpr-tables:WellProductionFlows | ... | @@ -3731,6 +3748,7 @@ mpr-tables:WellProductionFlows |
3731 | ] | 3748 | ] |
3732 | ]) | 3749 | ]) |
3733 | ] [ rdf:type sp:Optional ; | 3750 | ] [ rdf:type sp:Optional ; |
3751 | + sp:elements ([ rdf:type sp:NamedGraph ; | ||
3734 | sp:elements ([ sp:object | 3752 | sp:elements ([ sp:object |
3735 | [ sp:varName "productionFlowDefinitionType"^^xsd:string | 3753 | [ sp:varName "productionFlowDefinitionType"^^xsd:string |
3736 | ] ; | 3754 | ] ; |
... | @@ -3738,6 +3756,8 @@ mpr-tables:WellProductionFlows | ... | @@ -3738,6 +3756,8 @@ mpr-tables:WellProductionFlows |
3738 | sp:subject | 3756 | sp:subject |
3739 | [ sp:varName "productionFlowWhole"^^xsd:string | 3757 | [ sp:varName "productionFlowWhole"^^xsd:string |
3740 | ] | 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,24 +24,17 @@ | ... | @@ -24,24 +24,17 @@ |
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 | 36 | + ]) ; |
44 | - ] | 37 | + sp:graphNameNode <http://www.reportinghub.no/data/erh> |
45 | ] [ rdf:type sp:TriplePath ; | 38 | ] [ rdf:type sp:TriplePath ; |
46 | sp:object | 39 | sp:object |
47 | [ sp:varName "name"^^xsd:string | 40 | [ sp:varName "name"^^xsd:string |
... | @@ -53,8 +46,6 @@ | ... | @@ -53,8 +46,6 @@ |
53 | sp:subject | 46 | sp:subject |
54 | [ sp:varName "productionFlowFacility"^^xsd:string | 47 | [ sp:varName "productionFlowFacility"^^xsd:string |
55 | ] | 48 | ] |
56 | - ]) ; | ||
57 | - sp:graphNameNode <http://www.reportinghub.no/data/erh> | ||
58 | ]) | 49 | ]) |
59 | ] ; | 50 | ] ; |
60 | spin:constraint | 51 | spin:constraint | ... | ... |
-
Please register or login to post a comment