David Price

Removed selectMap predicate gen rule from sp:if in two files.

...@@ -17,36 +17,9 @@ ...@@ -17,36 +17,9 @@
17 @prefix spl: <http://spinrdf.org/spl#> . 17 @prefix spl: <http://spinrdf.org/spl#> .
18 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 18 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
19 19
20 -sp:if
21 - spin:rule
22 - [ rdf:type sp:Construct ;
23 - sp:templates ([ sp:object
24 - [ sp:varName "source"^^xsd:string
25 - ] ;
26 - sp:predicate ep-dpr-spin-lib:selectMap ;
27 - sp:subject
28 - [ sp:varName "target"^^xsd:string
29 - ]
30 - ]) ;
31 - sp:where ([ sp:object spin:_arg1 ;
32 - sp:predicate sp:arg1 ;
33 - sp:subject spin:_this
34 - ] [ sp:object
35 - [ sp:varName "source"^^xsd:string
36 - ] ;
37 - sp:predicate sp:arg2 ;
38 - sp:subject spin:_arg1
39 - ] [ sp:object
40 - [ sp:varName "target"^^xsd:string
41 - ] ;
42 - sp:predicate sp:arg2 ;
43 - sp:subject spin:_this
44 - ])
45 - ] .
46 -
47 <http://www.reportinghub.no/ep/dpr/spin/1.1/lib> 20 <http://www.reportinghub.no/ep/dpr/spin/1.1/lib>
48 rdf:type owl:Ontology ; 21 rdf:type owl:Ontology ;
49 - 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> ; 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> ;
50 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 23 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
51 24
52 ep-dpr-spin-lib:Function 25 ep-dpr-spin-lib:Function
...@@ -5793,6 +5766,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION ...@@ -5793,6 +5766,22 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION
5793 rdfs:subClassOf ep-dpr-spin-lib:Function ; 5766 rdfs:subClassOf ep-dpr-spin-lib:Function ;
5794 spin:body 5767 spin:body
5795 [ rdf:type sp:Select ; 5768 [ rdf:type sp:Select ;
5769 + sp:resultVariables (_:b21) ;
5770 + sp:where ([ rdf:type sp:Bind ;
5771 + sp:expression
5772 + [ rdf:type sp:if ;
5773 + sp:arg1 [ rdf:type sp:eq ;
5774 + sp:arg1 spin:_arg1 ;
5775 + sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3>
5776 + ] ;
5777 + sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ;
5778 + sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale>
5779 + ] ;
5780 + sp:variable _:b21
5781 + ])
5782 + ] ;
5783 + spin:body
5784 + [ rdf:type sp:Select ;
5796 sp:resultVariables ([ sp:varName "myVar"^^xsd:string 5785 sp:resultVariables ([ sp:varName "myVar"^^xsd:string
5797 ]) ; 5786 ]) ;
5798 sp:where ([ rdf:type sp:Bind ; 5787 sp:where ([ rdf:type sp:Bind ;
...@@ -5872,22 +5861,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION ...@@ -5872,22 +5861,6 @@ ep-dpr-spin-lib:selectSpecificVolumeScale_MASS_CONCENTRATION
5872 [ sp:varName "myVar"^^xsd:string 5861 [ sp:varName "myVar"^^xsd:string
5873 ] 5862 ]
5874 ]) 5863 ])
5875 - ] ;
5876 - spin:body
5877 - [ rdf:type sp:Select ;
5878 - sp:resultVariables (_:b21) ;
5879 - sp:where ([ rdf:type sp:Bind ;
5880 - sp:expression
5881 - [ rdf:type sp:if ;
5882 - sp:arg1 [ rdf:type sp:eq ;
5883 - sp:arg1 spin:_arg1 ;
5884 - sp:arg2 <http://www.witsml.org/schemas/131/addendum/combo#VPVU_m3m3>
5885 - ] ;
5886 - sp:arg2 <http://www.reportinghub.no/ep/schema/core#fractionByVolume> ;
5887 - sp:arg3 <http://www.reportinghub.no/ep/schema/core#undefinedScale>
5888 - ] ;
5889 - sp:variable _:b21
5890 - ])
5891 ] . 5864 ] .
5892 5865
5893 ep-dpr-spin-lib:selectTemperatureScale 5866 ep-dpr-spin-lib:selectTemperatureScale
...@@ -7455,26 +7428,26 @@ _:b13 ...@@ -7455,26 +7428,26 @@ _:b13
7455 _:b14 7428 _:b14
7456 sp:varName "densityScale"^^xsd:string . 7429 sp:varName "densityScale"^^xsd:string .
7457 7430
7458 -_:b15 7431 +_:b22
7459 - sp:varName "productionFacilityType"^^xsd:string . 7432 + sp:varName "volumeFlowRateAtStdType"^^xsd:string .
7460 -
7461 -_:b16
7462 - sp:varName "productionFlowDefinitionType"^^xsd:string .
7463 7433
7464 -_:b17 7434 +_:b21
7465 - sp:varName "productionFlowDirectionRelationshipType"^^xsd:string . 7435 + sp:varName "specificVolumeScale"^^xsd:string .
7466 7436
7467 -_:b18 7437 +_:b20
7468 - sp:varName "productionFlowDirectionRelationshipType"^^xsd:string . 7438 + sp:varName "safetyActivityType"^^xsd:string .
7469 7439
7470 _:b19 7440 _:b19
7471 sp:varName "productionFlowPurposeType"^^xsd:string . 7441 sp:varName "productionFlowPurposeType"^^xsd:string .
7472 7442
7473 -_:b20 7443 +_:b18
7474 - sp:varName "safetyActivityType"^^xsd:string . 7444 + sp:varName "productionFlowDirectionRelationshipType"^^xsd:string .
7475 7445
7476 -_:b21 7446 +_:b17
7477 - sp:varName "specificVolumeScale"^^xsd:string . 7447 + sp:varName "productionFlowDirectionRelationshipType"^^xsd:string .
7478 7448
7479 -_:b22 7449 +_:b16
7480 - sp:varName "volumeFlowRateAtStdType"^^xsd:string . 7450 + sp:varName "productionFlowDefinitionType"^^xsd:string .
7451 +
7452 +_:b15
7453 + sp:varName "productionFacilityType"^^xsd:string .
......
...@@ -18,36 +18,9 @@ ...@@ -18,36 +18,9 @@
18 @prefix spl: <http://spinrdf.org/spl#> . 18 @prefix spl: <http://spinrdf.org/spl#> .
19 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 19 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
20 20
21 -sp:if
22 - spin:rule
23 - [ rdf:type sp:Construct ;
24 - sp:templates ([ sp:object
25 - [ sp:varName "source"^^xsd:string
26 - ] ;
27 - sp:predicate ep-mpr-spin-lib:selectMap ;
28 - sp:subject
29 - [ sp:varName "target"^^xsd:string
30 - ]
31 - ]) ;
32 - sp:where ([ sp:object spin:_arg1 ;
33 - sp:predicate sp:arg1 ;
34 - sp:subject spin:_this
35 - ] [ sp:object
36 - [ sp:varName "source"^^xsd:string
37 - ] ;
38 - sp:predicate sp:arg2 ;
39 - sp:subject spin:_arg1
40 - ] [ sp:object
41 - [ sp:varName "target"^^xsd:string
42 - ] ;
43 - sp:predicate sp:arg2 ;
44 - sp:subject spin:_this
45 - ])
46 - ] .
47 -
48 <http://www.reportinghub.no/ep/mpr/spin/1.1/lib> 21 <http://www.reportinghub.no/ep/mpr/spin/1.1/lib>
49 rdf:type owl:Ontology ; 22 rdf:type owl:Ontology ;
50 - 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> ; 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> ;
51 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 24 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
52 25
53 ep-mpr-spin-lib:Function 26 ep-mpr-spin-lib:Function
......