David Price

replaced smf substring with fn substring function

...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 22
23 <http://www.reportinghub.no/ep/mpr/spin/1.1/lib> 23 <http://www.reportinghub.no/ep/mpr/spin/1.1/lib>
24 rdf:type owl:Ontology ; 24 rdf:type owl:Ontology ;
25 - 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> ; 25 + owl:imports <http://spinrdf.org/spin> , <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/production-equipment> , <http://www.reportinghub.no/ep/spin/1.1/lib> ;
26 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 26 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
27 27
28 ep-mpr-spin-lib:Function 28 ep-mpr-spin-lib:Function
...@@ -2797,75 +2797,75 @@ At present checks only that the start is the first day of the month and that the ...@@ -2797,75 +2797,75 @@ At present checks only that the start is the first day of the month and that the
2797 sp:expression 2797 sp:expression
2798 [ rdf:type sp:if ; 2798 [ rdf:type sp:if ;
2799 sp:arg1 [ rdf:type sp:eq ; 2799 sp:arg1 [ rdf:type sp:eq ;
2800 - sp:arg1 [ rdf:type smf:subString ; 2800 + sp:arg1 [ rdf:type fn:substring ;
2801 - arg:fromIndex 0 ; 2801 + sp:arg1 spin:_arg1 ;
2802 - arg:toIndex 7 ; 2802 + sp:arg2 0 ;
2803 - sp:arg1 spin:_arg1 2803 + sp:arg3 7
2804 ] ; 2804 ] ;
2805 - sp:arg2 [ rdf:type smf:subString ; 2805 + sp:arg2 [ rdf:type fn:substring ;
2806 - arg:fromIndex 0 ; 2806 + sp:arg1 spin:_arg3 ;
2807 - arg:toIndex 7 ; 2807 + sp:arg2 0 ;
2808 - sp:arg1 spin:_arg3 2808 + sp:arg3 7
2809 ] 2809 ]
2810 ] ; 2810 ] ;
2811 sp:arg2 [ rdf:type sp:if ; 2811 sp:arg2 [ rdf:type sp:if ;
2812 sp:arg1 [ rdf:type sp:eq ; 2812 sp:arg1 [ rdf:type sp:eq ;
2813 - sp:arg1 [ rdf:type smf:subString ; 2813 + sp:arg1 [ rdf:type fn:substring ;
2814 - arg:fromIndex 0 ; 2814 + sp:arg1 spin:_arg2 ;
2815 - arg:toIndex 7 ; 2815 + sp:arg2 0 ;
2816 - sp:arg1 spin:_arg2 2816 + sp:arg3 7
2817 ] ; 2817 ] ;
2818 - sp:arg2 [ rdf:type smf:subString ; 2818 + sp:arg2 [ rdf:type fn:substring ;
2819 - arg:fromIndex 0 ; 2819 + sp:arg1 spin:_arg3 ;
2820 - arg:toIndex 7 ; 2820 + sp:arg2 0 ;
2821 - sp:arg1 spin:_arg3 2821 + sp:arg3 7
2822 ] 2822 ]
2823 ] ; 2823 ] ;
2824 sp:arg2 [ rdf:type sp:if ; 2824 sp:arg2 [ rdf:type sp:if ;
2825 sp:arg1 [ rdf:type sp:eq ; 2825 sp:arg1 [ rdf:type sp:eq ;
2826 - sp:arg1 [ rdf:type smf:subString ; 2826 + sp:arg1 [ rdf:type fn:substring ;
2827 - arg:fromIndex 8 ; 2827 + sp:arg1 spin:_arg1 ;
2828 - arg:toIndex 10 ; 2828 + sp:arg2 8 ;
2829 - sp:arg1 spin:_arg1 2829 + sp:arg3 10
2830 ] ; 2830 ] ;
2831 sp:arg2 "01" 2831 sp:arg2 "01"
2832 ] ; 2832 ] ;
2833 sp:arg2 [ rdf:type sp:if ; 2833 sp:arg2 [ rdf:type sp:if ;
2834 sp:arg1 [ rdf:type sp:eq ; 2834 sp:arg1 [ rdf:type sp:eq ;
2835 - sp:arg1 [ rdf:type smf:subString ; 2835 + sp:arg1 [ rdf:type fn:substring ;
2836 - arg:fromIndex 8 ; 2836 + sp:arg1 spin:_arg2 ;
2837 - arg:toIndex 10 ; 2837 + sp:arg2 8 ;
2838 - sp:arg1 spin:_arg2 2838 + sp:arg3 10
2839 ] ; 2839 ] ;
2840 sp:arg2 "31" 2840 sp:arg2 "31"
2841 ] ; 2841 ] ;
2842 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#existsThroughout> ; 2842 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#existsThroughout> ;
2843 sp:arg3 [ rdf:type sp:if ; 2843 sp:arg3 [ rdf:type sp:if ;
2844 sp:arg1 [ rdf:type sp:eq ; 2844 sp:arg1 [ rdf:type sp:eq ;
2845 - sp:arg1 [ rdf:type smf:subString ; 2845 + sp:arg1 [ rdf:type fn:substring ;
2846 - arg:fromIndex 8 ; 2846 + sp:arg1 spin:_arg2 ;
2847 - arg:toIndex 10 ; 2847 + sp:arg2 8 ;
2848 - sp:arg1 spin:_arg2 2848 + sp:arg3 10
2849 ] ; 2849 ] ;
2850 sp:arg2 "30" 2850 sp:arg2 "30"
2851 ] ; 2851 ] ;
2852 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#existsThroughout> ; 2852 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#existsThroughout> ;
2853 sp:arg3 [ rdf:type sp:if ; 2853 sp:arg3 [ rdf:type sp:if ;
2854 sp:arg1 [ rdf:type sp:eq ; 2854 sp:arg1 [ rdf:type sp:eq ;
2855 - sp:arg1 [ rdf:type smf:subString ; 2855 + sp:arg1 [ rdf:type fn:substring ;
2856 - arg:fromIndex 8 ; 2856 + sp:arg1 spin:_arg2 ;
2857 - arg:toIndex 10 ; 2857 + sp:arg2 8 ;
2858 - sp:arg1 spin:_arg2 2858 + sp:arg3 10
2859 ] ; 2859 ] ;
2860 sp:arg2 "29" 2860 sp:arg2 "29"
2861 ] ; 2861 ] ;
2862 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#existsThroughout> ; 2862 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#existsThroughout> ;
2863 sp:arg3 [ rdf:type sp:if ; 2863 sp:arg3 [ rdf:type sp:if ;
2864 sp:arg1 [ rdf:type sp:eq ; 2864 sp:arg1 [ rdf:type sp:eq ;
2865 - sp:arg1 [ rdf:type smf:subString ; 2865 + sp:arg1 [ rdf:type fn:substring ;
2866 - arg:fromIndex 8 ; 2866 + sp:arg1 spin:_arg2 ;
2867 - arg:toIndex 10 ; 2867 + sp:arg2 8 ;
2868 - sp:arg1 spin:_arg2 2868 + sp:arg3 10
2869 ] ; 2869 ] ;
2870 sp:arg2 "28" 2870 sp:arg2 "28"
2871 ] ; 2871 ] ;
......