Replaced rdfs:comment use with new ep-core:description property
Showing
12 changed files
with
25 additions
and
25 deletions
This diff is collapsed. Click to expand it.
... | @@ -22,7 +22,7 @@ | ... | @@ -22,7 +22,7 @@ |
22 | <http://www.reportinghub.no/ep/spin/ddr-tables> | 22 | <http://www.reportinghub.no/ep/spin/ddr-tables> |
23 | rdf:type owl:Ontology ; | 23 | rdf:type owl:Ontology ; |
24 | rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ; | 24 | rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ; |
25 | - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/spin/rh> ; | 25 | + owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://spinrdf.org/spin> ; |
26 | owl:versionInfo "0.1.0"^^xsd:string . | 26 | owl:versionInfo "0.1.0"^^xsd:string . |
27 | 27 | ||
28 | ddr-tables:BitRecord | 28 | ddr-tables:BitRecord |
... | @@ -411,7 +411,7 @@ ddr-tables:BitRecord | ... | @@ -411,7 +411,7 @@ ddr-tables:BitRecord |
411 | ] [ sp:object | 411 | ] [ sp:object |
412 | [ sp:varName "manufacturer"^^xsd:string | 412 | [ sp:varName "manufacturer"^^xsd:string |
413 | ] ; | 413 | ] ; |
414 | - sp:predicate rdfs:label ; | 414 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ; |
415 | sp:subject | 415 | sp:subject |
416 | [ sp:varName "drillBitManuf"^^xsd:string | 416 | [ sp:varName "drillBitManuf"^^xsd:string |
417 | ] | 417 | ] |
... | @@ -482,7 +482,7 @@ ddr-tables:CasingLinerTubingInformation | ... | @@ -482,7 +482,7 @@ ddr-tables:CasingLinerTubingInformation |
482 | sp:elements ([ sp:object | 482 | sp:elements ([ sp:object |
483 | [ sp:varName "description"^^xsd:string | 483 | [ sp:varName "description"^^xsd:string |
484 | ] ; | 484 | ] ; |
485 | - sp:predicate rdfs:comment ; | 485 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
486 | sp:subject | 486 | sp:subject |
487 | [ sp:varName "wellStim"^^xsd:string | 487 | [ sp:varName "wellStim"^^xsd:string |
488 | ] | 488 | ] |
... | @@ -852,7 +852,7 @@ ddr-tables:CementFluidInformation | ... | @@ -852,7 +852,7 @@ ddr-tables:CementFluidInformation |
852 | ] [ sp:object | 852 | ] [ sp:object |
853 | [ sp:varName "fluidDescription"^^xsd:string | 853 | [ sp:varName "fluidDescription"^^xsd:string |
854 | ] ; | 854 | ] ; |
855 | - sp:predicate rdfs:comment ; | 855 | + sp:predicate rdfs:label ; |
856 | sp:subject | 856 | sp:subject |
857 | [ sp:varName "userDescribedCementingFluidType"^^xsd:string | 857 | [ sp:varName "userDescribedCementingFluidType"^^xsd:string |
858 | ] | 858 | ] |
... | @@ -966,7 +966,7 @@ ddr-tables:CementFluidInformation | ... | @@ -966,7 +966,7 @@ ddr-tables:CementFluidInformation |
966 | sp:elements ([ sp:object | 966 | sp:elements ([ sp:object |
967 | [ sp:varName "comments"^^xsd:string | 967 | [ sp:varName "comments"^^xsd:string |
968 | ] ; | 968 | ] ; |
969 | - sp:predicate rdfs:comment ; | 969 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
970 | sp:subject | 970 | sp:subject |
971 | [ sp:varName "fluid"^^xsd:string | 971 | [ sp:varName "fluid"^^xsd:string |
972 | ] | 972 | ] |
... | @@ -1251,7 +1251,7 @@ ddr-tables:CementInformation | ... | @@ -1251,7 +1251,7 @@ ddr-tables:CementInformation |
1251 | sp:elements ([ sp:object | 1251 | sp:elements ([ sp:object |
1252 | [ sp:varName "comments"^^xsd:string | 1252 | [ sp:varName "comments"^^xsd:string |
1253 | ] ; | 1253 | ] ; |
1254 | - sp:predicate rdfs:comment ; | 1254 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
1255 | sp:subject | 1255 | sp:subject |
1256 | [ sp:varName "wellCementJob"^^xsd:string | 1256 | [ sp:varName "wellCementJob"^^xsd:string |
1257 | ] | 1257 | ] |
... | @@ -1566,7 +1566,7 @@ ddr-tables:CoreInformation | ... | @@ -1566,7 +1566,7 @@ ddr-tables:CoreInformation |
1566 | sp:elements ([ sp:object | 1566 | sp:elements ([ sp:object |
1567 | [ sp:varName "description"^^xsd:string | 1567 | [ sp:varName "description"^^xsd:string |
1568 | ] ; | 1568 | ] ; |
1569 | - sp:predicate rdfs:comment ; | 1569 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
1570 | sp:subject | 1570 | sp:subject |
1571 | [ sp:varName "recCore"^^xsd:string | 1571 | [ sp:varName "recCore"^^xsd:string |
1572 | ] | 1572 | ] |
... | @@ -2023,7 +2023,7 @@ ddr-tables:EquipmentFailure | ... | @@ -2023,7 +2023,7 @@ ddr-tables:EquipmentFailure |
2023 | sp:elements ([ sp:object | 2023 | sp:elements ([ sp:object |
2024 | [ sp:varName "failureDescription"^^xsd:string | 2024 | [ sp:varName "failureDescription"^^xsd:string |
2025 | ] ; | 2025 | ] ; |
2026 | - sp:predicate rdfs:comment ; | 2026 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
2027 | sp:subject | 2027 | sp:subject |
2028 | [ sp:varName "part"^^xsd:string | 2028 | [ sp:varName "part"^^xsd:string |
2029 | ] | 2029 | ] |
... | @@ -2238,7 +2238,7 @@ ddr-tables:FormationTest | ... | @@ -2238,7 +2238,7 @@ ddr-tables:FormationTest |
2238 | sp:elements ([ sp:object | 2238 | sp:elements ([ sp:object |
2239 | [ sp:varName "description"^^xsd:string | 2239 | [ sp:varName "description"^^xsd:string |
2240 | ] ; | 2240 | ] ; |
2241 | - sp:predicate rdfs:comment ; | 2241 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
2242 | sp:subject | 2242 | sp:subject |
2243 | [ sp:varName "ft"^^xsd:string | 2243 | [ sp:varName "ft"^^xsd:string |
2244 | ] | 2244 | ] |
... | @@ -3110,7 +3110,7 @@ ddr-tables:LogInformation | ... | @@ -3110,7 +3110,7 @@ ddr-tables:LogInformation |
3110 | ] [ sp:object | 3110 | ] [ sp:object |
3111 | [ sp:varName "tool"^^xsd:string | 3111 | [ sp:varName "tool"^^xsd:string |
3112 | ] ; | 3112 | ] ; |
3113 | - sp:predicate rdfs:comment ; | 3113 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
3114 | sp:subject | 3114 | sp:subject |
3115 | [ sp:varName "loggingTool"^^xsd:string | 3115 | [ sp:varName "loggingTool"^^xsd:string |
3116 | ] | 3116 | ] |
... | @@ -3348,7 +3348,7 @@ ddr-tables:Operations | ... | @@ -3348,7 +3348,7 @@ ddr-tables:Operations |
3348 | sp:elements ([ sp:object | 3348 | sp:elements ([ sp:object |
3349 | [ sp:varName "remark"^^xsd:string | 3349 | [ sp:varName "remark"^^xsd:string |
3350 | ] ; | 3350 | ] ; |
3351 | - sp:predicate rdfs:comment ; | 3351 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
3352 | sp:subject | 3352 | sp:subject |
3353 | [ sp:varName "part"^^xsd:string | 3353 | [ sp:varName "part"^^xsd:string |
3354 | ] | 3354 | ] |
... | @@ -4268,7 +4268,7 @@ ddr-tables:WellControlIncident | ... | @@ -4268,7 +4268,7 @@ ddr-tables:WellControlIncident |
4268 | ] [ sp:object | 4268 | ] [ sp:object |
4269 | [ sp:varName "formation"^^xsd:string | 4269 | [ sp:varName "formation"^^xsd:string |
4270 | ] ; | 4270 | ] ; |
4271 | - sp:predicate rdfs:comment ; | 4271 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
4272 | sp:subject | 4272 | sp:subject |
4273 | [ sp:varName "srFormation"^^xsd:string | 4273 | [ sp:varName "srFormation"^^xsd:string |
4274 | ] | 4274 | ] |
... | @@ -4376,7 +4376,7 @@ ddr-tables:WellControlIncident | ... | @@ -4376,7 +4376,7 @@ ddr-tables:WellControlIncident |
4376 | sp:elements ([ sp:object | 4376 | sp:elements ([ sp:object |
4377 | [ sp:varName "comment"^^xsd:string | 4377 | [ sp:varName "comment"^^xsd:string |
4378 | ] ; | 4378 | ] ; |
4379 | - sp:predicate rdfs:comment ; | 4379 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
4380 | sp:subject | 4380 | sp:subject |
4381 | [ sp:varName "wci"^^xsd:string | 4381 | [ sp:varName "wci"^^xsd:string |
4382 | ] | 4382 | ] | ... | ... |
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
19 | 19 | ||
20 | <http://www.reportinghub.no/ep/transform/1.1/ddr/casingLinerTubingRun> | 20 | <http://www.reportinghub.no/ep/transform/1.1/ddr/casingLinerTubingRun> |
21 | rdf:type owl:Ontology ; | 21 | rdf:type owl:Ontology ; |
22 | - owl:imports <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://spinrdf.org/spin> ; | 22 | + owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.witsml.org/schemas/1series> ; |
23 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . | 23 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . |
24 | 24 | ||
25 | ddr:Obj_drillReport | 25 | ddr:Obj_drillReport |
... | @@ -55,7 +55,7 @@ ddr:Obj_drillReport | ... | @@ -55,7 +55,7 @@ ddr:Obj_drillReport |
55 | ] [ sp:object | 55 | ] [ sp:object |
56 | [ sp:varName "description"^^xsd:string | 56 | [ sp:varName "description"^^xsd:string |
57 | ] ; | 57 | ] ; |
58 | - sp:predicate rdfs:comment ; | 58 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
59 | sp:subject | 59 | sp:subject |
60 | [ sp:varName "wellCompletion"^^xsd:string | 60 | [ sp:varName "wellCompletion"^^xsd:string |
61 | ] | 61 | ] | ... | ... |
This diff is collapsed. Click to expand it.
... | @@ -20,7 +20,7 @@ | ... | @@ -20,7 +20,7 @@ |
20 | 20 | ||
21 | <http://www.reportinghub.no/ep/transform/1.1/ddr/controlIncidentInfo> | 21 | <http://www.reportinghub.no/ep/transform/1.1/ddr/controlIncidentInfo> |
22 | rdf:type owl:Ontology ; | 22 | rdf:type owl:Ontology ; |
23 | - owl:imports <http://www.reportinghub.no/ep/schema/1.0/material> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.witsml.org/schemas/1series> ; | 23 | + owl:imports <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/material> ; |
24 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . | 24 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . |
25 | 25 | ||
26 | ddr:Obj_drillReport | 26 | ddr:Obj_drillReport |
... | @@ -88,7 +88,7 @@ ddr:Obj_drillReport | ... | @@ -88,7 +88,7 @@ ddr:Obj_drillReport |
88 | ] [ sp:object | 88 | ] [ sp:object |
89 | [ sp:varName "formation"^^xsd:string | 89 | [ sp:varName "formation"^^xsd:string |
90 | ] ; | 90 | ] ; |
91 | - sp:predicate rdfs:comment ; | 91 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
92 | sp:subject _:b3 | 92 | sp:subject _:b3 |
93 | ] [ sp:object _:b4 ; | 93 | ] [ sp:object _:b4 ; |
94 | sp:predicate <http://www.reportinghub.no/ep/schema/well#measuredDepth> ; | 94 | sp:predicate <http://www.reportinghub.no/ep/schema/well#measuredDepth> ; |
... | @@ -228,7 +228,7 @@ ddr:Obj_drillReport | ... | @@ -228,7 +228,7 @@ ddr:Obj_drillReport |
228 | ] [ sp:object | 228 | ] [ sp:object |
229 | [ sp:varName "description"^^xsd:string | 229 | [ sp:varName "description"^^xsd:string |
230 | ] ; | 230 | ] ; |
231 | - sp:predicate rdfs:comment ; | 231 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
232 | sp:subject | 232 | sp:subject |
233 | [ sp:varName "wellControlIncident"^^xsd:string | 233 | [ sp:varName "wellControlIncident"^^xsd:string |
234 | ] | 234 | ] | ... | ... |
... | @@ -22,7 +22,7 @@ | ... | @@ -22,7 +22,7 @@ |
22 | 22 | ||
23 | <http://www.reportinghub.no/ep/transform/1.1/ddr/coreInfo> | 23 | <http://www.reportinghub.no/ep/transform/1.1/ddr/coreInfo> |
24 | rdf:type owl:Ontology ; | 24 | rdf:type owl:Ontology ; |
25 | - owl:imports <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://spinrdf.org/spin> ; | 25 | + owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.witsml.org/schemas/1series> ; |
26 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . | 26 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . |
27 | 27 | ||
28 | ddr:Obj_drillReport | 28 | ddr:Obj_drillReport |
... | @@ -164,7 +164,7 @@ Properties transfered to the activity, to the part of the well bore, or to the r | ... | @@ -164,7 +164,7 @@ Properties transfered to the activity, to the part of the well bore, or to the r |
164 | ] [ sp:object | 164 | ] [ sp:object |
165 | [ sp:varName "coreDescription"^^xsd:string | 165 | [ sp:varName "coreDescription"^^xsd:string |
166 | ] ; | 166 | ] ; |
167 | - sp:predicate rdfs:comment ; | 167 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
168 | sp:subject _:b7 | 168 | sp:subject _:b7 |
169 | ] [ sp:object _:b10 ; | 169 | ] [ sp:object _:b10 ; |
170 | sp:predicate <http://www.reportinghub.no/ep/schema/well#hasBarrel> ; | 170 | sp:predicate <http://www.reportinghub.no/ep/schema/well#hasBarrel> ; | ... | ... |
... | @@ -18,7 +18,7 @@ | ... | @@ -18,7 +18,7 @@ |
18 | 18 | ||
19 | <http://www.reportinghub.no/ep/transform/1.1/ddr/equipFailureInfo> | 19 | <http://www.reportinghub.no/ep/transform/1.1/ddr/equipFailureInfo> |
20 | rdf:type owl:Ontology ; | 20 | rdf:type owl:Ontology ; |
21 | - owl:imports <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://spinrdf.org/spin> ; | 21 | + owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/spin/1.1/lib> ; |
22 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . | 22 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . |
23 | 23 | ||
24 | <http://www.witsml.org/schemas/1series#Obj_drillReport> | 24 | <http://www.witsml.org/schemas/1series#Obj_drillReport> |
... | @@ -72,7 +72,7 @@ | ... | @@ -72,7 +72,7 @@ |
72 | ] [ sp:object | 72 | ] [ sp:object |
73 | [ sp:varName "description"^^xsd:string | 73 | [ sp:varName "description"^^xsd:string |
74 | ] ; | 74 | ] ; |
75 | - sp:predicate rdfs:comment ; | 75 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
76 | sp:subject | 76 | sp:subject |
77 | [ sp:varName "equipmentFailureAndRepair"^^xsd:string | 77 | [ sp:varName "equipmentFailureAndRepair"^^xsd:string |
78 | ] | 78 | ] | ... | ... |
... | @@ -21,7 +21,7 @@ | ... | @@ -21,7 +21,7 @@ |
21 | 21 | ||
22 | <http://www.reportinghub.no/ep/transform/1.1/ddr/formTestInfo> | 22 | <http://www.reportinghub.no/ep/transform/1.1/ddr/formTestInfo> |
23 | rdf:type owl:Ontology ; | 23 | rdf:type owl:Ontology ; |
24 | - owl:imports <http://www.reportinghub.no/ep/schema/1.0/material> , <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/spin/1.1/lib> ; | 24 | + owl:imports <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/schema/1.0/material> ; |
25 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . | 25 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . |
26 | 26 | ||
27 | <http://www.witsml.org/schemas/1series#Obj_drillReport> | 27 | <http://www.witsml.org/schemas/1series#Obj_drillReport> |
... | @@ -169,7 +169,7 @@ | ... | @@ -169,7 +169,7 @@ |
169 | ] [ sp:object | 169 | ] [ sp:object |
170 | [ sp:varName "description"^^xsd:string | 170 | [ sp:varName "description"^^xsd:string |
171 | ] ; | 171 | ] ; |
172 | - sp:predicate rdfs:comment ; | 172 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#description> ; |
173 | sp:subject | 173 | sp:subject |
174 | [ sp:varName "wirelineFormationTest"^^xsd:string | 174 | [ sp:varName "wirelineFormationTest"^^xsd:string |
175 | ] | 175 | ] | ... | ... |
This diff is collapsed. Click to expand it.
... | @@ -118,7 +118,7 @@ | ... | @@ -118,7 +118,7 @@ |
118 | <ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:LithologyInformation" /> | 118 | <ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:LithologyInformation" /> |
119 | 119 | ||
120 | <ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:WellControlIncident" /> | 120 | <ddrswp:Table arg:report="{= ?report }" arg:template="ddr-tables:WellControlIncident" /> |
121 | - <ui:forEach ui:resultSet="{# SELECT DISTINCT ?startedAt ?comment WHERE {?report ep-report:reportOn ?reportOn . ?reportOn ep-core:hasPart ?wci . ?wci a ?wciClass . ?wciClass rdfs:subClassOf ep-activity:WellControlIncident . OPTIONAL { ?wci ep-activity:startedAt ?startedAt . } . ?wci rdfs:comment ?comment . } ORDER BY (?startedAt) }" > | 121 | + <ui:forEach ui:resultSet="{# SELECT DISTINCT ?startedAt ?comment WHERE {?report ep-report:reportOn ?reportOn . ?reportOn ep-core:hasPart ?wci . ?wci a ?wciClass . ?wciClass rdfs:subClassOf ep-activity:WellControlIncident . OPTIONAL { ?wci ep-activity:startedAt ?startedAt . } . ?wci ep-core:description ?comment . } ORDER BY (?startedAt) }" > |
122 | <p>{= ?comment }</p> | 122 | <p>{= ?comment }</p> |
123 | </ui:forEach> | 123 | </ui:forEach> |
124 | 124 | ... | ... |
-
Please register or login to post a comment