David Leal

DPR2 date bug fixed

...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 20
21 <http://www.reportinghub.no/ep/mpr/spin/1.1/lib> 21 <http://www.reportinghub.no/ep/mpr/spin/1.1/lib>
22 rdf:type owl:Ontology ; 22 rdf:type owl:Ontology ;
23 - 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.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production> ; 23 + 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-activity> , <http://www.reportinghub.no/ep/schema/1.0/production-equipment> , <http://spinrdf.org/spin> ;
24 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 24 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
25 25
26 ep-mpr-spin-lib:Function 26 ep-mpr-spin-lib:Function
...@@ -38,10 +38,17 @@ arg2 is the report end date"""^^xsd:string ; ...@@ -38,10 +38,17 @@ arg2 is the report end date"""^^xsd:string ;
38 ]) ; 38 ]) ;
39 sp:where ([ rdf:type sp:Bind ; 39 sp:where ([ rdf:type sp:Bind ;
40 sp:expression 40 sp:expression
41 - [ rdf:type fn:concat ; 41 + [ rdf:type sp:if ;
42 + sp:arg1 [ rdf:type sp:eq ;
43 + sp:arg1 spin:_arg1 ;
44 + sp:arg2 spin:_arg2
45 + ] ;
46 + sp:arg2 spin:_arg1 ;
47 + sp:arg3 [ rdf:type fn:concat ;
42 sp:arg1 spin:_arg1 ; 48 sp:arg1 spin:_arg1 ;
43 sp:arg2 "$" ; 49 sp:arg2 "$" ;
44 sp:arg3 spin:_arg2 50 sp:arg3 spin:_arg2
51 + ]
45 ] ; 52 ] ;
46 sp:variable 53 sp:variable
47 [ sp:varName "intervalIdentifier"^^xsd:string 54 [ sp:varName "intervalIdentifier"^^xsd:string
......