David Price

Remove company URIs for non validated company name use

...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 20
21 <http://www.reportinghub.no/ep/transform/1.1/ddr/logInfo> 21 <http://www.reportinghub.no/ep/transform/1.1/ddr/logInfo>
22 rdf:type owl:Ontology ; 22 rdf:type owl:Ontology ;
23 - 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> ; 23 + 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> ;
24 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 24 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
25 25
26 <http://www.witsml.org/schemas/1series#Obj_drillReport> 26 <http://www.witsml.org/schemas/1series#Obj_drillReport>
...@@ -77,26 +77,14 @@ ...@@ -77,26 +77,14 @@
77 sp:subject 77 sp:subject
78 [ sp:varName "wellBoreLogRun"^^xsd:string 78 [ sp:varName "wellBoreLogRun"^^xsd:string
79 ] 79 ]
80 - ] [ sp:object <http://www.reportinghub.no/ep/schema/organization#Organization> ; 80 + ] [ sp:object <http://www.reportinghub.no/ep/schema/organization#Company> ;
81 sp:predicate rdf:type ; 81 sp:predicate rdf:type ;
82 sp:subject _:b3 82 sp:subject _:b3
83 ] [ sp:object 83 ] [ sp:object
84 - [ sp:varName "serviceCompany"^^xsd:string
85 - ] ;
86 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
87 - sp:subject _:b3
88 - ] [ sp:object
89 [ sp:varName "nameServiceCompany"^^xsd:string 84 [ sp:varName "nameServiceCompany"^^xsd:string
90 ] ; 85 ] ;
91 sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ; 86 sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
92 - sp:subject 87 + sp:subject _:b3
93 - [ sp:varName "serviceCompany"^^xsd:string
94 - ]
95 - ] [ sp:object <http://www.reportinghub.no/ep/schema/organization#Company> ;
96 - sp:predicate rdf:type ;
97 - sp:subject
98 - [ sp:varName "serviceCompany"^^xsd:string
99 - ]
100 ] [ sp:object _:b4 ; 88 ] [ sp:object _:b4 ;
101 sp:predicate <http://www.reportinghub.no/ep/schema/activity#wellBoreLoggingTool> ; 89 sp:predicate <http://www.reportinghub.no/ep/schema/activity#wellBoreLoggingTool> ;
102 sp:subject 90 sp:subject
...@@ -475,24 +463,6 @@ ...@@ -475,24 +463,6 @@
475 sp:variable 463 sp:variable
476 [ sp:varName "lengthScaleTvdTool"^^xsd:string 464 [ sp:varName "lengthScaleTvdTool"^^xsd:string
477 ] 465 ]
478 - ] [ rdf:type sp:Bind ;
479 - sp:expression
480 - [ rdf:type ep-spin-lib:normalizeString ;
481 - sp:arg1 [ sp:varName "nameServiceCompany"^^xsd:string
482 - ]
483 - ] ;
484 - sp:variable
485 - [ sp:varName "normalizedNameServiceCompany"^^xsd:string
486 - ]
487 - ] [ rdf:type sp:Bind ;
488 - sp:expression
489 - [ rdf:type rhspin:companyById ;
490 - arg:id [ sp:varName "normalizedNameServiceCompany"^^xsd:string
491 - ]
492 - ] ;
493 - sp:variable
494 - [ sp:varName "serviceCompany"^^xsd:string
495 - ]
496 ]) 466 ])
497 ] ; 467 ] ;
498 spin:rule 468 spin:rule
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <rhswp:NameValuePair arg:name="Report Number:" arg:value="{# SELECT ?repNum WHERE {?report ep-report:dailyDrillingReportNumber ?repNum}}" /> 26 <rhswp:NameValuePair arg:name="Report Number:" arg:value="{# SELECT ?repNum WHERE {?report ep-report:dailyDrillingReportNumber ?repNum}}" />
27 <rhswp:NameValuePair arg:name="Wellbore:" arg:value="{# SELECT ?wbName WHERE {?wb ep-core:npdCode ?wbName}}" /> 27 <rhswp:NameValuePair arg:name="Wellbore:" arg:value="{# SELECT ?wbName WHERE {?wb ep-core:npdCode ?wbName}}" />
28 <rhswp:NameValuePair arg:name="Status:" arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType rdfs:label ?repTypeName}}" /> 28 <rhswp:NameValuePair arg:name="Status:" arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType rdfs:label ?repTypeName}}" />
29 - <rhswp:NameValuePair arg:name="Operator:" arg:value="{# SELECT ?parentName WHERE {?activity ep-activity:drillingOperator ?opCo . ?opCo ep-core:temporalPartOf ?parentCo . ?parentCo ep-core:name ?parentName }}" /> 29 + <rhswp:NameValuePair arg:name="Operator:" arg:value="{# SELECT ?operatorName WHERE {?activity ep-activity:drillingOperator ?operator . ?operator ep-core:name ?operatorName }}" />
30 <rhswp:NameValuePair arg:name="Rig name:" arg:value="{# SELECT ?rigName WHERE {?rig ep-core:npdName ?rigName}}" /> 30 <rhswp:NameValuePair arg:name="Rig name:" arg:value="{# SELECT ?rigName WHERE {?rig ep-core:npdName ?rigName}}" />
31 <rhswp:NameValuePair arg:name="Spud date:" arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MM-dd'), ?unbound) }" /> 31 <rhswp:NameValuePair arg:name="Spud date:" arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MM-dd'), ?unbound) }" />
32 <rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{# SELECT ?kellyElevVMeas WHERE {?activity ep-activity:onRig ?rigState . ?rigState ep-core:hasPart ?kellyBushing . ?kellyBushing a ep-eqt:KellyBushing . ?kellyBushing ep-eqt:elevationOfKellyBushing ?kellyElev . ?kellyElev ep-core:metre ?kellyElevMeas}}" /> 32 <rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{# SELECT ?kellyElevVMeas WHERE {?activity ep-activity:onRig ?rigState . ?rigState ep-core:hasPart ?kellyBushing . ?kellyBushing a ep-eqt:KellyBushing . ?kellyBushing ep-eqt:elevationOfKellyBushing ?kellyElev . ?kellyElev ep-core:metre ?kellyElevMeas}}" />
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 48
49 <rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{# SELECT DISTINCT ?wbID WHERE {?wb ep-core:npdNumber ?wbID}}" /> 49 <rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{# SELECT DISTINCT ?wbID WHERE {?wb ep-core:npdNumber ?wbID}}" />
50 <rhswp:NameValuePair arg:name="Created date:" arg:value="{= IF(bound(?createdAt), spif:dateFormat(?createdAt, 'yyyy-MM-dd HH:mm'), ?unbound) }" /> 50 <rhswp:NameValuePair arg:name="Created date:" arg:value="{= IF(bound(?createdAt), spif:dateFormat(?createdAt, 'yyyy-MM-dd HH:mm'), ?unbound) }" />
51 - <rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{# SELECT ?parentName WHERE {?activity ep-activity:drillingContractor ?contractor . ?contractor ep-core:temporalPartOf ?parentCo . ?parentCo ep-core:name ?parentName}}" /> 51 + <rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{# SELECT ?contractorName WHERE {?activity ep-activity:drillingContractor ?contractor . ?contractor ep-core:name ?contractorName}}" />
52 <rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{= spl:object(?rig, ep-core:npdCode) }" /> 52 <rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{= spl:object(?rig, ep-core:npdCode) }" />
53 <rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{= IF(bound(?completeDate), spif:dateFormat(?completeDate, 'yyyy-MM-dd'), ?unbound) }" /> 53 <rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{= IF(bound(?completeDate), spif:dateFormat(?completeDate, 'yyyy-MM-dd'), ?unbound) }" />
54 <rhswp:NameValuePair arg:name="Water depth MSL m:" arg:value="{# SELECT ?waterDepthVal WHERE {?activity ep-activity:onRig ?rigState . ?rigState a ep-fac:TemporalPartOfARig . ?rigState ep-core:hasPart ?water . ?water a ep-fac:SurroundingWater . ?water ep-fac:depthOfSurroundingWater ?waterDepth . ?waterDepth ep-core:metre ?waterDepthVal}}" /> 54 <rhswp:NameValuePair arg:name="Water depth MSL m:" arg:value="{# SELECT ?waterDepthVal WHERE {?activity ep-activity:onRig ?rigState . ?rigState a ep-fac:TemporalPartOfARig . ?rigState ep-core:hasPart ?water . ?water a ep-fac:SurroundingWater . ?water ep-fac:depthOfSurroundingWater ?waterDepth . ?waterDepth ep-core:metre ?waterDepthVal}}" />
......