David Price

Replaced rdfs:comment use with new ep-core:description property

...@@ -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 ]
......
...@@ -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
......