David Price

Fixed well test dup in reports and Operations depths in ddr tables

......@@ -22,7 +22,7 @@
<http://www.reportinghub.no/ep/spin/ddr-tables>
rdf:type owl:Ontology ;
rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ;
owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/spin/1.1/lib> ;
owl:imports <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://spinrdf.org/spin> ;
owl:versionInfo "0.1.0"^^xsd:string .
ddr-tables:BitRecord
......@@ -3251,7 +3251,9 @@ ddr-tables:Operations
sp:subject
[ sp:varName "id"^^xsd:string
]
] [ sp:object
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "wellbore"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/activity#onWellBore> ;
......@@ -3272,17 +3274,54 @@ ddr-tables:Operations
sp:subject
[ sp:varName "ed"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "wellbore"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/activity#onWellBore> ;
sp:subject
[ sp:varName "part"^^xsd:string
]
] [ sp:object
[ sp:varName "id2"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/well#initialBottomHoleMeasuredDepth> ;
sp:subject
[ sp:varName "wellbore"^^xsd:string
]
] [ sp:object
[ sp:varName "startDepth2"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#metre> ;
sp:subject
[ sp:varName "id2"^^xsd:string
]
] [ sp:object
[ sp:varName "ed2"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/well#finalBottomHoleMeasuredDepth> ;
sp:subject
[ sp:varName "wellbore"^^xsd:string
]
] [ sp:object
[ sp:varName "endDepth2"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#metre> ;
sp:subject
[ sp:varName "ed2"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type sp:sub ;
sp:arg1 [ rdf:type spif:cast ;
arg:datatype xsd:float ;
sp:arg1 [ sp:varName "endDepth"^^xsd:string
sp:arg1 [ sp:varName "endDepth2"^^xsd:string
]
] ;
sp:arg2 [ rdf:type spif:cast ;
arg:datatype xsd:float ;
sp:arg1 [ sp:varName "startDepth"^^xsd:string
sp:arg1 [ sp:varName "startDepth2"^^xsd:string
]
]
] ;
......
......@@ -21,7 +21,7 @@
<http://www.reportinghub.no/ep/transform/1.1/ddr/wellTestInfo>
rdf:type owl:Ontology ;
owl:imports <http://www.reportinghub.no/ep/schema/1.0/material> , <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> , <http://www.reportinghub.no/ep/schema/1.0/material> ;
owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
<http://www.witsml.org/schemas/1series#Obj_drillReport>
......@@ -264,6 +264,19 @@
sp:variable
[ sp:varName "wellBore"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:buildWellTestURI ;
sp:arg1 [ sp:varName "normalizedWellBoreName"^^xsd:string
] ;
sp:arg2 [ sp:varName "dTimStart"^^xsd:string
] ;
sp:arg3 [ sp:varName "localname"^^xsd:string
]
] ;
sp:variable
[ sp:varName "wellTest"^^xsd:string
]
])
] ;
spin:rule
......