David Price

Update bit

...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <http://www.reportinghub.no/ep/spin/ddr-tables> 21 <http://www.reportinghub.no/ep/spin/ddr-tables>
22 rdf:type owl:Ontology ; 22 rdf:type owl:Ontology ;
23 rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ; 23 rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ;
24 - owl:imports <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/ddr> ; 24 + owl:imports <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://www.reportinghub.no/spin/rh> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> ;
25 owl:versionInfo "0.1.0"^^xsd:string . 25 owl:versionInfo "0.1.0"^^xsd:string .
26 26
27 ddr-tables:BitRecord 27 ddr-tables:BitRecord
...@@ -293,25 +293,32 @@ ddr-tables:BitRecord ...@@ -293,25 +293,32 @@ ddr-tables:BitRecord
293 [ sp:varName "drillBitType"^^xsd:string 293 [ sp:varName "drillBitType"^^xsd:string
294 ] 294 ]
295 ] [ sp:object 295 ] [ sp:object
296 - [ sp:varName "dbDiam"^^xsd:string 296 + [ sp:varName "model"^^xsd:string
297 ] ; 297 ] ;
298 - sp:predicate <http://www.reportinghub.no/ep/schema/equipment#diameterOfDrillBit> ; 298 + sp:predicate <http://www.reportinghub.no/ep/schema/equipment#codeAssignedByAManufacturer> ;
299 sp:subject 299 sp:subject
300 [ sp:varName "drillBitType"^^xsd:string 300 [ sp:varName "drillBitType"^^xsd:string
301 ] 301 ]
302 - ] [ sp:object 302 + ])
303 - [ sp:varName "bitSize"^^xsd:string 303 + ] [ rdf:type sp:Optional ;
304 + sp:elements ([ sp:object
305 + [ sp:varName "drillBitSizeType"^^xsd:string
304 ] ; 306 ] ;
305 - sp:predicate <http://www.reportinghub.no/ep/schema/core#inch> ; 307 + sp:predicate rdf:type ;
306 sp:subject 308 sp:subject
307 - [ sp:varName "dbDiam"^^xsd:string 309 + [ sp:varName "drillBit"^^xsd:string
310 + ]
311 + ] [ sp:object <http://www.reportinghub.no/ep/schema/equipment#ClassOfDrillBitBySize> ;
312 + sp:predicate rdf:type ;
313 + sp:subject
314 + [ sp:varName "drillBitSizeType"^^xsd:string
308 ] 315 ]
309 ] [ sp:object 316 ] [ sp:object
310 - [ sp:varName "model"^^xsd:string 317 + [ sp:varName "bitSize"^^xsd:string
311 ] ; 318 ] ;
312 - sp:predicate <http://www.reportinghub.no/ep/schema/equipment#codeAssignedByAManufacturer> ; 319 + sp:predicate rdfs:label ;
313 sp:subject 320 sp:subject
314 - [ sp:varName "drillBitType"^^xsd:string 321 + [ sp:varName "drillBitSizeType"^^xsd:string
315 ] 322 ]
316 ]) 323 ])
317 ] [ rdf:type sp:Optional ; 324 ] [ rdf:type sp:Optional ;
......