Showing
3 changed files
with
58 additions
and
58 deletions
This diff could not be displayed because it is too large.
| ... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | ||
| 20 | <http://www.reportinghub.no/ep/dpr/spin/1.1/lib> | 20 | <http://www.reportinghub.no/ep/dpr/spin/1.1/lib> |
| 21 | rdf:type owl:Ontology ; | 21 | rdf:type owl:Ontology ; |
| 22 | - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.witsml.org/schemas/131/addendum/combo> , <http://www.reportinghub.no/ep/spin/1.1/lib> ; | 22 | + owl:imports <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.witsml.org/schemas/131/addendum/combo> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://spinrdf.org/spin> ; |
| 23 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . | 23 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . |
| 24 | 24 | ||
| 25 | ep-dpr-spin-lib:Function | 25 | ep-dpr-spin-lib:Function |
| ... | @@ -3028,7 +3028,7 @@ ep-dpr-spin-lib:selectLengthScale | ... | @@ -3028,7 +3028,7 @@ ep-dpr-spin-lib:selectLengthScale |
| 3028 | sp:arg1 spin:_arg1 ; | 3028 | sp:arg1 spin:_arg1 ; |
| 3029 | sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#LU_in64> | 3029 | sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#LU_in64> |
| 3030 | ] ; | 3030 | ] ; |
| 3031 | - sp:arg2 <http://www.reportinghub.no/ep/schema/core#sixtyFourth_Inch> ; | 3031 | + sp:arg2 <http://www.reportinghub.no/ep/schema/core#inch_64-1> ; |
| 3032 | sp:arg3 [ rdf:type sp:if ; | 3032 | sp:arg3 [ rdf:type sp:if ; |
| 3033 | sp:arg1 [ rdf:type sp:eq ; | 3033 | sp:arg1 [ rdf:type sp:eq ; |
| 3034 | sp:arg1 spin:_arg1 ; | 3034 | sp:arg1 spin:_arg1 ; |
| ... | @@ -3040,7 +3040,7 @@ ep-dpr-spin-lib:selectLengthScale | ... | @@ -3040,7 +3040,7 @@ ep-dpr-spin-lib:selectLengthScale |
| 3040 | sp:arg1 spin:_arg1 ; | 3040 | sp:arg1 spin:_arg1 ; |
| 3041 | sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#LU_in16> | 3041 | sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#LU_in16> |
| 3042 | ] ; | 3042 | ] ; |
| 3043 | - sp:arg2 <http://www.reportinghub.no/ep/schema/core#sixteenth_inch> ; | 3043 | + sp:arg2 <http://www.reportinghub.no/ep/schema/core#inch_16-1> ; |
| 3044 | sp:arg3 [ rdf:type sp:if ; | 3044 | sp:arg3 [ rdf:type sp:if ; |
| 3045 | sp:arg1 [ rdf:type sp:eq ; | 3045 | sp:arg1 [ rdf:type sp:eq ; |
| 3046 | sp:arg1 spin:_arg1 ; | 3046 | sp:arg1 spin:_arg1 ; |
| ... | @@ -5944,22 +5944,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION | ... | @@ -5944,22 +5944,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION |
| 5944 | rdfs:subClassOf ep-dpr-spin-lib:Function ; | 5944 | rdfs:subClassOf ep-dpr-spin-lib:Function ; |
| 5945 | spin:body | 5945 | spin:body |
| 5946 | [ rdf:type sp:Select ; | 5946 | [ rdf:type sp:Select ; |
| 5947 | - sp:resultVariables (_:b21) ; | ||
| 5948 | - sp:where ([ rdf:type sp:Bind ; | ||
| 5949 | - sp:expression | ||
| 5950 | - [ rdf:type sp:if ; | ||
| 5951 | - sp:arg1 [ rdf:type sp:eq ; | ||
| 5952 | - sp:arg1 spin:_arg1 ; | ||
| 5953 | - sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3> | ||
| 5954 | - ] ; | ||
| 5955 | - sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ; | ||
| 5956 | - sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale> | ||
| 5957 | - ] ; | ||
| 5958 | - sp:variable _:b21 | ||
| 5959 | - ]) | ||
| 5960 | - ] ; | ||
| 5961 | - spin:body | ||
| 5962 | - [ rdf:type sp:Select ; | ||
| 5963 | sp:resultVariables ([ sp:varName "myVar"^^xsd:string | 5947 | sp:resultVariables ([ sp:varName "myVar"^^xsd:string |
| 5964 | ]) ; | 5948 | ]) ; |
| 5965 | sp:where ([ rdf:type sp:Bind ; | 5949 | sp:where ([ rdf:type sp:Bind ; |
| ... | @@ -6039,6 +6023,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION | ... | @@ -6039,6 +6023,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION |
| 6039 | [ sp:varName "myVar"^^xsd:string | 6023 | [ sp:varName "myVar"^^xsd:string |
| 6040 | ] | 6024 | ] |
| 6041 | ]) | 6025 | ]) |
| 6026 | + ] ; | ||
| 6027 | + spin:body | ||
| 6028 | + [ rdf:type sp:Select ; | ||
| 6029 | + sp:resultVariables (_:b21) ; | ||
| 6030 | + sp:where ([ rdf:type sp:Bind ; | ||
| 6031 | + sp:expression | ||
| 6032 | + [ rdf:type sp:if ; | ||
| 6033 | + sp:arg1 [ rdf:type sp:eq ; | ||
| 6034 | + sp:arg1 spin:_arg1 ; | ||
| 6035 | + sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3> | ||
| 6036 | + ] ; | ||
| 6037 | + sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ; | ||
| 6038 | + sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale> | ||
| 6039 | + ] ; | ||
| 6040 | + sp:variable _:b21 | ||
| 6041 | + ]) | ||
| 6042 | ] . | 6042 | ] . |
| 6043 | 6043 | ||
| 6044 | ep-dpr-spin-lib:selectTemperatureScale | 6044 | ep-dpr-spin-lib:selectTemperatureScale | ... | ... |
| ... | @@ -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://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> ; | 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 |
| ... | @@ -2071,7 +2071,7 @@ ep-mpr-spin-lib:selectLengthScale | ... | @@ -2071,7 +2071,7 @@ ep-mpr-spin-lib:selectLengthScale |
| 2071 | sp:arg1 spin:_arg1 ; | 2071 | sp:arg1 spin:_arg1 ; |
| 2072 | sp:arg2 <http://www.epim.no/schemas/mprml/1#LU_in64> | 2072 | sp:arg2 <http://www.epim.no/schemas/mprml/1#LU_in64> |
| 2073 | ] ; | 2073 | ] ; |
| 2074 | - sp:arg2 <http://www.reportinghub.no/ep/schema/core#sixtyFourth_Inch> ; | 2074 | + sp:arg2 <http://www.reportinghub.no/ep/schema/core#inch_64-1> ; |
| 2075 | sp:arg3 [ rdf:type sp:if ; | 2075 | sp:arg3 [ rdf:type sp:if ; |
| 2076 | sp:arg1 [ rdf:type sp:eq ; | 2076 | sp:arg1 [ rdf:type sp:eq ; |
| 2077 | sp:arg1 spin:_arg1 ; | 2077 | sp:arg1 spin:_arg1 ; |
| ... | @@ -2083,7 +2083,7 @@ ep-mpr-spin-lib:selectLengthScale | ... | @@ -2083,7 +2083,7 @@ ep-mpr-spin-lib:selectLengthScale |
| 2083 | sp:arg1 spin:_arg1 ; | 2083 | sp:arg1 spin:_arg1 ; |
| 2084 | sp:arg2 <http://www.epim.no/schemas/mprml/1#LU_in16> | 2084 | sp:arg2 <http://www.epim.no/schemas/mprml/1#LU_in16> |
| 2085 | ] ; | 2085 | ] ; |
| 2086 | - sp:arg2 <http://www.reportinghub.no/ep/schema/core#sixteenth_inch> ; | 2086 | + sp:arg2 <http://www.reportinghub.no/ep/schema/core#inch_16-1> ; |
| 2087 | sp:arg3 [ rdf:type sp:if ; | 2087 | sp:arg3 [ rdf:type sp:if ; |
| 2088 | sp:arg1 [ rdf:type sp:eq ; | 2088 | sp:arg1 [ rdf:type sp:eq ; |
| 2089 | sp:arg1 spin:_arg1 ; | 2089 | sp:arg1 spin:_arg1 ; |
| ... | @@ -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 | ] ; | ... | ... |
-
Please register or login to post a comment