David Price

Added Marine Operations and Marine Ship Operations section and normalizeDatedComment function

...@@ -205,6 +205,86 @@ ep-mpr-spin-lib:buildWellTestTypeURI ...@@ -205,6 +205,86 @@ ep-mpr-spin-lib:buildWellTestTypeURI
205 ]) 205 ])
206 ] . 206 ] .
207 207
208 +ep-mpr-spin-lib:normalizeDatedComment
209 + rdf:type spin:Function ;
210 + rdfs:subClassOf ep-mpr-spin-lib:Function ;
211 + spin:body
212 + [ rdf:type sp:Select ;
213 + sp:resultVariables ([ sp:varName "normalizedDatedComment"^^xsd:string
214 + ]) ;
215 + sp:where ([ sp:object spin:_arg1 ;
216 + sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#commentUpon> ;
217 + sp:subject
218 + [ sp:varName "comment"^^xsd:string
219 + ]
220 + ] [ sp:object
221 + [ sp:varName "commentText"^^xsd:string
222 + ] ;
223 + sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#commentMade> ;
224 + sp:subject
225 + [ sp:varName "comment"^^xsd:string
226 + ]
227 + ] [ rdf:type sp:Optional ;
228 + sp:elements ([ sp:object
229 + [ sp:varName "startedAt"^^xsd:string
230 + ] ;
231 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#startedAt> ;
232 + sp:subject spin:_arg1
233 + ])
234 + ] [ rdf:type sp:Optional ;
235 + sp:elements ([ sp:object
236 + [ sp:varName "finishedAt"^^xsd:string
237 + ] ;
238 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#finishedAt> ;
239 + sp:subject spin:_arg1
240 + ])
241 + ] [ rdf:type sp:Bind ;
242 + sp:expression
243 + [ rdf:type sp:if ;
244 + sp:arg1 [ rdf:type sp:bound ;
245 + sp:arg1 [ sp:varName "startedAt"^^xsd:string
246 + ]
247 + ] ;
248 + sp:arg2 [ sp:varName "startedAt"^^xsd:string
249 + ] ;
250 + sp:arg3 "No Start"
251 + ] ;
252 + sp:variable
253 + [ sp:varName "started"^^xsd:string
254 + ]
255 + ] [ rdf:type sp:Bind ;
256 + sp:expression
257 + [ rdf:type sp:if ;
258 + sp:arg1 [ rdf:type sp:bound ;
259 + sp:arg1 [ sp:varName "finishedAt"^^xsd:string
260 + ]
261 + ] ;
262 + sp:arg2 [ sp:varName "finishedAt"^^xsd:string
263 + ] ;
264 + sp:arg3 "No Finish"
265 + ] ;
266 + sp:variable
267 + [ sp:varName "finished"^^xsd:string
268 + ]
269 + ] [ rdf:type sp:Bind ;
270 + sp:expression
271 + [ rdf:type fn:concat ;
272 + sp:arg1 [ sp:varName "commentText"^^xsd:string
273 + ] ;
274 + sp:arg2 " (" ;
275 + sp:arg3 [ sp:varName "started"^^xsd:string
276 + ] ;
277 + sp:arg4 " TO " ;
278 + sp:arg5 [ sp:varName "finished"^^xsd:string
279 + ] ;
280 + sp:arg6 " )"
281 + ] ;
282 + sp:variable
283 + [ sp:varName "normalizedDatedComment"^^xsd:string
284 + ]
285 + ])
286 + ] .
287 +
208 ep-mpr-spin-lib:selectAverageAmountOfMaterialFlag 288 ep-mpr-spin-lib:selectAverageAmountOfMaterialFlag
209 rdf:type spin:Function ; 289 rdf:type spin:Function ;
210 rdfs:label "select AverageAmountOfMaterialFlag"^^xsd:string ; 290 rdfs:label "select AverageAmountOfMaterialFlag"^^xsd:string ;
......
...@@ -61,6 +61,13 @@ WHERE { ...@@ -61,6 +61,13 @@ WHERE {
61 61
62 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionOperationActivity" /> 62 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionOperationActivity" />
63 63
64 + <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionOperationCargoShip" />
65 +
66 + <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionOperationMarine" />
67 + <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionOperationMarineShip" />
68 +
69 +
70 +
64 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionVolumes" /> 71 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionVolumes" />
65 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductFlows" /> 72 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductFlows" />
66 73
......