David Price

Merge branch 'trygraph'

......@@ -79,14 +79,25 @@ mpr-tables:Cargo
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
] [ sp:object
[ sp:varName "productionFlowFacility"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ;
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ sp:object
] [ rdf:type sp:TriplePath ;
sp:object
[ sp:varName "facilityName"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowInOutFacility> ;
sp:path [ rdf:type sp:AltPath ;
sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
] ;
sp:subject
[ sp:varName "productionFlowInReportingPeriod"^^xsd:string
[ sp:varName "productionFlowFacility"^^xsd:string
]
] [ sp:object
[ sp:varName "productionFlowMixedPart"^^xsd:string
......@@ -348,6 +359,8 @@ mpr-tables:Cargo
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
sp:predicate rdf:type ;
sp:subject
......@@ -360,8 +373,6 @@ mpr-tables:Cargo
sp:subject
[ sp:varName "productionFlowDefinitionType"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
......@@ -2636,6 +2647,8 @@ mpr-tables:ProductionSales
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
sp:predicate rdf:type ;
sp:subject
......@@ -2648,8 +2661,6 @@ mpr-tables:ProductionSales
sp:subject
[ sp:varName "productionFlowPurposeType"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
......@@ -2702,6 +2713,8 @@ mpr-tables:ProductionSales
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
sp:predicate rdf:type ;
sp:subject
......@@ -2714,8 +2727,6 @@ mpr-tables:ProductionSales
sp:subject
[ sp:varName "productionFlowDefinitionType"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
])
])
] ;
......@@ -3479,7 +3490,8 @@ mpr-tables:WellProductionFlows
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
] [ rdf:type sp:Filter ;
] [ rdf:type sp:NamedGraph ;
sp:elements ([ rdf:type sp:Filter ;
sp:expression
[ rdf:type sp:notExists ;
sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#SaleableFlow> ;
......@@ -3516,6 +3528,8 @@ mpr-tables:WellProductionFlows
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ sp:object <http://www.reportinghub.no/ep/schema/well#WellBore> ;
sp:predicate rdf:type ;
sp:subject
......@@ -3668,6 +3682,7 @@ mpr-tables:WellProductionFlows
[ sp:varName "productFlowWhole"^^xsd:string
]
] [ rdf:type sp:Optional ;
sp:elements ([ rdf:type sp:NamedGraph ;
sp:elements ([ sp:object
[ sp:varName "productionFlowPurposeType"^^xsd:string
] ;
......@@ -3675,6 +3690,8 @@ mpr-tables:WellProductionFlows
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
sp:predicate rdf:type ;
sp:subject
......@@ -3731,6 +3748,7 @@ mpr-tables:WellProductionFlows
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ rdf:type sp:NamedGraph ;
sp:elements ([ sp:object
[ sp:varName "productionFlowDefinitionType"^^xsd:string
] ;
......@@ -3738,6 +3756,8 @@ mpr-tables:WellProductionFlows
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
sp:predicate rdf:type ;
sp:subject
......
......@@ -24,24 +24,17 @@
[ rdf:type sp:Select ;
sp:resultVariables ([ sp:varName "name"^^xsd:string
]) ;
sp:where ([ sp:object
[ sp:varName "productionFlowWhole"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
sp:subject spin:_arg1
] [ rdf:type sp:NamedGraph ;
sp:where ([ rdf:type sp:NamedGraph ;
sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductionFlow> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
sp:subject spin:_arg1
] [ sp:object
[ sp:varName "productionFlowFacility"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ;
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
sp:subject spin:_arg1
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ rdf:type sp:TriplePath ;
sp:object
[ sp:varName "name"^^xsd:string
......@@ -53,8 +46,6 @@
sp:subject
[ sp:varName "productionFlowFacility"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
])
] ;
spin:constraint
......