Fixed well test dup in reports and Operations depths in ddr tables
Showing
2 changed files
with
43 additions
and
4 deletions
... | @@ -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/spin/rh> , <http://www.reportinghub.no/ep/spin/1.1/lib> ; | 25 | + 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> ; |
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 |
... | @@ -3251,7 +3251,9 @@ ddr-tables:Operations | ... | @@ -3251,7 +3251,9 @@ ddr-tables:Operations |
3251 | sp:subject | 3251 | sp:subject |
3252 | [ sp:varName "id"^^xsd:string | 3252 | [ sp:varName "id"^^xsd:string |
3253 | ] | 3253 | ] |
3254 | - ] [ sp:object | 3254 | + ]) |
3255 | + ] [ rdf:type sp:Optional ; | ||
3256 | + sp:elements ([ sp:object | ||
3255 | [ sp:varName "wellbore"^^xsd:string | 3257 | [ sp:varName "wellbore"^^xsd:string |
3256 | ] ; | 3258 | ] ; |
3257 | sp:predicate <http://www.reportinghub.no/ep/schema/activity#onWellBore> ; | 3259 | sp:predicate <http://www.reportinghub.no/ep/schema/activity#onWellBore> ; |
... | @@ -3272,17 +3274,54 @@ ddr-tables:Operations | ... | @@ -3272,17 +3274,54 @@ ddr-tables:Operations |
3272 | sp:subject | 3274 | sp:subject |
3273 | [ sp:varName "ed"^^xsd:string | 3275 | [ sp:varName "ed"^^xsd:string |
3274 | ] | 3276 | ] |
3277 | + ]) | ||
3278 | + ] [ rdf:type sp:Optional ; | ||
3279 | + sp:elements ([ sp:object | ||
3280 | + [ sp:varName "wellbore"^^xsd:string | ||
3281 | + ] ; | ||
3282 | + sp:predicate <http://www.reportinghub.no/ep/schema/activity#onWellBore> ; | ||
3283 | + sp:subject | ||
3284 | + [ sp:varName "part"^^xsd:string | ||
3285 | + ] | ||
3286 | + ] [ sp:object | ||
3287 | + [ sp:varName "id2"^^xsd:string | ||
3288 | + ] ; | ||
3289 | + sp:predicate <http://www.reportinghub.no/ep/schema/well#initialBottomHoleMeasuredDepth> ; | ||
3290 | + sp:subject | ||
3291 | + [ sp:varName "wellbore"^^xsd:string | ||
3292 | + ] | ||
3293 | + ] [ sp:object | ||
3294 | + [ sp:varName "startDepth2"^^xsd:string | ||
3295 | + ] ; | ||
3296 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#metre> ; | ||
3297 | + sp:subject | ||
3298 | + [ sp:varName "id2"^^xsd:string | ||
3299 | + ] | ||
3300 | + ] [ sp:object | ||
3301 | + [ sp:varName "ed2"^^xsd:string | ||
3302 | + ] ; | ||
3303 | + sp:predicate <http://www.reportinghub.no/ep/schema/well#finalBottomHoleMeasuredDepth> ; | ||
3304 | + sp:subject | ||
3305 | + [ sp:varName "wellbore"^^xsd:string | ||
3306 | + ] | ||
3307 | + ] [ sp:object | ||
3308 | + [ sp:varName "endDepth2"^^xsd:string | ||
3309 | + ] ; | ||
3310 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#metre> ; | ||
3311 | + sp:subject | ||
3312 | + [ sp:varName "ed2"^^xsd:string | ||
3313 | + ] | ||
3275 | ] [ rdf:type sp:Bind ; | 3314 | ] [ rdf:type sp:Bind ; |
3276 | sp:expression | 3315 | sp:expression |
3277 | [ rdf:type sp:sub ; | 3316 | [ rdf:type sp:sub ; |
3278 | sp:arg1 [ rdf:type spif:cast ; | 3317 | sp:arg1 [ rdf:type spif:cast ; |
3279 | arg:datatype xsd:float ; | 3318 | arg:datatype xsd:float ; |
3280 | - sp:arg1 [ sp:varName "endDepth"^^xsd:string | 3319 | + sp:arg1 [ sp:varName "endDepth2"^^xsd:string |
3281 | ] | 3320 | ] |
3282 | ] ; | 3321 | ] ; |
3283 | sp:arg2 [ rdf:type spif:cast ; | 3322 | sp:arg2 [ rdf:type spif:cast ; |
3284 | arg:datatype xsd:float ; | 3323 | arg:datatype xsd:float ; |
3285 | - sp:arg1 [ sp:varName "startDepth"^^xsd:string | 3324 | + sp:arg1 [ sp:varName "startDepth2"^^xsd:string |
3286 | ] | 3325 | ] |
3287 | ] | 3326 | ] |
3288 | ] ; | 3327 | ] ; | ... | ... |
This diff could not be displayed because it is too large.
-
Please register or login to post a comment