data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
chinmaytq
07426f55 2 parents 254f0fb3 58b34af9

Merge branch 'refactor-event-logs'

Inline Side-by-side
Showing 2 changed files with 62 additions and 20 deletions
1 +.directory
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 11
12 <http://www.reportinghub.no/system/schema/logging> 12 <http://www.reportinghub.no/system/schema/logging>
13 rdf:type owl:Ontology ; 13 rdf:type owl:Ontology ;
14 - owl:imports <http://www.reportinghub.no/system/schema/reporting> , <http://rdfs.org/sioc/ns> , <http://purl.org/dc/terms/> ; 14 + owl:imports <http://purl.org/dc/terms/> , <http://rdfs.org/sioc/ns> , <http://www.reportinghub.no/system/schema/reporting> ;
15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
16 16
17 log:FactPagesUpdateEvent 17 log:FactPagesUpdateEvent
...@@ -25,12 +25,12 @@ log:LogEvent ...@@ -25,12 +25,12 @@ log:LogEvent
25 rdfs:subClassOf owl:Thing ; 25 rdfs:subClassOf owl:Thing ;
26 rdfs:subClassOf 26 rdfs:subClassOf
27 [ rdf:type owl:Restriction ; 27 [ rdf:type owl:Restriction ;
28 - owl:cardinality "1"^^xsd:nonNegativeInteger ; 28 + owl:allValuesFrom xsd:dateTime ;
29 - owl:onProperty rdfs:comment 29 + owl:onProperty <http://purl.org/dc/terms/created>
30 ] ; 30 ] ;
31 rdfs:subClassOf 31 rdfs:subClassOf
32 [ rdf:type owl:Restriction ; 32 [ rdf:type owl:Restriction ;
33 - owl:cardinality "1"^^xsd:nonNegativeInteger ; 33 + owl:allValuesFrom xsd:string ;
34 owl:onProperty <http://rdfs.org/sioc/ns#id> 34 owl:onProperty <http://rdfs.org/sioc/ns#id>
35 ] ; 35 ] ;
36 rdfs:subClassOf 36 rdfs:subClassOf
...@@ -40,13 +40,43 @@ log:LogEvent ...@@ -40,13 +40,43 @@ log:LogEvent
40 ] ; 40 ] ;
41 rdfs:subClassOf 41 rdfs:subClassOf
42 [ rdf:type owl:Restriction ; 42 [ rdf:type owl:Restriction ;
43 - owl:allValuesFrom xsd:string ; 43 + owl:cardinality "1"^^xsd:nonNegativeInteger ;
44 owl:onProperty <http://rdfs.org/sioc/ns#id> 44 owl:onProperty <http://rdfs.org/sioc/ns#id>
45 ] ; 45 ] ;
46 rdfs:subClassOf 46 rdfs:subClassOf
47 [ rdf:type owl:Restriction ; 47 [ rdf:type owl:Restriction ;
48 - owl:allValuesFrom xsd:dateTime ; 48 + owl:cardinality "1"^^xsd:nonNegativeInteger ;
49 - owl:onProperty <http://purl.org/dc/terms/created> 49 + owl:onProperty rdfs:comment
50 + ] .
51 +
52 +log:MonthlyReportDownloadEvent
53 + rdf:type owl:Class ;
54 + rdfs:label "Monthly Report download event"^^xsd:string ;
55 + rdfs:subClassOf log:ReportEvent ;
56 + rdfs:subClassOf
57 + [ rdf:type owl:Restriction ;
58 + owl:cardinality "1"^^xsd:nonNegativeInteger ;
59 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#wellBoreId>
60 + ] ;
61 + rdfs:subClassOf
62 + [ rdf:type owl:Restriction ;
63 + owl:cardinality "1"^^xsd:nonNegativeInteger ;
64 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format>
65 + ] .
66 +
67 +log:MonthlyReportUploadEvent
68 + rdf:type owl:Class ;
69 + rdfs:label "Monthly Report upload event"^^xsd:string ;
70 + rdfs:subClassOf log:ReportEvent ;
71 + rdfs:subClassOf
72 + [ rdf:type owl:Restriction ;
73 + owl:cardinality "1"^^xsd:nonNegativeInteger ;
74 + owl:onProperty log:xml
75 + ] ;
76 + rdfs:subClassOf
77 + [ rdf:type owl:Restriction ;
78 + owl:minCardinality "0"^^xsd:nonNegativeInteger ;
79 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format>
50 ] . 80 ] .
51 81
52 log:NPDUploadEvent 82 log:NPDUploadEvent
...@@ -77,18 +107,14 @@ log:ReportDownloadEvent ...@@ -77,18 +107,14 @@ log:ReportDownloadEvent
77 rdfs:subClassOf 107 rdfs:subClassOf
78 [ rdf:type owl:Restriction ; 108 [ rdf:type owl:Restriction ;
79 owl:cardinality "1"^^xsd:nonNegativeInteger ; 109 owl:cardinality "1"^^xsd:nonNegativeInteger ;
80 - owl:onProperty <http://www.reportinghub.no/system/schema/reporting#wellBoreId> 110 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format>
81 ] ; 111 ] ;
82 rdfs:subClassOf 112 rdfs:subClassOf
83 [ rdf:type owl:Restriction ; 113 [ rdf:type owl:Restriction ;
84 owl:cardinality "1"^^xsd:nonNegativeInteger ; 114 owl:cardinality "1"^^xsd:nonNegativeInteger ;
85 - owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format> 115 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#wellBoreId>
86 ] . 116 ] .
87 117
88 -log:ReportDownloadTriplesEvent
89 - rdf:type owl:Class ;
90 - rdfs:subClassOf log:ReportDownloadEvent .
91 -
92 log:ReportEvent 118 log:ReportEvent
93 rdf:type owl:Class ; 119 rdf:type owl:Class ;
94 rdfs:label "Report event"^^xsd:string ; 120 rdfs:label "Report event"^^xsd:string ;
...@@ -100,13 +126,13 @@ log:ReportUploadEvent ...@@ -100,13 +126,13 @@ log:ReportUploadEvent
100 rdfs:subClassOf log:ReportEvent ; 126 rdfs:subClassOf log:ReportEvent ;
101 rdfs:subClassOf 127 rdfs:subClassOf
102 [ rdf:type owl:Restriction ; 128 [ rdf:type owl:Restriction ;
103 - owl:minCardinality "0"^^xsd:nonNegativeInteger ; 129 + owl:cardinality "1"^^xsd:nonNegativeInteger ;
104 - owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format> 130 + owl:onProperty log:xml
105 ] ; 131 ] ;
106 rdfs:subClassOf 132 rdfs:subClassOf
107 [ rdf:type owl:Restriction ; 133 [ rdf:type owl:Restriction ;
108 - owl:cardinality "1"^^xsd:nonNegativeInteger ; 134 + owl:minCardinality "0"^^xsd:nonNegativeInteger ;
109 - owl:onProperty log:xml 135 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format>
110 ] . 136 ] .
111 137
112 log:ReportValidationEvent 138 log:ReportValidationEvent
...@@ -133,10 +159,15 @@ log:initiatedBy ...@@ -133,10 +159,15 @@ log:initiatedBy
133 rdfs:label "user"^^xsd:string ; 159 rdfs:label "user"^^xsd:string ;
134 rdfs:range xsd:string . 160 rdfs:range xsd:string .
135 161
162 +log:monthReportingPeriodStart
163 + rdf:type rdf:Property ;
164 + rdfs:domain log:MonthlyReportUploadEvent ;
165 + rdfs:range xsd:gYearMonth .
166 +
136 log:npdEntityName 167 log:npdEntityName
137 rdf:type owl:DatatypeProperty ; 168 rdf:type owl:DatatypeProperty ;
138 rdfs:comment "Points to a well bore or field name that had the report uploaded."^^xsd:string ; 169 rdfs:comment "Points to a well bore or field name that had the report uploaded."^^xsd:string ;
139 - rdfs:domain log:ReportUploadEvent ; 170 + rdfs:domain log:ReportUploadEvent , log:MonthlyReportUploadEvent ;
140 rdfs:label "NPD entity name"^^xsd:string ; 171 rdfs:label "NPD entity name"^^xsd:string ;
141 rdfs:range xsd:string . 172 rdfs:range xsd:string .
142 173
...@@ -159,7 +190,7 @@ log:outcome ...@@ -159,7 +190,7 @@ log:outcome
159 log:ownerId 190 log:ownerId
160 rdf:type owl:DatatypeProperty ; 191 rdf:type owl:DatatypeProperty ;
161 rdfs:comment "The NPD id of the BAA or Licence."^^xsd:string ; 192 rdfs:comment "The NPD id of the BAA or Licence."^^xsd:string ;
162 - rdfs:domain log:ReportDownloadEvent ; 193 + rdfs:domain log:ReportDownloadEvent , log:MonthlyReportDownloadEvent ;
163 rdfs:label "owner id"^^xsd:string ; 194 rdfs:label "owner id"^^xsd:string ;
164 rdfs:range xsd:string . 195 rdfs:range xsd:string .
165 196
...@@ -196,10 +227,20 @@ log:xml ...@@ -196,10 +227,20 @@ log:xml
196 rdfs:label "xml"^^xsd:string ; 227 rdfs:label "xml"^^xsd:string ;
197 rdfs:range xsd:string . 228 rdfs:range xsd:string .
198 229
230 +log:yearMonthFrom
231 + rdf:type owl:DatatypeProperty ;
232 + rdfs:domain log:MonthlyReportDownloadEvent ;
233 + rdfs:range xsd:gYearMonth .
234 +
235 +log:yearMonthTo
236 + rdf:type owl:DatatypeProperty ;
237 + rdfs:domain log:MonthlyReportDownloadEvent ;
238 + rdfs:range xsd:gYearMonth .
239 +
199 <http://www.reportinghub.no/system/schema/reporting#format> 240 <http://www.reportinghub.no/system/schema/reporting#format>
200 rdfs:range <http://www.reportinghub.no/system/schema/reporting#Format> . 241 rdfs:range <http://www.reportinghub.no/system/schema/reporting#Format> .
201 242
202 <http://www.reportinghub.no/system/schema/reporting#uploadedDocument> 243 <http://www.reportinghub.no/system/schema/reporting#uploadedDocument>
203 rdf:type owl:ObjectProperty ; 244 rdf:type owl:ObjectProperty ;
204 - rdfs:domain log:ReportUploadEvent ; 245 + rdfs:domain log:ReportUploadEvent , log:MonthlyReportUploadEvent ;
205 rdfs:label "uploaded document"^^xsd:string . 246 rdfs:label "uploaded document"^^xsd:string .
......