data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
Holger Knublauch
7dba9062 1 parent 0e14d844

Event log clean up

Inline Side-by-side
Showing 3 changed files with 25 additions and 151 deletions
...@@ -26,12 +26,12 @@ log:LogEvent ...@@ -26,12 +26,12 @@ log:LogEvent
26 rdfs:subClassOf 26 rdfs:subClassOf
27 [ rdf:type owl:Restriction ; 27 [ rdf:type owl:Restriction ;
28 owl:cardinality "1"^^xsd:nonNegativeInteger ; 28 owl:cardinality "1"^^xsd:nonNegativeInteger ;
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:allValuesFrom xsd:string ; 33 + owl:allValuesFrom xsd:dateTime ;
34 - owl:onProperty <http://rdfs.org/sioc/ns#id> 34 + owl:onProperty <http://purl.org/dc/terms/created>
35 ] ; 35 ] ;
36 rdfs:subClassOf 36 rdfs:subClassOf
37 [ rdf:type owl:Restriction ; 37 [ rdf:type owl:Restriction ;
...@@ -40,13 +40,13 @@ log:LogEvent ...@@ -40,13 +40,13 @@ log:LogEvent
40 ] ; 40 ] ;
41 rdfs:subClassOf 41 rdfs:subClassOf
42 [ rdf:type owl:Restriction ; 42 [ rdf:type owl:Restriction ;
43 - owl:allValuesFrom xsd:dateTime ; 43 + owl:allValuesFrom xsd:string ;
44 - owl:onProperty <http://purl.org/dc/terms/created> 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:cardinality "1"^^xsd:nonNegativeInteger ; 48 owl:cardinality "1"^^xsd:nonNegativeInteger ;
49 - owl:onProperty <http://purl.org/dc/terms/created> 49 + owl:onProperty rdfs:comment
50 ] . 50 ] .
51 51
52 log:PasswordChangeEvent 52 log:PasswordChangeEvent
...@@ -66,12 +66,12 @@ log:ReportDownloadEvent ...@@ -66,12 +66,12 @@ log:ReportDownloadEvent
66 rdfs:subClassOf 66 rdfs:subClassOf
67 [ rdf:type owl:Restriction ; 67 [ rdf:type owl:Restriction ;
68 owl:cardinality "1"^^xsd:nonNegativeInteger ; 68 owl:cardinality "1"^^xsd:nonNegativeInteger ;
69 - owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format> 69 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#wellBoreId>
70 ] ; 70 ] ;
71 rdfs:subClassOf 71 rdfs:subClassOf
72 [ rdf:type owl:Restriction ; 72 [ rdf:type owl:Restriction ;
73 owl:cardinality "1"^^xsd:nonNegativeInteger ; 73 owl:cardinality "1"^^xsd:nonNegativeInteger ;
74 - owl:onProperty <http://www.reportinghub.no/system/schema/reporting#wellBoreId> 74 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format>
75 ] . 75 ] .
76 76
77 log:ReportEvent 77 log:ReportEvent
...@@ -82,7 +82,12 @@ log:ReportEvent ...@@ -82,7 +82,12 @@ log:ReportEvent
82 log:ReportUploadEvent 82 log:ReportUploadEvent
83 rdf:type owl:Class ; 83 rdf:type owl:Class ;
84 rdfs:label "Report upload event"^^xsd:string ; 84 rdfs:label "Report upload event"^^xsd:string ;
85 - rdfs:subClassOf log:ReportEvent . 85 + rdfs:subClassOf log:ReportEvent ;
86 + rdfs:subClassOf
87 + [ rdf:type owl:Restriction ;
88 + owl:minCardinality "0"^^xsd:nonNegativeInteger ;
89 + owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format>
90 + ] .
86 91
87 log:ReportValidationEvent 92 log:ReportValidationEvent
88 rdf:type owl:Class ; 93 rdf:type owl:Class ;
......
...@@ -23,7 +23,7 @@ loggingspin:Overview ...@@ -23,7 +23,7 @@ loggingspin:Overview
23 rdfs:subClassOf spin:SelectTemplates ; 23 rdfs:subClassOf spin:SelectTemplates ;
24 spin:body 24 spin:body
25 [ rdf:type sp:Select ; 25 [ rdf:type sp:Select ;
26 - sp:limit "100"^^xsd:long ; 26 + sp:limit "1000"^^xsd:long ;
27 sp:orderBy ([ rdf:type sp:Desc ; 27 sp:orderBy ([ rdf:type sp:Desc ;
28 sp:expression 28 sp:expression
29 [ sp:varName "created"^^xsd:string 29 [ sp:varName "created"^^xsd:string
...@@ -35,6 +35,7 @@ loggingspin:Overview ...@@ -35,6 +35,7 @@ loggingspin:Overview
35 ] [ sp:varName "initiatedBy"^^xsd:string 35 ] [ sp:varName "initiatedBy"^^xsd:string
36 ] [ sp:varName "onBehalfOf"^^xsd:string 36 ] [ sp:varName "onBehalfOf"^^xsd:string
37 ] [ sp:varName "outcome"^^xsd:string 37 ] [ sp:varName "outcome"^^xsd:string
38 + ] [ sp:varName "comment"^^xsd:string
38 ]) ; 39 ]) ;
39 sp:where ([ rdf:type sp:NamedGraph ; 40 sp:where ([ rdf:type sp:NamedGraph ;
40 sp:elements ([ sp:object 41 sp:elements ([ sp:object
...@@ -65,6 +66,15 @@ loggingspin:Overview ...@@ -65,6 +66,15 @@ loggingspin:Overview
65 sp:subject 66 sp:subject
66 [ sp:varName "event"^^xsd:string 67 [ sp:varName "event"^^xsd:string
67 ] 68 ]
69 + ] [ rdf:type sp:Optional ;
70 + sp:elements ([ sp:object
71 + [ sp:varName "comment"^^xsd:string
72 + ] ;
73 + sp:predicate rdfs:comment ;
74 + sp:subject
75 + [ sp:varName "event"^^xsd:string
76 + ]
77 + ])
68 ] [ sp:object 78 ] [ sp:object
69 [ sp:varName "type"^^xsd:string 79 [ sp:varName "type"^^xsd:string
70 ] ; 80 ] ;
......
1 -# baseURI: http://www.reportinghub.no/system/swp/SWP-logging
2 -# imports: http://uispin.org/tui
3 -# imports: http://www.reportinghub.no/system/schema/logging
4 -
5 -@prefix afn: <http://jena.hpl.hp.com/ARQ/function#> .
6 -@prefix let: <http://uispin.org/let#> .
7 -@prefix letrs: <http://uispin.org/letrs#> .
8 -@prefix owl: <http://www.w3.org/2002/07/owl#> .
9 -@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
10 -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
11 -@prefix sp: <http://spinrdf.org/sp#> .
12 -@prefix spin: <http://spinrdf.org/spin#> .
13 -@prefix spl: <http://spinrdf.org/spl#> .
14 -@prefix tui: <http://uispin.org/tui#> .
15 -@prefix ui: <http://uispin.org/ui#> .
16 -@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
17 -
18 -<http://www.reportinghub.no/system/schema/logging#ReportDownloadEvent>
19 - ui:instanceView
20 - [ rdf:type ui:group ;
21 - let:dateFrom
22 - [ rdf:type spl:object ;
23 - sp:arg1 spin:_this ;
24 - sp:arg2 <http://www.reportinghub.no/system/schema/logging#dateFrom>
25 - ] ;
26 - let:dateTo
27 - [ rdf:type spl:object ;
28 - sp:arg1 spin:_this ;
29 - sp:arg2 <http://www.reportinghub.no/system/schema/logging#dateTo>
30 - ] ;
31 - let:ownerId
32 - [ rdf:type spl:object ;
33 - sp:arg1 spin:_this ;
34 - sp:arg2 <http://www.reportinghub.no/system/schema/logging#ownerId>
35 - ] ;
36 - ui:child
37 - [ rdf:type ui:TextNode ;
38 - ui:childIndex 0 ;
39 - ui:text [ rdf:type afn:localname ;
40 - sp:arg1 [ rdf:type spl:object ;
41 - sp:arg1 spin:_this ;
42 - sp:arg2 <http://www.reportinghub.no/system/schema/logging#reportType>
43 - ]
44 - ]
45 - ] ;
46 - ui:child
47 - [ rdf:type ui:TextNode ;
48 - ui:childIndex 1 ;
49 - ui:text " from "^^xsd:string
50 - ] ;
51 - ui:child
52 - [ rdf:type ui:TextNode ;
53 - ui:childIndex 2 ;
54 - ui:text [ sp:varName "dateFrom"^^xsd:string
55 - ]
56 - ] ;
57 - ui:child
58 - [ rdf:type ui:if ;
59 - ui:child
60 - [ rdf:type ui:TextNode ;
61 - ui:childIndex 0 ;
62 - ui:text "to "^^xsd:string
63 - ] ;
64 - ui:child
65 - [ rdf:type ui:TextNode ;
66 - ui:childIndex 1 ;
67 - ui:text [ sp:varName "dateTo"^^xsd:string
68 - ]
69 - ] ;
70 - ui:childIndex 3 ;
71 - ui:condition
72 - [ rdf:type sp:bound ;
73 - sp:arg1 [ sp:varName "dateTo"^^xsd:string
74 - ]
75 - ]
76 - ] ;
77 - ui:child
78 - [ rdf:type ui:if ;
79 - ui:child
80 - [ rdf:type ui:TextNode ;
81 - ui:childIndex 0 ;
82 - ui:text " with owner id "^^xsd:string
83 - ] ;
84 - ui:child
85 - [ rdf:type ui:TextNode ;
86 - ui:childIndex 1 ;
87 - ui:text [ sp:varName "ownerId"^^xsd:string
88 - ]
89 - ] ;
90 - ui:childIndex 4 ;
91 - ui:condition
92 - [ rdf:type sp:bound ;
93 - sp:arg1 [ sp:varName "ownerId"^^xsd:string
94 - ]
95 - ]
96 - ] ;
97 - ui:id "comments"^^xsd:string
98 - ] .
99 -
100 -<http://www.reportinghub.no/system/schema/logging#ReportUploadEvent>
101 - ui:instanceView
102 - [ rdf:type ui:group ;
103 - ui:child
104 - [ rdf:type ui:TextNode ;
105 - ui:childIndex 0 ;
106 - ui:text [ rdf:type afn:localname ;
107 - sp:arg1 [ rdf:type spl:object ;
108 - sp:arg1 spin:_this ;
109 - sp:arg2 <http://www.reportinghub.no/system/schema/logging#reportType>
110 - ]
111 - ]
112 - ] ;
113 - ui:child
114 - [ rdf:type ui:TextNode ;
115 - ui:childIndex 1 ;
116 - ui:text " "^^xsd:string
117 - ] ;
118 - ui:child
119 - [ rdf:type tui:LabelList ;
120 - ui:childIndex 2 ;
121 - ui:resultSet
122 - [ rdf:type sp:Select ;
123 - sp:orderBy ([ sp:varName "wellBoreName"^^xsd:string
124 - ]) ;
125 - sp:resultVariables ([ sp:varName "wellBoreName"^^xsd:string
126 - ]) ;
127 - sp:where ([ sp:object
128 - [ sp:varName "wellBoreName"^^xsd:string
129 - ] ;
130 - sp:predicate <http://www.reportinghub.no/system/schema/logging#wellBoreName> ;
131 - sp:subject spin:_this
132 - ])
133 - ]
134 - ] ;
135 - ui:id "comments"^^xsd:string
136 - ] .
137 -
138 -<http://www.reportinghub.no/system/swp/SWP-logging>
139 - rdf:type owl:Ontology ;
140 - owl:imports <http://uispin.org/tui> , <http://www.reportinghub.no/system/schema/logging> ;
141 - owl:versionInfo "Created with TopBraid Composer"^^xsd:string .