David Price

Fixed dup due to ep-core:name and npd:name for some items.

......@@ -12,6 +12,7 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix rhspin: <http://www.reportinghub.no/spin/rh#> .
@prefix smf: <http://topbraid.org/sparqlmotionfunctions#> .
@prefix sp: <http://spinrdf.org/sp#> .
@prefix spin: <http://spinrdf.org/spin#> .
@prefix spl: <http://spinrdf.org/spl#> .
......@@ -4175,17 +4176,39 @@ dpr-tables:ProductionVolumes
sp:subject
[ sp:varName "flowWhole"^^xsd:string
]
] [ rdf:type sp:TriplePath ;
sp:object
[ sp:varName "flowInOutFacilityName"^^xsd:string
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "flowInOutFacilityNameNPD"^^xsd:string
] ;
sp:path [ rdf:type sp:AltPath ;
sp:path1 <http://www.reportinghub.no/ep/schema/core#name> ;
sp:path2 <http://www.reportinghub.no/np/schema/npd#name>
sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
sp:subject
[ sp:varName "flowInOutFacility"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "flowInOutFacilityNameEP"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
sp:subject
[ sp:varName "flowInOutFacility"^^xsd:string
]
])
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type smf:if ;
sp:arg1 [ rdf:type smf:isBound ;
sp:arg1 [ sp:varName "flowInOutFacilityNameNPD"^^xsd:string
]
] ;
sp:arg2 [ sp:varName "flowInOutFacilityNameNPD"^^xsd:string
] ;
sp:arg3 [ sp:varName "flowInOutFacilityNameEP"^^xsd:string
]
] ;
sp:variable
[ sp:varName "flowInOutFacilityName"^^xsd:string
]
] [ sp:object
[ sp:varName "flowPurpose"^^xsd:string
] ;
......@@ -4239,12 +4262,19 @@ dpr-tables:ProductionVolumes
sp:subject
[ sp:varName "flow"^^xsd:string
]
] [ sp:object
[ sp:varName "density"^^xsd:string
] ;
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Temperature> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "flow"^^xsd:string
[ sp:varName "temperature"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "temperature"^^xsd:string
]
] ;
sp:variable
[ sp:varName "temperatureValue"^^xsd:string
]
] [ sp:object
[ sp:varName "pressure"^^xsd:string
......@@ -4258,33 +4288,26 @@ dpr-tables:ProductionVolumes
sp:subject
[ sp:varName "pressure"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Density> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "density"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Temperature> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "temperature"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "temperature"^^xsd:string
sp:arg1 [ sp:varName "pressure"^^xsd:string
]
] ;
sp:variable
[ sp:varName "temperatureValue"^^xsd:string
[ sp:varName "pressureValue"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "pressure"^^xsd:string
] [ sp:object <http://www.reportinghub.no/ep/schema/core#Density> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "density"^^xsd:string
]
] [ sp:object
[ sp:varName "density"^^xsd:string
] ;
sp:variable
[ sp:varName "pressureValue"^^xsd:string
sp:predicate rdf:type ;
sp:subject
[ sp:varName "flow"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
......
......@@ -81,7 +81,7 @@ WHERE {
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionVolumes" />
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductFlows" />
/>
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:InjectionVolumes" />
<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductFlowsInjection" />
......