David Price
...@@ -48,7 +48,7 @@ sp:if ...@@ -48,7 +48,7 @@ sp:if
48 48
49 <http://www.reportinghub.no/ep/mpr/spin/1.1/lib> 49 <http://www.reportinghub.no/ep/mpr/spin/1.1/lib>
50 rdf:type owl:Ontology ; 50 rdf:type owl:Ontology ;
51 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/production-equipment> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/production-core> , <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production> ; 51 + owl:imports <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/schema/1.0/production-core> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/production-equipment> , <http://spinrdf.org/spin> ;
52 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 52 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
53 53
54 ep-mpr-spin-lib:Function 54 ep-mpr-spin-lib:Function
...@@ -117,9 +117,7 @@ arg2 is the interval identifier"""^^xsd:string ; ...@@ -117,9 +117,7 @@ arg2 is the interval identifier"""^^xsd:string ;
117 sp:arg1 spin:_arg1 117 sp:arg1 spin:_arg1
118 ] ; 118 ] ;
119 sp:arg2 "$" ; 119 sp:arg2 "$" ;
120 - sp:arg3 [ rdf:type ep-spin-lib:normalizeString ; 120 + sp:arg3 spin:_arg2
121 - sp:arg1 spin:_arg2
122 - ]
123 ] 121 ]
124 ] ; 122 ] ;
125 sp:variable 123 sp:variable
......
...@@ -80,53 +80,7 @@ ...@@ -80,53 +80,7 @@
80 ] ; 80 ] ;
81 spin:rule 81 spin:rule
82 [ rdf:type sp:Construct ; 82 [ rdf:type sp:Construct ;
83 - rdfs:comment "STEP 10001d Create the interval identifier - dateEnd from context"^^xsd:string ; 83 + rdfs:comment "STEP 10001n Create the ProductionReport - extract the name from productionOperation/installation"^^xsd:string ;
84 - sp:templates ([ sp:object
85 - [ sp:varName "dateEnd"^^xsd:string
86 - ] ;
87 - sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
88 - sp:subject spin:_this
89 - ]) ;
90 - sp:where ([ sp:object
91 - [ sp:varName "contextRef"^^xsd:string
92 - ] ;
93 - sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
94 - sp:subject spin:_this
95 - ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_report> ;
96 - sp:predicate rdf:type ;
97 - sp:subject
98 - [ sp:varName "contextRef"^^xsd:string
99 - ]
100 - ] [ sp:object
101 - [ sp:varName "dateEnd"^^xsd:string
102 - ] ;
103 - sp:predicate <http://www.epim.no/schemas/mprml/1#dateEnd> ;
104 - sp:subject
105 - [ sp:varName "contextRef"^^xsd:string
106 - ]
107 - ] [ rdf:type sp:NotExists ;
108 - sp:elements ([ sp:object
109 - [ sp:varName "date"^^xsd:string
110 - ] ;
111 - sp:predicate <http://www.epim.no/schemas/mprml/1#date> ;
112 - sp:subject
113 - [ sp:varName "contextRef"^^xsd:string
114 - ]
115 - ])
116 - ] [ rdf:type sp:NotExists ;
117 - sp:elements ([ sp:object
118 - [ sp:varName "dateStart"^^xsd:string
119 - ] ;
120 - sp:predicate <http://www.epim.no/schemas/mprml/1#dateStart> ;
121 - sp:subject
122 - [ sp:varName "contextRef"^^xsd:string
123 - ]
124 - ])
125 - ])
126 - ] ;
127 - spin:rule
128 - [ rdf:type sp:Construct ;
129 - rdfs:comment "STEP 10001o Create the ProductionReport - extract the name from productVolume/installation"^^xsd:string ;
130 sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 84 sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
131 sp:predicate rdf:type ; 85 sp:predicate rdf:type ;
132 sp:subject 86 sp:subject
...@@ -162,21 +116,21 @@ ...@@ -162,21 +116,21 @@
162 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ; 116 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
163 sp:subject spin:_this 117 sp:subject spin:_this
164 ] [ sp:object 118 ] [ sp:object
165 - [ sp:varName "productVolumeRef"^^xsd:string 119 + [ sp:varName "productionOperationRef"^^xsd:string
166 ] ; 120 ] ;
167 sp:predicate <http://www.epim.no/schemas/mprml/1#objectRef> ; 121 sp:predicate <http://www.epim.no/schemas/mprml/1#objectRef> ;
168 sp:subject spin:_this 122 sp:subject spin:_this
169 - ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_productVolume> ; 123 + ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_productionOperation> ;
170 sp:predicate rdf:type ; 124 sp:predicate rdf:type ;
171 sp:subject 125 sp:subject
172 - [ sp:varName "productVolumeRef"^^xsd:string 126 + [ sp:varName "productionOperationRef"^^xsd:string
173 ] 127 ]
174 ] [ sp:object 128 ] [ sp:object
175 [ sp:varName "installationRef"^^xsd:string 129 [ sp:varName "installationRef"^^xsd:string
176 ] ; 130 ] ;
177 sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ; 131 sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ;
178 sp:subject 132 sp:subject
179 - [ sp:varName "productVolumeRef"^^xsd:string 133 + [ sp:varName "productionOperationRef"^^xsd:string
180 ] 134 ]
181 ] [ sp:object 135 ] [ sp:object
182 [ sp:varName "installationRef"^^xsd:string 136 [ sp:varName "installationRef"^^xsd:string
...@@ -187,25 +141,6 @@ ...@@ -187,25 +141,6 @@
187 ] 141 ]
188 ] [ rdf:type sp:NotExists ; 142 ] [ rdf:type sp:NotExists ;
189 sp:elements ([ sp:object 143 sp:elements ([ sp:object
190 - [ sp:varName "productionOperationRef"^^xsd:string
191 - ] ;
192 - sp:predicate <http://www.epim.no/schemas/mprml/1#objectRef> ;
193 - sp:subject spin:_this
194 - ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_productionOperation> ;
195 - sp:predicate rdf:type ;
196 - sp:subject
197 - [ sp:varName "productionOperationRef"^^xsd:string
198 - ]
199 - ] [ sp:object
200 - [ sp:varName "installationRef"^^xsd:string
201 - ] ;
202 - sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ;
203 - sp:subject
204 - [ sp:varName "productionOperationRef"^^xsd:string
205 - ]
206 - ])
207 - ] [ rdf:type sp:NotExists ;
208 - sp:elements ([ sp:object
209 [ sp:varName "contextRef"^^xsd:string 144 [ sp:varName "contextRef"^^xsd:string
210 ] ; 145 ] ;
211 sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ; 146 sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
...@@ -216,7 +151,7 @@ ...@@ -216,7 +151,7 @@
216 [ sp:varName "contextRef"^^xsd:string 151 [ sp:varName "contextRef"^^xsd:string
217 ] 152 ]
218 ] [ sp:object 153 ] [ sp:object
219 - [ sp:varName "installationRef"^^xsd:string 154 + [ sp:varName "something"^^xsd:string
220 ] ; 155 ] ;
221 sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ; 156 sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ;
222 sp:subject 157 sp:subject
...@@ -248,67 +183,166 @@ ...@@ -248,67 +183,166 @@
248 ] ; 183 ] ;
249 spin:rule 184 spin:rule
250 [ rdf:type sp:Construct ; 185 [ rdf:type sp:Construct ;
251 - rdfs:comment "STEP 10001n Create the ProductionReport - extract the name from productionOperation/installation"^^xsd:string ; 186 + rdfs:comment "STEP 10001e Create the interval identifier - no date"^^xsd:string ;
252 - sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 187 + sp:templates ([ sp:object "noDate" ;
188 + sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
189 + sp:subject spin:_this
190 + ]) ;
191 + sp:where ([ sp:object
192 + [ sp:varName "contextRef"^^xsd:string
193 + ] ;
194 + sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
195 + sp:subject spin:_this
196 + ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_report> ;
253 sp:predicate rdf:type ; 197 sp:predicate rdf:type ;
254 sp:subject 198 sp:subject
255 - [ sp:varName "productionReport"^^xsd:string 199 + [ sp:varName "contextRef"^^xsd:string
256 ] 200 ]
257 - ] [ sp:object _:b2 ; 201 + ] [ rdf:type sp:NotExists ;
258 - sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ; 202 + sp:elements ([ sp:object
203 + [ sp:varName "dateEnd"^^xsd:string
204 + ] ;
205 + sp:predicate <http://www.epim.no/schemas/mprml/1#dateEnd> ;
259 sp:subject 206 sp:subject
260 - [ sp:varName "productionReport"^^xsd:string 207 + [ sp:varName "contextRef"^^xsd:string
261 ] 208 ]
262 - ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> ; 209 + ])
210 + ] [ rdf:type sp:NotExists ;
211 + sp:elements ([ sp:object
212 + [ sp:varName "date"^^xsd:string
213 + ] ;
214 + sp:predicate <http://www.epim.no/schemas/mprml/1#date> ;
215 + sp:subject
216 + [ sp:varName "contextRef"^^xsd:string
217 + ]
218 + ])
219 + ] [ rdf:type sp:NotExists ;
220 + sp:elements ([ sp:object
221 + [ sp:varName "dateStart"^^xsd:string
222 + ] ;
223 + sp:predicate <http://www.epim.no/schemas/mprml/1#dateStart> ;
224 + sp:subject
225 + [ sp:varName "contextRef"^^xsd:string
226 + ]
227 + ])
228 + ])
229 + ] ;
230 + spin:rule
231 + [ rdf:type sp:Construct ;
232 + rdfs:comment "STEP 10020 Add the operator"^^xsd:string ;
233 + sp:templates ([ sp:object _:b2 ;
234 + sp:predicate <http://www.reportinghub.no/ep/schema/facility#facilityOperator> ;
235 + sp:subject
236 + [ sp:varName "temporalPartOfAProductionFacility"^^xsd:string
237 + ]
238 + ] [ sp:object <http://www.reportinghub.no/ep/schema/organization#Organization> ;
263 sp:predicate rdf:type ; 239 sp:predicate rdf:type ;
264 sp:subject _:b2 240 sp:subject _:b2
265 ] [ sp:object 241 ] [ sp:object
266 - [ sp:varName "installation"^^xsd:string 242 + [ sp:varName "operator"^^xsd:string
267 ] ; 243 ] ;
268 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 244 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
269 sp:subject _:b2 245 sp:subject _:b2
246 + ]) ;
247 + sp:where ([ sp:object
248 + [ sp:varName "contextRef"^^xsd:string
249 + ] ;
250 + sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
251 + sp:subject spin:_this
252 + ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_report> ;
253 + sp:predicate rdf:type ;
254 + sp:subject
255 + [ sp:varName "contextRef"^^xsd:string
256 + ]
257 + ] [ sp:object
258 + [ sp:varName "operatorRef"^^xsd:string
259 + ] ;
260 + sp:predicate <http://www.epim.no/schemas/mprml/1#operatorRef> ;
261 + sp:subject
262 + [ sp:varName "contextRef"^^xsd:string
263 + ]
264 + ] [ sp:object
265 + [ sp:varName "operatorRef"^^xsd:string
266 + ] ;
267 + sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ;
268 + sp:subject
269 + [ sp:varName "operator"^^xsd:string
270 + ]
270 ] [ sp:object spin:_this ; 271 ] [ sp:object spin:_this ;
271 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ; 272 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ;
272 sp:subject 273 sp:subject
273 [ sp:varName "productionReport"^^xsd:string 274 [ sp:varName "productionReport"^^xsd:string
274 ] 275 ]
275 ] [ sp:object 276 ] [ sp:object
276 - [ sp:varName "contextRef"^^xsd:string 277 + [ sp:varName "temporalPartOfAProductionFacility"^^xsd:string
277 ] ; 278 ] ;
278 - sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ; 279 + sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ;
279 - sp:subject _:b2 280 + sp:subject
280 - ]) ; 281 + [ sp:varName "productionReport"^^xsd:string
281 - sp:where ([ sp:object 282 + ]
282 - [ sp:varName "intervalIdentifier"^^xsd:string 283 + ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> ;
284 + sp:predicate rdf:type ;
285 + sp:subject
286 + [ sp:varName "temporalPartOfAProductionFacility"^^xsd:string
287 + ]
288 + ])
289 + ] ;
290 + spin:rule
291 + [ rdf:type sp:Construct ;
292 + rdfs:comment "STEP 10001d Create the interval identifier - dateEnd from context"^^xsd:string ;
293 + sp:templates ([ sp:object
294 + [ sp:varName "dateEnd"^^xsd:string
283 ] ; 295 ] ;
284 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ; 296 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
285 sp:subject spin:_this 297 sp:subject spin:_this
286 - ] [ sp:object 298 + ]) ;
287 - [ sp:varName "productionOperationRef"^^xsd:string 299 + sp:where ([ sp:object
300 + [ sp:varName "contextRef"^^xsd:string
288 ] ; 301 ] ;
289 - sp:predicate <http://www.epim.no/schemas/mprml/1#objectRef> ; 302 + sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
290 sp:subject spin:_this 303 sp:subject spin:_this
291 - ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_productionOperation> ; 304 + ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_report> ;
292 sp:predicate rdf:type ; 305 sp:predicate rdf:type ;
293 sp:subject 306 sp:subject
294 - [ sp:varName "productionOperationRef"^^xsd:string 307 + [ sp:varName "contextRef"^^xsd:string
295 ] 308 ]
296 ] [ sp:object 309 ] [ sp:object
297 - [ sp:varName "installationRef"^^xsd:string 310 + [ sp:varName "dateEnd"^^xsd:string
298 ] ; 311 ] ;
299 - sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ; 312 + sp:predicate <http://www.epim.no/schemas/mprml/1#dateEnd> ;
300 sp:subject 313 sp:subject
301 - [ sp:varName "productionOperationRef"^^xsd:string 314 + [ sp:varName "contextRef"^^xsd:string
302 ] 315 ]
303 - ] [ sp:object 316 + ] [ rdf:type sp:NotExists ;
304 - [ sp:varName "installationRef"^^xsd:string 317 + sp:elements ([ sp:object
318 + [ sp:varName "date"^^xsd:string
305 ] ; 319 ] ;
306 - sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ; 320 + sp:predicate <http://www.epim.no/schemas/mprml/1#date> ;
307 sp:subject 321 sp:subject
308 - [ sp:varName "installation"^^xsd:string 322 + [ sp:varName "contextRef"^^xsd:string
309 ] 323 ]
324 + ])
310 ] [ rdf:type sp:NotExists ; 325 ] [ rdf:type sp:NotExists ;
311 sp:elements ([ sp:object 326 sp:elements ([ sp:object
327 + [ sp:varName "dateStart"^^xsd:string
328 + ] ;
329 + sp:predicate <http://www.epim.no/schemas/mprml/1#dateStart> ;
330 + sp:subject
331 + [ sp:varName "contextRef"^^xsd:string
332 + ]
333 + ])
334 + ])
335 + ] ;
336 + spin:rule
337 + [ rdf:type sp:Construct ;
338 + rdfs:comment "STEP 10001c Create the interval identifier - date from context"^^xsd:string ;
339 + sp:templates ([ sp:object
340 + [ sp:varName "date"^^xsd:string
341 + ] ;
342 + sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
343 + sp:subject spin:_this
344 + ]) ;
345 + sp:where ([ sp:object
312 [ sp:varName "contextRef"^^xsd:string 346 [ sp:varName "contextRef"^^xsd:string
313 ] ; 347 ] ;
314 sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ; 348 sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
...@@ -319,39 +353,81 @@ ...@@ -319,39 +353,81 @@
319 [ sp:varName "contextRef"^^xsd:string 353 [ sp:varName "contextRef"^^xsd:string
320 ] 354 ]
321 ] [ sp:object 355 ] [ sp:object
322 - [ sp:varName "something"^^xsd:string 356 + [ sp:varName "date"^^xsd:string
323 ] ; 357 ] ;
324 - sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ; 358 + sp:predicate <http://www.epim.no/schemas/mprml/1#date> ;
359 + sp:subject
360 + [ sp:varName "contextRef"^^xsd:string
361 + ]
362 + ] [ rdf:type sp:NotExists ;
363 + sp:elements ([ sp:object
364 + [ sp:varName "dateStart"^^xsd:string
365 + ] ;
366 + sp:predicate <http://www.epim.no/schemas/mprml/1#dateStart> ;
325 sp:subject 367 sp:subject
326 [ sp:varName "contextRef"^^xsd:string 368 [ sp:varName "contextRef"^^xsd:string
327 ] 369 ]
328 ]) 370 ])
329 - ] [ rdf:type sp:Bind ; 371 + ] [ rdf:type sp:NotExists ;
330 - sp:expression 372 + sp:elements ([ sp:object
331 - [ rdf:type spl:object ; 373 + [ sp:varName "dateEnd"^^xsd:string
332 - sp:arg1 [ sp:varName "installationRef"^^xsd:string
333 ] ; 374 ] ;
334 - sp:arg2 rdfs:label 375 + sp:predicate <http://www.epim.no/schemas/mprml/1#dateEnd> ;
376 + sp:subject
377 + [ sp:varName "contextRef"^^xsd:string
378 + ]
379 + ])
380 + ])
335 ] ; 381 ] ;
336 - sp:variable 382 + spin:rule
337 - [ sp:varName "normalizedInstallationName"^^xsd:string 383 + [ rdf:type sp:Construct ;
384 + rdfs:comment "STEP 10001a Create the inteval identifier - dateStart and dateEnd from context"^^xsd:string ;
385 + sp:templates ([ sp:object
386 + [ sp:varName "intervalIdentifier"^^xsd:string
387 + ] ;
388 + sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
389 + sp:subject spin:_this
390 + ]) ;
391 + sp:where ([ sp:object
392 + [ sp:varName "contextRef"^^xsd:string
393 + ] ;
394 + sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
395 + sp:subject spin:_this
396 + ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_report> ;
397 + sp:predicate rdf:type ;
398 + sp:subject
399 + [ sp:varName "contextRef"^^xsd:string
400 + ]
401 + ] [ sp:object
402 + [ sp:varName "dateStart"^^xsd:string
403 + ] ;
404 + sp:predicate <http://www.epim.no/schemas/mprml/1#dateStart> ;
405 + sp:subject
406 + [ sp:varName "contextRef"^^xsd:string
407 + ]
408 + ] [ sp:object
409 + [ sp:varName "dateEnd"^^xsd:string
410 + ] ;
411 + sp:predicate <http://www.epim.no/schemas/mprml/1#dateEnd> ;
412 + sp:subject
413 + [ sp:varName "contextRef"^^xsd:string
338 ] 414 ]
339 ] [ rdf:type sp:Bind ; 415 ] [ rdf:type sp:Bind ;
340 sp:expression 416 sp:expression
341 - [ rdf:type ep-mpr-spin-lib:buildProductionReportURI ; 417 + [ rdf:type ep-mpr-spin-lib:buildIntervalIdentifier ;
342 - sp:arg1 [ sp:varName "normalizedInstallationName"^^xsd:string 418 + sp:arg1 [ sp:varName "dateStart"^^xsd:string
343 ] ; 419 ] ;
344 - sp:arg2 [ sp:varName "intervalIdentifier"^^xsd:string 420 + sp:arg2 [ sp:varName "dateEnd"^^xsd:string
345 ] 421 ]
346 ] ; 422 ] ;
347 sp:variable 423 sp:variable
348 - [ sp:varName "productionReport"^^xsd:string 424 + [ sp:varName "intervalIdentifier"^^xsd:string
349 ] 425 ]
350 ]) 426 ])
351 ] ; 427 ] ;
352 spin:rule 428 spin:rule
353 [ rdf:type sp:Construct ; 429 [ rdf:type sp:Construct ;
354 - rdfs:comment "STEP 10001m Create the ProductionReport - extract the name from context/installation"^^xsd:string ; 430 + rdfs:comment "STEP 10001p Create the ProductionReport - no installation"^^xsd:string ;
355 sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 431 sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
356 sp:predicate rdf:type ; 432 sp:predicate rdf:type ;
357 sp:subject 433 sp:subject
...@@ -365,11 +441,6 @@ ...@@ -365,11 +441,6 @@
365 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> ; 441 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> ;
366 sp:predicate rdf:type ; 442 sp:predicate rdf:type ;
367 sp:subject _:b3 443 sp:subject _:b3
368 - ] [ sp:object
369 - [ sp:varName "installation"^^xsd:string
370 - ] ;
371 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
372 - sp:subject _:b3
373 ] [ sp:object spin:_this ; 444 ] [ sp:object spin:_this ;
374 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ; 445 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ;
375 sp:subject 446 sp:subject
...@@ -386,7 +457,46 @@ ...@@ -386,7 +457,46 @@
386 ] ; 457 ] ;
387 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ; 458 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
388 sp:subject spin:_this 459 sp:subject spin:_this
460 + ] [ rdf:type sp:NotExists ;
461 + sp:elements ([ sp:object
462 + [ sp:varName "productVolumeRef"^^xsd:string
463 + ] ;
464 + sp:predicate <http://www.epim.no/schemas/mprml/1#objectRef> ;
465 + sp:subject spin:_this
466 + ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_productVolume> ;
467 + sp:predicate rdf:type ;
468 + sp:subject
469 + [ sp:varName "productVolumeRef"^^xsd:string
470 + ]
471 + ] [ sp:object
472 + [ sp:varName "something"^^xsd:string
473 + ] ;
474 + sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ;
475 + sp:subject
476 + [ sp:varName "productVolumeRef"^^xsd:string
477 + ]
478 + ])
479 + ] [ rdf:type sp:NotExists ;
480 + sp:elements ([ sp:object
481 + [ sp:varName "productionOperationRef"^^xsd:string
482 + ] ;
483 + sp:predicate <http://www.epim.no/schemas/mprml/1#objectRef> ;
484 + sp:subject spin:_this
485 + ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_productionOperation> ;
486 + sp:predicate rdf:type ;
487 + sp:subject
488 + [ sp:varName "productionOperationRef"^^xsd:string
489 + ]
389 ] [ sp:object 490 ] [ sp:object
491 + [ sp:varName "somethingElse"^^xsd:string
492 + ] ;
493 + sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ;
494 + sp:subject
495 + [ sp:varName "productionOperationRef"^^xsd:string
496 + ]
497 + ])
498 + ] [ rdf:type sp:NotExists ;
499 + sp:elements ([ sp:object
390 [ sp:varName "contextRef"^^xsd:string 500 [ sp:varName "contextRef"^^xsd:string
391 ] ; 501 ] ;
392 sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ; 502 sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
...@@ -397,33 +507,25 @@ ...@@ -397,33 +507,25 @@
397 [ sp:varName "contextRef"^^xsd:string 507 [ sp:varName "contextRef"^^xsd:string
398 ] 508 ]
399 ] [ sp:object 509 ] [ sp:object
400 - [ sp:varName "installationRef"^^xsd:string 510 + [ sp:varName "somethingElseElse"^^xsd:string
401 ] ; 511 ] ;
402 sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ; 512 sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ;
403 sp:subject 513 sp:subject
404 [ sp:varName "contextRef"^^xsd:string 514 [ sp:varName "contextRef"^^xsd:string
405 ] 515 ]
406 - ] [ sp:object 516 + ])
407 - [ sp:varName "installationRef"^^xsd:string
408 - ] ;
409 - sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ;
410 - sp:subject
411 - [ sp:varName "installation"^^xsd:string
412 - ]
413 ] [ rdf:type sp:Bind ; 517 ] [ rdf:type sp:Bind ;
414 sp:expression 518 sp:expression
415 - [ rdf:type spl:object ; 519 + [ rdf:type ep-spin-lib:normalizeString ;
416 - sp:arg1 [ sp:varName "installationRef"^^xsd:string 520 + sp:arg1 "noInstallation"
417 - ] ;
418 - sp:arg2 rdfs:label
419 ] ; 521 ] ;
420 sp:variable 522 sp:variable
421 - [ sp:varName "normalizedInstallationName"^^xsd:string 523 + [ sp:varName "normalizedName"^^xsd:string
422 ] 524 ]
423 ] [ rdf:type sp:Bind ; 525 ] [ rdf:type sp:Bind ;
424 sp:expression 526 sp:expression
425 [ rdf:type ep-mpr-spin-lib:buildProductionReportURI ; 527 [ rdf:type ep-mpr-spin-lib:buildProductionReportURI ;
426 - sp:arg1 [ sp:varName "normalizedInstallationName"^^xsd:string 528 + sp:arg1 [ sp:varName "normalizedName"^^xsd:string
427 ] ; 529 ] ;
428 sp:arg2 [ sp:varName "intervalIdentifier"^^xsd:string 530 sp:arg2 [ sp:varName "intervalIdentifier"^^xsd:string
429 ] 531 ]
...@@ -495,7 +597,7 @@ ...@@ -495,7 +597,7 @@
495 ] ; 597 ] ;
496 spin:rule 598 spin:rule
497 [ rdf:type sp:Construct ; 599 [ rdf:type sp:Construct ;
498 - rdfs:comment "STEP 10001p Create the ProductionReport - no installation"^^xsd:string ; 600 + rdfs:comment "STEP 10001o Create the ProductionReport - extract the name from productVolume/installation"^^xsd:string ;
499 sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 601 sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
500 sp:predicate rdf:type ; 602 sp:predicate rdf:type ;
501 sp:subject 603 sp:subject
...@@ -509,6 +611,11 @@ ...@@ -509,6 +611,11 @@
509 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> ; 611 ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> ;
510 sp:predicate rdf:type ; 612 sp:predicate rdf:type ;
511 sp:subject _:b4 613 sp:subject _:b4
614 + ] [ sp:object
615 + [ sp:varName "installation"^^xsd:string
616 + ] ;
617 + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
618 + sp:subject _:b4
512 ] [ sp:object spin:_this ; 619 ] [ sp:object spin:_this ;
513 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ; 620 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ;
514 sp:subject 621 sp:subject
...@@ -525,8 +632,7 @@ ...@@ -525,8 +632,7 @@
525 ] ; 632 ] ;
526 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ; 633 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
527 sp:subject spin:_this 634 sp:subject spin:_this
528 - ] [ rdf:type sp:NotExists ; 635 + ] [ sp:object
529 - sp:elements ([ sp:object
530 [ sp:varName "productVolumeRef"^^xsd:string 636 [ sp:varName "productVolumeRef"^^xsd:string
531 ] ; 637 ] ;
532 sp:predicate <http://www.epim.no/schemas/mprml/1#objectRef> ; 638 sp:predicate <http://www.epim.no/schemas/mprml/1#objectRef> ;
...@@ -543,7 +649,13 @@ ...@@ -543,7 +649,13 @@
543 sp:subject 649 sp:subject
544 [ sp:varName "productVolumeRef"^^xsd:string 650 [ sp:varName "productVolumeRef"^^xsd:string
545 ] 651 ]
546 - ]) 652 + ] [ sp:object
653 + [ sp:varName "installationRef"^^xsd:string
654 + ] ;
655 + sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ;
656 + sp:subject
657 + [ sp:varName "installation"^^xsd:string
658 + ]
547 ] [ rdf:type sp:NotExists ; 659 ] [ rdf:type sp:NotExists ;
548 sp:elements ([ sp:object 660 sp:elements ([ sp:object
549 [ sp:varName "productionOperationRef"^^xsd:string 661 [ sp:varName "productionOperationRef"^^xsd:string
...@@ -556,7 +668,7 @@ ...@@ -556,7 +668,7 @@
556 [ sp:varName "productionOperationRef"^^xsd:string 668 [ sp:varName "productionOperationRef"^^xsd:string
557 ] 669 ]
558 ] [ sp:object 670 ] [ sp:object
559 - [ sp:varName "installationRef"^^xsd:string 671 + [ sp:varName "something"^^xsd:string
560 ] ; 672 ] ;
561 sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ; 673 sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ;
562 sp:subject 674 sp:subject
...@@ -575,7 +687,7 @@ ...@@ -575,7 +687,7 @@
575 [ sp:varName "contextRef"^^xsd:string 687 [ sp:varName "contextRef"^^xsd:string
576 ] 688 ]
577 ] [ sp:object 689 ] [ sp:object
578 - [ sp:varName "installationRef"^^xsd:string 690 + [ sp:varName "somethingElse"^^xsd:string
579 ] ; 691 ] ;
580 sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ; 692 sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ;
581 sp:subject 693 sp:subject
...@@ -584,16 +696,18 @@ ...@@ -584,16 +696,18 @@
584 ]) 696 ])
585 ] [ rdf:type sp:Bind ; 697 ] [ rdf:type sp:Bind ;
586 sp:expression 698 sp:expression
587 - [ rdf:type ep-spin-lib:normalizeString ; 699 + [ rdf:type spl:object ;
588 - sp:arg1 "noInstallation" 700 + sp:arg1 [ sp:varName "installationRef"^^xsd:string
701 + ] ;
702 + sp:arg2 rdfs:label
589 ] ; 703 ] ;
590 sp:variable 704 sp:variable
591 - [ sp:varName "normalizedName"^^xsd:string 705 + [ sp:varName "normalizedInstallationName"^^xsd:string
592 ] 706 ]
593 ] [ rdf:type sp:Bind ; 707 ] [ rdf:type sp:Bind ;
594 sp:expression 708 sp:expression
595 [ rdf:type ep-mpr-spin-lib:buildProductionReportURI ; 709 [ rdf:type ep-mpr-spin-lib:buildProductionReportURI ;
596 - sp:arg1 [ sp:varName "normalizedName"^^xsd:string 710 + sp:arg1 [ sp:varName "normalizedInstallationName"^^xsd:string
597 ] ; 711 ] ;
598 sp:arg2 [ sp:varName "intervalIdentifier"^^xsd:string 712 sp:arg2 [ sp:varName "intervalIdentifier"^^xsd:string
599 ] 713 ]
...@@ -605,120 +719,42 @@ ...@@ -605,120 +719,42 @@
605 ] ; 719 ] ;
606 spin:rule 720 spin:rule
607 [ rdf:type sp:Construct ; 721 [ rdf:type sp:Construct ;
608 - rdfs:comment "STEP 10001e Create the interval identifier - no date"^^xsd:string ; 722 + rdfs:comment "STEP 10001m Create the ProductionReport - extract the name from context/installation"^^xsd:string ;
609 - sp:templates ([ sp:object "noDate" ; 723 + sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
610 - sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
611 - sp:subject spin:_this
612 - ]) ;
613 - sp:where ([ sp:object
614 - [ sp:varName "contextRef"^^xsd:string
615 - ] ;
616 - sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
617 - sp:subject spin:_this
618 - ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_report> ;
619 sp:predicate rdf:type ; 724 sp:predicate rdf:type ;
620 sp:subject 725 sp:subject
621 - [ sp:varName "contextRef"^^xsd:string 726 + [ sp:varName "productionReport"^^xsd:string
622 - ]
623 - ] [ rdf:type sp:NotExists ;
624 - sp:elements ([ sp:object
625 - [ sp:varName "dateEnd"^^xsd:string
626 - ] ;
627 - sp:predicate <http://www.epim.no/schemas/mprml/1#dateEnd> ;
628 - sp:subject
629 - [ sp:varName "contextRef"^^xsd:string
630 - ]
631 - ])
632 - ] [ rdf:type sp:NotExists ;
633 - sp:elements ([ sp:object
634 - [ sp:varName "date"^^xsd:string
635 - ] ;
636 - sp:predicate <http://www.epim.no/schemas/mprml/1#date> ;
637 - sp:subject
638 - [ sp:varName "contextRef"^^xsd:string
639 - ]
640 - ])
641 - ] [ rdf:type sp:NotExists ;
642 - sp:elements ([ sp:object
643 - [ sp:varName "dateStart"^^xsd:string
644 - ] ;
645 - sp:predicate <http://www.epim.no/schemas/mprml/1#dateStart> ;
646 - sp:subject
647 - [ sp:varName "contextRef"^^xsd:string
648 ] 727 ]
649 - ]) 728 + ] [ sp:object _:b5 ;
650 - ]) 729 + sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ;
651 - ] ;
652 - spin:rule
653 - [ rdf:type sp:Construct ;
654 - rdfs:comment "STEP 10020 Add the operator"^^xsd:string ;
655 - sp:templates ([ sp:object _:b5 ;
656 - sp:predicate <http://www.reportinghub.no/ep/schema/facility#facilityOperator> ;
657 sp:subject 730 sp:subject
658 - [ sp:varName "temporalPartOfAProductionFacility"^^xsd:string 731 + [ sp:varName "productionReport"^^xsd:string
659 ] 732 ]
660 - ] [ sp:object <http://www.reportinghub.no/ep/schema/organization#Organization> ; 733 + ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> ;
661 sp:predicate rdf:type ; 734 sp:predicate rdf:type ;
662 sp:subject _:b5 735 sp:subject _:b5
663 ] [ sp:object 736 ] [ sp:object
664 - [ sp:varName "operator"^^xsd:string 737 + [ sp:varName "installation"^^xsd:string
665 ] ; 738 ] ;
666 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 739 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
667 sp:subject _:b5 740 sp:subject _:b5
668 - ]) ;
669 - sp:where ([ sp:object
670 - [ sp:varName "contextRef"^^xsd:string
671 - ] ;
672 - sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
673 - sp:subject spin:_this
674 - ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_report> ;
675 - sp:predicate rdf:type ;
676 - sp:subject
677 - [ sp:varName "contextRef"^^xsd:string
678 - ]
679 - ] [ sp:object
680 - [ sp:varName "operatorRef"^^xsd:string
681 - ] ;
682 - sp:predicate <http://www.epim.no/schemas/mprml/1#operatorRef> ;
683 - sp:subject
684 - [ sp:varName "contextRef"^^xsd:string
685 - ]
686 - ] [ sp:object
687 - [ sp:varName "operatorRef"^^xsd:string
688 - ] ;
689 - sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ;
690 - sp:subject
691 - [ sp:varName "operator"^^xsd:string
692 - ]
693 ] [ sp:object spin:_this ; 741 ] [ sp:object spin:_this ;
694 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ; 742 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ;
695 sp:subject 743 sp:subject
696 [ sp:varName "productionReport"^^xsd:string 744 [ sp:varName "productionReport"^^xsd:string
697 ] 745 ]
698 ] [ sp:object 746 ] [ sp:object
699 - [ sp:varName "temporalPartOfAProductionFacility"^^xsd:string 747 + [ sp:varName "contextRef"^^xsd:string
700 - ] ;
701 - sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ;
702 - sp:subject
703 - [ sp:varName "productionReport"^^xsd:string
704 - ]
705 - ] [ sp:object <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> ;
706 - sp:predicate rdf:type ;
707 - sp:subject
708 - [ sp:varName "temporalPartOfAProductionFacility"^^xsd:string
709 - ]
710 - ])
711 ] ; 748 ] ;
712 - spin:rule 749 + sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ;
713 - [ rdf:type sp:Construct ; 750 + sp:subject _:b5
714 - rdfs:comment "STEP 10001b Create the interval identifier - date and dateEnd from context"^^xsd:string ; 751 + ]) ;
715 - sp:templates ([ sp:object 752 + sp:where ([ sp:object
716 [ sp:varName "intervalIdentifier"^^xsd:string 753 [ sp:varName "intervalIdentifier"^^xsd:string
717 ] ; 754 ] ;
718 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ; 755 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
719 sp:subject spin:_this 756 sp:subject spin:_this
720 - ]) ; 757 + ] [ sp:object
721 - sp:where ([ sp:object
722 [ sp:varName "contextRef"^^xsd:string 758 [ sp:varName "contextRef"^^xsd:string
723 ] ; 759 ] ;
724 sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ; 760 sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
...@@ -729,92 +765,47 @@ ...@@ -729,92 +765,47 @@
729 [ sp:varName "contextRef"^^xsd:string 765 [ sp:varName "contextRef"^^xsd:string
730 ] 766 ]
731 ] [ sp:object 767 ] [ sp:object
732 - [ sp:varName "date"^^xsd:string 768 + [ sp:varName "installationRef"^^xsd:string
733 - ] ;
734 - sp:predicate <http://www.epim.no/schemas/mprml/1#date> ;
735 - sp:subject
736 - [ sp:varName "contextRef"^^xsd:string
737 - ]
738 - ] [ rdf:type sp:NotExists ;
739 - sp:elements ([ sp:object
740 - [ sp:varName "dateStart"^^xsd:string
741 ] ; 769 ] ;
742 - sp:predicate <http://www.epim.no/schemas/mprml/1#dateStart> ; 770 + sp:predicate <http://www.epim.no/schemas/mprml/1#installationRef> ;
743 sp:subject 771 sp:subject
744 [ sp:varName "contextRef"^^xsd:string 772 [ sp:varName "contextRef"^^xsd:string
745 ] 773 ]
746 - ])
747 ] [ sp:object 774 ] [ sp:object
748 - [ sp:varName "dateEnd"^^xsd:string 775 + [ sp:varName "installationRef"^^xsd:string
749 ] ; 776 ] ;
750 - sp:predicate <http://www.epim.no/schemas/mprml/1#dateEnd> ; 777 + sp:predicate <http://www.reportinghub.no/ep/schema/production-core#derivedFrom> ;
751 sp:subject 778 sp:subject
752 - [ sp:varName "contextRef"^^xsd:string 779 + [ sp:varName "installation"^^xsd:string
753 ] 780 ]
754 ] [ rdf:type sp:Bind ; 781 ] [ rdf:type sp:Bind ;
755 sp:expression 782 sp:expression
756 - [ rdf:type ep-mpr-spin-lib:buildIntervalIdentifier ; 783 + [ rdf:type spl:object ;
757 - sp:arg1 [ sp:varName "date"^^xsd:string 784 + sp:arg1 [ sp:varName "installationRef"^^xsd:string
758 ] ; 785 ] ;
759 - sp:arg2 [ sp:varName "dateEnd"^^xsd:string 786 + sp:arg2 rdfs:label
760 - ]
761 ] ; 787 ] ;
762 sp:variable 788 sp:variable
763 - [ sp:varName "intervalIdentifier"^^xsd:string 789 + [ sp:varName "normalizedInstallationName"^^xsd:string
764 - ]
765 - ])
766 - ] ;
767 - spin:rule
768 - [ rdf:type sp:Construct ;
769 - rdfs:comment "STEP 10001a Create the inteval identifier - dateStart and dateEnd from context"^^xsd:string ;
770 - sp:templates ([ sp:object
771 - [ sp:varName "intervalIdentifier"^^xsd:string
772 - ] ;
773 - sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
774 - sp:subject spin:_this
775 - ]) ;
776 - sp:where ([ sp:object
777 - [ sp:varName "contextRef"^^xsd:string
778 - ] ;
779 - sp:predicate <http://www.epim.no/schemas/mprml/1#contextRef> ;
780 - sp:subject spin:_this
781 - ] [ sp:object <http://www.epim.no/schemas/mprml/1#Obj_report> ;
782 - sp:predicate rdf:type ;
783 - sp:subject
784 - [ sp:varName "contextRef"^^xsd:string
785 - ]
786 - ] [ sp:object
787 - [ sp:varName "dateStart"^^xsd:string
788 - ] ;
789 - sp:predicate <http://www.epim.no/schemas/mprml/1#dateStart> ;
790 - sp:subject
791 - [ sp:varName "contextRef"^^xsd:string
792 - ]
793 - ] [ sp:object
794 - [ sp:varName "dateEnd"^^xsd:string
795 - ] ;
796 - sp:predicate <http://www.epim.no/schemas/mprml/1#dateEnd> ;
797 - sp:subject
798 - [ sp:varName "contextRef"^^xsd:string
799 ] 790 ]
800 ] [ rdf:type sp:Bind ; 791 ] [ rdf:type sp:Bind ;
801 sp:expression 792 sp:expression
802 - [ rdf:type ep-mpr-spin-lib:buildIntervalIdentifier ; 793 + [ rdf:type ep-mpr-spin-lib:buildProductionReportURI ;
803 - sp:arg1 [ sp:varName "dateStart"^^xsd:string 794 + sp:arg1 [ sp:varName "normalizedInstallationName"^^xsd:string
804 ] ; 795 ] ;
805 - sp:arg2 [ sp:varName "dateEnd"^^xsd:string 796 + sp:arg2 [ sp:varName "intervalIdentifier"^^xsd:string
806 ] 797 ]
807 ] ; 798 ] ;
808 sp:variable 799 sp:variable
809 - [ sp:varName "intervalIdentifier"^^xsd:string 800 + [ sp:varName "productionReport"^^xsd:string
810 ] 801 ]
811 ]) 802 ])
812 ] ; 803 ] ;
813 spin:rule 804 spin:rule
814 [ rdf:type sp:Construct ; 805 [ rdf:type sp:Construct ;
815 - rdfs:comment "STEP 10001c Create the interval identifier - date from context"^^xsd:string ; 806 + rdfs:comment "STEP 10001b Create the interval identifier - date and dateEnd from context"^^xsd:string ;
816 sp:templates ([ sp:object 807 sp:templates ([ sp:object
817 - [ sp:varName "date"^^xsd:string 808 + [ sp:varName "intervalIdentifier"^^xsd:string
818 ] ; 809 ] ;
819 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ; 810 sp:predicate <http://www.reportinghub.no/ep/schema/production-core#intervalIdentifier> ;
820 sp:subject spin:_this 811 sp:subject spin:_this
...@@ -845,19 +836,28 @@ ...@@ -845,19 +836,28 @@
845 [ sp:varName "contextRef"^^xsd:string 836 [ sp:varName "contextRef"^^xsd:string
846 ] 837 ]
847 ]) 838 ])
848 - ] [ rdf:type sp:NotExists ; 839 + ] [ sp:object
849 - sp:elements ([ sp:object
850 [ sp:varName "dateEnd"^^xsd:string 840 [ sp:varName "dateEnd"^^xsd:string
851 ] ; 841 ] ;
852 sp:predicate <http://www.epim.no/schemas/mprml/1#dateEnd> ; 842 sp:predicate <http://www.epim.no/schemas/mprml/1#dateEnd> ;
853 sp:subject 843 sp:subject
854 [ sp:varName "contextRef"^^xsd:string 844 [ sp:varName "contextRef"^^xsd:string
855 ] 845 ]
856 - ]) 846 + ] [ rdf:type sp:Bind ;
847 + sp:expression
848 + [ rdf:type ep-mpr-spin-lib:buildIntervalIdentifier ;
849 + sp:arg1 [ sp:varName "date"^^xsd:string
850 + ] ;
851 + sp:arg2 [ sp:varName "dateEnd"^^xsd:string
852 + ]
853 + ] ;
854 + sp:variable
855 + [ sp:varName "intervalIdentifier"^^xsd:string
856 + ]
857 ]) 857 ])
858 ] . 858 ] .
859 859
860 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionReport-v1.0> 860 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-productionReport-v1.0>
861 rdf:type owl:Ontology ; 861 rdf:type owl:Ontology ;
862 - owl:imports <http://www.reportinghub.no/ep/dpr/spin/1.1/lib> , <http://spinrdf.org/spin> , <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/mpr/spin/1.1/lib> ; 862 + owl:imports <http://www.reportinghub.no/ep/mpr/spin/1.1/lib> , <http://www.epim.no/schemas/mprml/1> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/dpr/spin/1.1/lib> ;
863 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 863 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......