David Price

Remove company URIs for non validated company name use

......@@ -20,7 +20,7 @@
<http://www.reportinghub.no/ep/transform/1.1/ddr/logInfo>
rdf:type owl:Ontology ;
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> ;
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> ;
owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
<http://www.witsml.org/schemas/1series#Obj_drillReport>
......@@ -77,26 +77,14 @@
sp:subject
[ sp:varName "wellBoreLogRun"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/organization#Organization> ;
] [ sp:object <http://www.reportinghub.no/ep/schema/organization#Company> ;
sp:predicate rdf:type ;
sp:subject _:b3
] [ sp:object
[ sp:varName "serviceCompany"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
sp:subject _:b3
] [ sp:object
[ sp:varName "nameServiceCompany"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
sp:subject
[ sp:varName "serviceCompany"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/organization#Company> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "serviceCompany"^^xsd:string
]
sp:subject _:b3
] [ sp:object _:b4 ;
sp:predicate <http://www.reportinghub.no/ep/schema/activity#wellBoreLoggingTool> ;
sp:subject
......@@ -475,24 +463,6 @@
sp:variable
[ sp:varName "lengthScaleTvdTool"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizeString ;
sp:arg1 [ sp:varName "nameServiceCompany"^^xsd:string
]
] ;
sp:variable
[ sp:varName "normalizedNameServiceCompany"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type rhspin:companyById ;
arg:id [ sp:varName "normalizedNameServiceCompany"^^xsd:string
]
] ;
sp:variable
[ sp:varName "serviceCompany"^^xsd:string
]
])
] ;
spin:rule
......
......@@ -26,7 +26,7 @@
<rhswp:NameValuePair arg:name="Report Number:" arg:value="{# SELECT ?repNum WHERE {?report ep-report:dailyDrillingReportNumber ?repNum}}" />
<rhswp:NameValuePair arg:name="Wellbore:" arg:value="{# SELECT ?wbName WHERE {?wb ep-core:npdCode ?wbName}}" />
<rhswp:NameValuePair arg:name="Status:" arg:value="{# SELECT ?repTypeName WHERE {?report a ?repType . ?repType rdfs:label ?repTypeName}}" />
<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 }}" />
<rhswp:NameValuePair arg:name="Operator:" arg:value="{# SELECT ?operatorName WHERE {?activity ep-activity:drillingOperator ?operator . ?operator ep-core:name ?operatorName }}" />
<rhswp:NameValuePair arg:name="Rig name:" arg:value="{# SELECT ?rigName WHERE {?rig ep-core:npdName ?rigName}}" />
<rhswp:NameValuePair arg:name="Spud date:" arg:value="{= IF(bound(?spudDate), spif:dateFormat(?spudDate, 'yyyy-MM-dd'), ?unbound) }" />
<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 @@
<rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{# SELECT DISTINCT ?wbID WHERE {?wb ep-core:npdNumber ?wbID}}" />
<rhswp:NameValuePair arg:name="Created date:" arg:value="{= IF(bound(?createdAt), spif:dateFormat(?createdAt, 'yyyy-MM-dd HH:mm'), ?unbound) }" />
<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}}" />
<rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{# SELECT ?contractorName WHERE {?activity ep-activity:drillingContractor ?contractor . ?contractor ep-core:name ?contractorName}}" />
<rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{= spl:object(?rig, ep-core:npdCode) }" />
<rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{= IF(bound(?completeDate), spif:dateFormat(?completeDate, 'yyyy-MM-dd'), ?unbound) }" />
<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}}" />
......