data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Leal
88234d74 1 parent 34cd068c

Made the generation of the MPR report URI more robust.

Expand all
Inline Side-by-side
Showing 8 changed files with 55 additions and 34 deletions
1 -# Saved by TopBraid on Mon Dec 19 18:49:44 GMT 2011
2 # baseURI: http://www.reportinghub.no/ep/schema/1.0/production-report 1 # baseURI: http://www.reportinghub.no/ep/schema/1.0/production-report
3 # imports: http://www.reportinghub.no/ep/schema/1.0/report 2 # imports: http://www.reportinghub.no/ep/schema/1.0/report
4 # imports: http://www.reportinghub.no/np/schema/1.0/npd 3 # imports: http://www.reportinghub.no/np/schema/1.0/npd
...@@ -11,11 +10,11 @@ ...@@ -11,11 +10,11 @@
11 10
12 <http://www.reportinghub.no/ep/schema/1.0/production-report> 11 <http://www.reportinghub.no/ep/schema/1.0/production-report>
13 rdf:type owl:Ontology ; 12 rdf:type owl:Ontology ;
14 - owl:imports <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/np/schema/1.0/npd> ; 13 + owl:imports <http://www.reportinghub.no/np/schema/1.0/npd> , <http://www.reportinghub.no/ep/schema/1.0/report> ;
15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 14 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
16 15
17 ep-prodreport:DailyProductVolumeReport 16 ep-prodreport:DailyProductVolumeReport
18 - rdf:type owl:Class , ep-prodreport:ProductVolumeReportPeriodType ; 17 + rdf:type ep-prodreport:ProductVolumeReportPeriodType , owl:Class ;
19 rdfs:label "daily product volume report"^^xsd:string ; 18 rdfs:label "daily product volume report"^^xsd:string ;
20 rdfs:subClassOf ep-prodreport:ProductVolumeReport . 19 rdfs:subClassOf ep-prodreport:ProductVolumeReport .
21 20
...@@ -30,7 +29,7 @@ ep-prodreport:FluidSampleReport ...@@ -30,7 +29,7 @@ ep-prodreport:FluidSampleReport
30 rdfs:subClassOf <http://www.reportinghub.no/ep/schema/report#Report> . 29 rdfs:subClassOf <http://www.reportinghub.no/ep/schema/report#Report> .
31 30
32 ep-prodreport:MonthlyProductVolumeReport 31 ep-prodreport:MonthlyProductVolumeReport
33 - rdf:type ep-prodreport:ProductVolumeReportPeriodType , owl:Class ; 32 + rdf:type owl:Class , ep-prodreport:ProductVolumeReportPeriodType ;
34 rdfs:label " monthly product volume report"^^xsd:string ; 33 rdfs:label " monthly product volume report"^^xsd:string ;
35 rdfs:subClassOf ep-prodreport:ProductVolumeReport . 34 rdfs:subClassOf ep-prodreport:ProductVolumeReport .
36 35
...@@ -45,12 +44,12 @@ ep-prodreport:ProductVolumeReport ...@@ -45,12 +44,12 @@ ep-prodreport:ProductVolumeReport
45 rdfs:subClassOf ep-prodreport:ProductionReport . 44 rdfs:subClassOf ep-prodreport:ProductionReport .
46 45
47 ep-prodreport:ProductVolumeReportForInstant 46 ep-prodreport:ProductVolumeReportForInstant
48 - rdf:type owl:Class , ep-prodreport:ProductVolumeReportPeriodType ; 47 + rdf:type ep-prodreport:ProductVolumeReportPeriodType , owl:Class ;
49 rdfs:label "product volume report for instant"^^xsd:string ; 48 rdfs:label "product volume report for instant"^^xsd:string ;
50 rdfs:subClassOf ep-prodreport:ProductVolumeReport . 49 rdfs:subClassOf ep-prodreport:ProductVolumeReport .
51 50
52 ep-prodreport:ProductVolumeReportMonthToDate 51 ep-prodreport:ProductVolumeReportMonthToDate
53 - rdf:type owl:Class , ep-prodreport:ProductVolumeReportPeriodType ; 52 + rdf:type ep-prodreport:ProductVolumeReportPeriodType , owl:Class ;
54 rdfs:label " product volume report month to date"^^xsd:string ; 53 rdfs:label " product volume report month to date"^^xsd:string ;
55 rdfs:subClassOf ep-prodreport:ProductVolumeReport . 54 rdfs:subClassOf ep-prodreport:ProductVolumeReport .
56 55
...@@ -60,7 +59,7 @@ ep-prodreport:ProductVolumeReportPeriodType ...@@ -60,7 +59,7 @@ ep-prodreport:ProductVolumeReportPeriodType
60 rdfs:subClassOf owl:Class . 59 rdfs:subClassOf owl:Class .
61 60
62 ep-prodreport:ProductVolumeReportYearToDate 61 ep-prodreport:ProductVolumeReportYearToDate
63 - rdf:type owl:Class , ep-prodreport:ProductVolumeReportPeriodType ; 62 + rdf:type ep-prodreport:ProductVolumeReportPeriodType , owl:Class ;
64 rdfs:label " product volume report year to date"^^xsd:string ; 63 rdfs:label " product volume report year to date"^^xsd:string ;
65 rdfs:subClassOf ep-prodreport:ProductVolumeReport . 64 rdfs:subClassOf ep-prodreport:ProductVolumeReport .
66 65
...@@ -79,8 +78,8 @@ ep-prodreport:ReportAliasIdentifier ...@@ -79,8 +78,8 @@ ep-prodreport:ReportAliasIdentifier
79 rdfs:subClassOf owl:Thing ; 78 rdfs:subClassOf owl:Thing ;
80 rdfs:subClassOf 79 rdfs:subClassOf
81 [ rdf:type owl:Restriction ; 80 [ rdf:type owl:Restriction ;
82 - owl:cardinality "1"^^xsd:nonNegativeInteger ; 81 + owl:minCardinality "1"^^xsd:nonNegativeInteger ;
83 - owl:onProperty ep-prodreport:isAliasFor 82 + owl:onProperty ep-prodreport:aliasName
84 ] ; 83 ] ;
85 rdfs:subClassOf 84 rdfs:subClassOf
86 [ rdf:type owl:Restriction ; 85 [ rdf:type owl:Restriction ;
...@@ -89,17 +88,17 @@ ep-prodreport:ReportAliasIdentifier ...@@ -89,17 +88,17 @@ ep-prodreport:ReportAliasIdentifier
89 ] ; 88 ] ;
90 rdfs:subClassOf 89 rdfs:subClassOf
91 [ rdf:type owl:Restriction ; 90 [ rdf:type owl:Restriction ;
92 - owl:minCardinality "1"^^xsd:nonNegativeInteger ; 91 + owl:cardinality "1"^^xsd:nonNegativeInteger ;
93 - owl:onProperty ep-prodreport:aliasName 92 + owl:onProperty ep-prodreport:isAliasFor
94 ] . 93 ] .
95 94
96 ep-prodreport:WeeklyProductVolumeReport 95 ep-prodreport:WeeklyProductVolumeReport
97 - rdf:type owl:Class , ep-prodreport:ProductVolumeReportPeriodType ; 96 + rdf:type ep-prodreport:ProductVolumeReportPeriodType , owl:Class ;
98 rdfs:label "weekly product volume report"^^xsd:string ; 97 rdfs:label "weekly product volume report"^^xsd:string ;
99 rdfs:subClassOf ep-prodreport:ProductVolumeReport . 98 rdfs:subClassOf ep-prodreport:ProductVolumeReport .
100 99
101 ep-prodreport:YearlyProductVolumeReport 100 ep-prodreport:YearlyProductVolumeReport
102 - rdf:type owl:Class , ep-prodreport:ProductVolumeReportPeriodType ; 101 + rdf:type ep-prodreport:ProductVolumeReportPeriodType , owl:Class ;
103 rdfs:label "yearly product volume report"^^xsd:string ; 102 rdfs:label "yearly product volume report"^^xsd:string ;
104 rdfs:subClassOf ep-prodreport:ProductVolumeReport . 103 rdfs:subClassOf ep-prodreport:ProductVolumeReport .
105 104
...@@ -124,3 +123,8 @@ ep-prodreport:disclaimer ...@@ -124,3 +123,8 @@ ep-prodreport:disclaimer
124 ep-prodreport:isAliasFor 123 ep-prodreport:isAliasFor
125 rdf:type owl:ObjectProperty ; 124 rdf:type owl:ObjectProperty ;
126 rdfs:range <http://www.reportinghub.no/np/schema/npd#Individual> . 125 rdfs:range <http://www.reportinghub.no/np/schema/npd#Individual> .
126 +
127 +ep-prodreport:issuedAt
128 + rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
129 + rdfs:domain <http://www.reportinghub.no/ep/schema/report#Report> ;
130 + rdfs:label "issued at"^^xsd:string .
......
...@@ -55,15 +55,37 @@ ep-mpr-spin-lib:Function ...@@ -55,15 +55,37 @@ ep-mpr-spin-lib:Function
55 rdf:type spin:Function ; 55 rdf:type spin:Function ;
56 rdfs:subClassOf spin:Functions . 56 rdfs:subClassOf spin:Functions .
57 57
58 +ep-mpr-spin-lib:buildIntervalIdentifier
59 + rdf:type spin:Function ;
60 + rdfs:subClassOf ep-mpr-spin-lib:Function ;
61 + spin:body
62 + [ rdf:type sp:Select ;
63 + rdfs:comment """arg1 is the report start date
64 +arg2 is the report end date"""^^xsd:string ;
65 + sp:resultVariables ([ sp:varName "intervalIdentifier"^^xsd:string
66 + ]) ;
67 + sp:where ([ rdf:type sp:Bind ;
68 + sp:expression
69 + [ rdf:type fn:concat ;
70 + sp:arg1 spin:_arg1 ;
71 + sp:arg2 "$" ;
72 + sp:arg3 spin:_arg2
73 + ] ;
74 + sp:variable
75 + [ sp:varName "intervalIdentifier"^^xsd:string
76 + ]
77 + ])
78 + ] .
79 +
58 ep-mpr-spin-lib:buildProductionReportURI 80 ep-mpr-spin-lib:buildProductionReportURI
59 rdf:type spin:Function ; 81 rdf:type spin:Function ;
60 rdfs:subClassOf ep-mpr-spin-lib:Function ; 82 rdfs:subClassOf ep-mpr-spin-lib:Function ;
61 spin:body 83 spin:body
62 [ rdf:type sp:Select ; 84 [ rdf:type sp:Select ;
63 - rdfs:comment """arg1 is the name of the report 85 + rdfs:comment """arg1 is the name of the installation
64 -arg2 is the report start date 86 +arg2 is the interval identifier"""^^xsd:string ;
65 -arg3 is the report end date"""^^xsd:string ; 87 + sp:resultVariables ([ sp:varName "uri"^^xsd:string
66 - sp:resultVariables (_:b1) ; 88 + ]) ;
67 sp:where ([ rdf:type sp:Bind ; 89 sp:where ([ rdf:type sp:Bind ;
68 sp:expression 90 sp:expression
69 [ rdf:type ep-spin-lib:buildURI ; 91 [ rdf:type ep-spin-lib:buildURI ;
...@@ -71,12 +93,12 @@ arg3 is the report end date"""^^xsd:string ; ...@@ -71,12 +93,12 @@ arg3 is the report end date"""^^xsd:string ;
71 sp:arg2 [ rdf:type fn:concat ; 93 sp:arg2 [ rdf:type fn:concat ;
72 sp:arg1 spin:_arg1 ; 94 sp:arg1 spin:_arg1 ;
73 sp:arg2 "$" ; 95 sp:arg2 "$" ;
74 - sp:arg3 spin:_arg2 ; 96 + sp:arg3 spin:_arg2
75 - sp:arg4 "$" ;
76 - sp:arg5 spin:_arg3
77 ] 97 ]
78 ] ; 98 ] ;
79 - sp:variable _:b1 99 + sp:variable
100 + [ sp:varName "uri"^^xsd:string
101 + ]
80 ]) 102 ])
81 ] . 103 ] .
82 104
...@@ -916,7 +938,7 @@ ep-mpr-spin-lib:selectFluidSamplingType ...@@ -916,7 +938,7 @@ ep-mpr-spin-lib:selectFluidSamplingType
916 rdfs:subClassOf ep-mpr-spin-lib:Function ; 938 rdfs:subClassOf ep-mpr-spin-lib:Function ;
917 spin:body 939 spin:body
918 [ rdf:type sp:Select ; 940 [ rdf:type sp:Select ;
919 - sp:resultVariables (_:b2) ; 941 + sp:resultVariables (_:b1) ;
920 sp:where ([ rdf:type sp:Bind ; 942 sp:where ([ rdf:type sp:Bind ;
921 sp:expression 943 sp:expression
922 [ rdf:type sp:if ; 944 [ rdf:type sp:if ;
...@@ -997,7 +1019,7 @@ ep-mpr-spin-lib:selectFluidSamplingType ...@@ -997,7 +1019,7 @@ ep-mpr-spin-lib:selectFluidSamplingType
997 ] 1019 ]
998 ] 1020 ]
999 ] ; 1021 ] ;
1000 - sp:variable _:b2 1022 + sp:variable _:b1
1001 ]) 1023 ])
1002 ] . 1024 ] .
1003 1025
...@@ -3047,7 +3069,7 @@ ep-mpr-spin-lib:selectProductVolumeReportPeriodType ...@@ -3047,7 +3069,7 @@ ep-mpr-spin-lib:selectProductVolumeReportPeriodType
3047 rdfs:subClassOf ep-mpr-spin-lib:Function ; 3069 rdfs:subClassOf ep-mpr-spin-lib:Function ;
3048 spin:body 3070 spin:body
3049 [ rdf:type sp:Select ; 3071 [ rdf:type sp:Select ;
3050 - sp:resultVariables (_:b3) ; 3072 + sp:resultVariables (_:b2) ;
3051 sp:where ([ rdf:type sp:Bind ; 3073 sp:where ([ rdf:type sp:Bind ;
3052 sp:expression 3074 sp:expression
3053 [ rdf:type sp:if ; 3075 [ rdf:type sp:if ;
...@@ -3191,7 +3213,7 @@ ep-mpr-spin-lib:selectProductVolumeReportPeriodType ...@@ -3191,7 +3213,7 @@ ep-mpr-spin-lib:selectProductVolumeReportPeriodType
3191 ] 3213 ]
3192 ] 3214 ]
3193 ] ; 3215 ] ;
3194 - sp:variable _:b3 3216 + sp:variable _:b2
3195 ]) 3217 ])
3196 ] . 3218 ] .
3197 3219
...@@ -5598,8 +5620,6 @@ ep-mpr-spin-lib:selectWorkScale ...@@ -5598,8 +5620,6 @@ ep-mpr-spin-lib:selectWorkScale
5598 ]) 5620 ])
5599 ] . 5621 ] .
5600 5622
5601 -_:b3 sp:varName "productVolumeReportPeriodType"^^xsd:string . 5623 +_:b1 sp:varName "fluidSamplingType"^^xsd:string .
5602 -
5603 -_:b2 sp:varName "fluidSamplingType"^^xsd:string .
5604 5624
5605 -_:b1 sp:varName "uri"^^xsd:string . 5625 +_:b2 sp:varName "productVolumeReportPeriodType"^^xsd:string .
......
1 -# Saved by TopBraid on Tue Dec 20 19:26:54 GMT 2011
2 # baseURI: null 1 # baseURI: null
3 2
4 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> . 3 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
......
1 -# Saved by TopBraid on Thu Dec 15 19:14:36 GMT 2011
2 # baseURI: http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest 1 # baseURI: http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest
3 -# imports: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector 2 +# imports: http://spinrdf.org/spin
4 # imports: http://www.epim.no/schemas/mprml/1 3 # imports: http://www.epim.no/schemas/mprml/1
4 +# imports: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector
5 # imports: http://www.reportinghub.no/np/data/npd 5 # imports: http://www.reportinghub.no/np/data/npd
6 -# imports: http://spinrdf.org/spin
7 6
8 @prefix : <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest#> . 7 @prefix : <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest#> .
9 @prefix TRANSFORM_mpr-collector: <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector#> . 8 @prefix TRANSFORM_mpr-collector: <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector#> .
......
1 -# Saved by TopBraid on Thu Dec 15 19:14:36 GMT 2011
2 # baseURI: null 1 # baseURI: null
3 2
4 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> . 3 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
......