data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
891412ea 1 parent b5c967c8

Added use of GRAPH <http://www.reportinghub.no/data/erh> for all production volume data

Inline Side-by-side
Showing 2 changed files with 18 additions and 17 deletions
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
13 @prefix afn: <http://jena.hpl.hp.com/ARQ/function#> . 13 @prefix afn: <http://jena.hpl.hp.com/ARQ/function#> .
14 @prefix arg: <http://spinrdf.org/arg#> . 14 @prefix arg: <http://spinrdf.org/arg#> .
15 @prefix dc: <http://purl.org/dc/elements/1.1/> . 15 @prefix dc: <http://purl.org/dc/elements/1.1/> .
16 +@prefix erhdata: <http://www.reportinghub.no/data/erh/> .
16 @prefix fn: <http://www.w3.org/2005/xpath-functions#> . 17 @prefix fn: <http://www.w3.org/2005/xpath-functions#> .
17 @prefix npdata: <http://www.reportinghub.no/np/data/> . 18 @prefix npdata: <http://www.reportinghub.no/np/data/> .
18 @prefix owl: <http://www.w3.org/2002/07/owl#> . 19 @prefix owl: <http://www.w3.org/2002/07/owl#> .
...@@ -162,7 +163,7 @@ npdata:npd ...@@ -162,7 +163,7 @@ npdata:npd
162 <http://www.reportinghub.no/spin/rh> 163 <http://www.reportinghub.no/spin/rh>
163 rdf:type owl:Ontology ; 164 rdf:type owl:Ontology ;
164 rdfs:comment "A collection of SPIN functions and templates to support working with the ReportingHub schemas."^^xsd:string ; 165 rdfs:comment "A collection of SPIN functions and templates to support working with the ReportingHub schemas."^^xsd:string ;
165 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://topbraid.org/spin/spinmapl> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/np/schema/1.0/npd> , <http://www.reportinghub.no/ep/schema/1.0/erhfacts> , <http://www.reportinghub.no/system/schema/reporting> , <http://www.linkedmodel.org/schema/dtype> ; 166 + owl:imports <http://spinrdf.org/spin> , <http://topbraid.org/spin/spinmapl> , <http://www.linkedmodel.org/schema/dtype> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/erhfacts> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/np/schema/1.0/npd> , <http://www.reportinghub.no/system/schema/reporting> ;
166 owl:versionInfo "0.1.1"^^xsd:string . 167 owl:versionInfo "0.1.1"^^xsd:string .
167 168
168 rhspin:DDRTableTemplates 169 rhspin:DDRTableTemplates
...@@ -1767,14 +1768,14 @@ rhspin:flowUidIsValid ...@@ -1767,14 +1768,14 @@ rhspin:flowUidIsValid
1767 ] ; 1768 ] ;
1768 spin:constraint 1769 spin:constraint
1769 [ rdf:type spl:Argument ; 1770 [ rdf:type spl:Argument ;
1770 - rdfs:comment "This is the uidRef attribute value of the instance element."^^xsd:string ; 1771 + rdfs:comment "This is the uid attribute value of the flow element."^^xsd:string ;
1771 - spl:predicate arg:uidRef ; 1772 + spl:predicate arg:flowUid ;
1772 spl:valueType xsd:string 1773 spl:valueType xsd:string
1773 ] ; 1774 ] ;
1774 spin:constraint 1775 spin:constraint
1775 [ rdf:type spl:Argument ; 1776 [ rdf:type spl:Argument ;
1776 - rdfs:comment "This is the uid attribute value of the flow element."^^xsd:string ; 1777 + rdfs:comment "This is the uidRef attribute value of the instance element."^^xsd:string ;
1777 - spl:predicate arg:flowUid ; 1778 + spl:predicate arg:uidRef ;
1778 spl:valueType xsd:string 1779 spl:valueType xsd:string
1779 ] ; 1780 ] ;
1780 spin:returnType xsd:boolean . 1781 spin:returnType xsd:boolean .
...@@ -2553,17 +2554,17 @@ rhspin:npdIndividualById ...@@ -2553,17 +2554,17 @@ rhspin:npdIndividualById
2553 ] ; 2554 ] ;
2554 spin:constraint 2555 spin:constraint
2555 [ rdf:type spl:Argument ; 2556 [ rdf:type spl:Argument ;
2557 + rdfs:comment "The NPD id to match."^^xsd:string ;
2558 + spl:predicate arg:id ;
2559 + spl:valueType xsd:string
2560 + ] ;
2561 + spin:constraint
2562 + [ rdf:type spl:Argument ;
2556 rdfs:comment "The rdf:type that the result must have."^^xsd:string ; 2563 rdfs:comment "The rdf:type that the result must have."^^xsd:string ;
2557 spl:optional "true"^^xsd:boolean ; 2564 spl:optional "true"^^xsd:boolean ;
2558 spl:predicate arg:type ; 2565 spl:predicate arg:type ;
2559 spl:valueType rdfs:Class 2566 spl:valueType rdfs:Class
2560 ] ; 2567 ] ;
2561 - spin:constraint
2562 - [ rdf:type spl:Argument ;
2563 - rdfs:comment "The NPD id to match."^^xsd:string ;
2564 - spl:predicate arg:id ;
2565 - spl:valueType xsd:string
2566 - ] ;
2567 spin:returnType <http://www.reportinghub.no/np/schema/npd#Individual> . 2568 spin:returnType <http://www.reportinghub.no/np/schema/npd#Individual> .
2568 2569
2569 rhspin:npdIndividualByName 2570 rhspin:npdIndividualByName
...@@ -2628,17 +2629,17 @@ rhspin:npdIndividualByName ...@@ -2628,17 +2629,17 @@ rhspin:npdIndividualByName
2628 ] ; 2629 ] ;
2629 spin:constraint 2630 spin:constraint
2630 [ rdf:type spl:Argument ; 2631 [ rdf:type spl:Argument ;
2632 + rdfs:comment "The NPD name to match."^^xsd:string ;
2633 + spl:predicate arg:name ;
2634 + spl:valueType xsd:string
2635 + ] ;
2636 + spin:constraint
2637 + [ rdf:type spl:Argument ;
2631 rdfs:comment "The rdf:type that the result must have."^^xsd:string ; 2638 rdfs:comment "The rdf:type that the result must have."^^xsd:string ;
2632 spl:optional "true"^^xsd:boolean ; 2639 spl:optional "true"^^xsd:boolean ;
2633 spl:predicate arg:type ; 2640 spl:predicate arg:type ;
2634 spl:valueType rdfs:Class 2641 spl:valueType rdfs:Class
2635 ] ; 2642 ] ;
2636 - spin:constraint
2637 - [ rdf:type spl:Argument ;
2638 - rdfs:comment "The NPD name to match."^^xsd:string ;
2639 - spl:predicate arg:name ;
2640 - spl:valueType xsd:string
2641 - ] ;
2642 spin:returnType <http://www.reportinghub.no/np/schema/npd#Individual> . 2643 spin:returnType <http://www.reportinghub.no/np/schema/npd#Individual> .
2643 2644
2644 rhspin:npdName 2645 rhspin:npdName
......