data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
Holger Knublauch
0e14d844 1 parent 4f9401cb

Added variables to project expressions to meet SPARQL 1.1 syntax

Inline Side-by-side
Showing 1 changed file with 100 additions and 55 deletions
...@@ -127,14 +127,14 @@ arg:wellName ...@@ -127,14 +127,14 @@ arg:wellName
127 ] ; 127 ] ;
128 spin:constraint 128 spin:constraint
129 [ rdf:type spl:Argument ; 129 [ rdf:type spl:Argument ;
130 - rdfs:comment "The property that must be used in the result resource."^^xsd:string ; 130 + rdfs:comment "The value to match against."^^xsd:string ;
131 - spl:predicate <http://topbraid.org/spin/spinmapl#predicate> ; 131 + spl:predicate sp:arg1
132 - spl:valueType rdf:Property
133 ] ; 132 ] ;
134 spin:constraint 133 spin:constraint
135 [ rdf:type spl:Argument ; 134 [ rdf:type spl:Argument ;
136 - rdfs:comment "The value to match against."^^xsd:string ; 135 + rdfs:comment "The property that must be used in the result resource."^^xsd:string ;
137 - spl:predicate sp:arg1 136 + spl:predicate <http://topbraid.org/spin/spinmapl#predicate> ;
137 + spl:valueType rdf:Property
138 ] ; 138 ] ;
139 spin:returnType rdfs:Resource . 139 spin:returnType rdfs:Resource .
140 140
...@@ -429,15 +429,15 @@ rhspin:WDRTableTemplates ...@@ -429,15 +429,15 @@ rhspin:WDRTableTemplates
429 spin:abstract "true"^^xsd:boolean ; 429 spin:abstract "true"^^xsd:boolean ;
430 spin:constraint 430 spin:constraint
431 [ rdf:type spl:Argument ; 431 [ rdf:type spl:Argument ;
432 - rdfs:comment "The DDR that serves as root of the query."^^xsd:string ;
433 - spl:predicate arg:wellBore ;
434 - spl:valueType <http://www.reportinghub.no/ep/schema/well#WellBore>
435 - ] ;
436 - spin:constraint
437 - [ rdf:type spl:Argument ;
438 rdfs:comment "The start date of the reporting week."^^xsd:string ; 432 rdfs:comment "The start date of the reporting week."^^xsd:string ;
439 spl:predicate arg:startDate ; 433 spl:predicate arg:startDate ;
440 spl:valueType xsd:date 434 spl:valueType xsd:date
435 + ] ;
436 + spin:constraint
437 + [ rdf:type spl:Argument ;
438 + rdfs:comment "The DDR that serves as root of the query."^^xsd:string ;
439 + spl:predicate arg:wellBore ;
440 + spl:valueType <http://www.reportinghub.no/ep/schema/well#WellBore>
441 ] . 441 ] .
442 442
443 rhspin:baaById 443 rhspin:baaById
...@@ -446,12 +446,15 @@ rhspin:baaById ...@@ -446,12 +446,15 @@ rhspin:baaById
446 rdfs:subClassOf spl:URIFunctions ; 446 rdfs:subClassOf spl:URIFunctions ;
447 spin:body 447 spin:body
448 [ rdf:type sp:Select ; 448 [ rdf:type sp:Select ;
449 - sp:resultVariables ([ rdf:type sp:iri ; 449 + sp:resultVariables ([ sp:expression
450 + [ rdf:type sp:iri ;
450 sp:arg1 [ rdf:type fn:concat ; 451 sp:arg1 [ rdf:type fn:concat ;
451 sp:arg1 "http://www.reportinghub.no/np/data/npd/BAA-" ; 452 sp:arg1 "http://www.reportinghub.no/np/data/npd/BAA-" ;
452 sp:arg2 [ sp:varName "id"^^xsd:string 453 sp:arg2 [ sp:varName "id"^^xsd:string
453 ] 454 ]
454 ] 455 ]
456 + ] ;
457 + sp:varName "result"^^xsd:string
455 ]) ; 458 ]) ;
456 sp:where () 459 sp:where ()
457 ] ; 460 ] ;
...@@ -468,12 +471,15 @@ rhspin:companyById ...@@ -468,12 +471,15 @@ rhspin:companyById
468 rdfs:subClassOf spl:URIFunctions ; 471 rdfs:subClassOf spl:URIFunctions ;
469 spin:body 472 spin:body
470 [ rdf:type sp:Select ; 473 [ rdf:type sp:Select ;
471 - sp:resultVariables ([ rdf:type sp:iri ; 474 + sp:resultVariables ([ sp:expression
475 + [ rdf:type sp:iri ;
472 sp:arg1 [ rdf:type fn:concat ; 476 sp:arg1 [ rdf:type fn:concat ;
473 sp:arg1 "http://www.reportinghub.no/np/data/npd/Company-" ; 477 sp:arg1 "http://www.reportinghub.no/np/data/npd/Company-" ;
474 sp:arg2 [ sp:varName "id"^^xsd:string 478 sp:arg2 [ sp:varName "id"^^xsd:string
475 ] 479 ]
476 ] 480 ]
481 + ] ;
482 + sp:varName "result"^^xsd:string
477 ]) ; 483 ]) ;
478 sp:where () 484 sp:where ()
479 ] ; 485 ] ;
...@@ -845,13 +851,16 @@ rhspin:ddrActivityStartDate ...@@ -845,13 +851,16 @@ rhspin:ddrActivityStartDate
845 rdfs:subClassOf spin:Functions ; 851 rdfs:subClassOf spin:Functions ;
846 spin:body 852 spin:body
847 [ rdf:type sp:Select ; 853 [ rdf:type sp:Select ;
848 - sp:resultVariables ([ rdf:type xsd:date ; 854 + sp:resultVariables ([ sp:expression
855 + [ rdf:type xsd:date ;
849 sp:arg1 [ rdf:type xsd:dateTime ; 856 sp:arg1 [ rdf:type xsd:dateTime ;
850 sp:arg1 [ rdf:type xsd:string ; 857 sp:arg1 [ rdf:type xsd:string ;
851 sp:arg1 [ sp:varName "startedAt"^^xsd:string 858 sp:arg1 [ sp:varName "startedAt"^^xsd:string
852 ] 859 ]
853 ] 860 ]
854 ] 861 ]
862 + ] ;
863 + sp:varName "result"^^xsd:string
855 ]) ; 864 ]) ;
856 sp:where ([ rdf:type sp:TriplePath ; 865 sp:where ([ rdf:type sp:TriplePath ;
857 sp:object 866 sp:object
...@@ -940,16 +949,16 @@ rhspin:ddrOfWeek ...@@ -940,16 +949,16 @@ rhspin:ddrOfWeek
940 ] ; 949 ] ;
941 spin:constraint 950 spin:constraint
942 [ rdf:type spl:Argument ; 951 [ rdf:type spl:Argument ;
943 - rdfs:comment "The well bore that the DDR must be about."^^xsd:string ;
944 - spl:predicate sp:arg2 ;
945 - spl:valueType <http://www.reportinghub.no/ep/schema/well#WellBore>
946 - ] ;
947 - spin:constraint
948 - [ rdf:type spl:Argument ;
949 rdfs:comment "The first day of the week."^^xsd:string ; 952 rdfs:comment "The first day of the week."^^xsd:string ;
950 spl:predicate sp:arg1 ; 953 spl:predicate sp:arg1 ;
951 spl:valueType xsd:date 954 spl:valueType xsd:date
952 ] ; 955 ] ;
956 + spin:constraint
957 + [ rdf:type spl:Argument ;
958 + rdfs:comment "The well bore that the DDR must be about."^^xsd:string ;
959 + spl:predicate sp:arg2 ;
960 + spl:valueType <http://www.reportinghub.no/ep/schema/well#WellBore>
961 + ] ;
953 spin:returnType <http://www.reportinghub.no/ep/schema/report#DailyDrillingReport> . 962 spin:returnType <http://www.reportinghub.no/ep/schema/report#DailyDrillingReport> .
954 963
955 rhspin:ddrWellBoreId 964 rhspin:ddrWellBoreId
...@@ -1002,12 +1011,15 @@ rhspin:discoveryById ...@@ -1002,12 +1011,15 @@ rhspin:discoveryById
1002 rdfs:subClassOf spl:URIFunctions ; 1011 rdfs:subClassOf spl:URIFunctions ;
1003 spin:body 1012 spin:body
1004 [ rdf:type sp:Select ; 1013 [ rdf:type sp:Select ;
1005 - sp:resultVariables ([ rdf:type sp:iri ; 1014 + sp:resultVariables ([ sp:expression
1015 + [ rdf:type sp:iri ;
1006 sp:arg1 [ rdf:type fn:concat ; 1016 sp:arg1 [ rdf:type fn:concat ;
1007 sp:arg1 "http://www.reportinghub.no/np/data/npd/Discovery-" ; 1017 sp:arg1 "http://www.reportinghub.no/np/data/npd/Discovery-" ;
1008 sp:arg2 [ sp:varName "id"^^xsd:string 1018 sp:arg2 [ sp:varName "id"^^xsd:string
1009 ] 1019 ]
1010 ] 1020 ]
1021 + ] ;
1022 + sp:varName "result"^^xsd:string
1011 ]) ; 1023 ]) ;
1012 sp:where () 1024 sp:where ()
1013 ] ; 1025 ] ;
...@@ -1036,15 +1048,15 @@ rhspin:dtypeValue ...@@ -1036,15 +1048,15 @@ rhspin:dtypeValue
1036 ] ; 1048 ] ;
1037 spin:constraint 1049 spin:constraint
1038 [ rdf:type spl:Argument ; 1050 [ rdf:type spl:Argument ;
1039 - rdfs:comment "The subject of the value."^^xsd:string ;
1040 - spl:predicate sp:arg1 ;
1041 - spl:valueType rdfs:Resource
1042 - ] ;
1043 - spin:constraint
1044 - [ rdf:type spl:Argument ;
1045 rdfs:comment "The predicate that points to the reified value."^^xsd:string ; 1051 rdfs:comment "The predicate that points to the reified value."^^xsd:string ;
1046 spl:predicate sp:arg2 ; 1052 spl:predicate sp:arg2 ;
1047 spl:valueType rdf:Property 1053 spl:valueType rdf:Property
1054 + ] ;
1055 + spin:constraint
1056 + [ rdf:type spl:Argument ;
1057 + rdfs:comment "The subject of the value."^^xsd:string ;
1058 + spl:predicate sp:arg1 ;
1059 + spl:valueType rdfs:Resource
1048 ] . 1060 ] .
1049 1061
1050 rhspin:facilityById 1062 rhspin:facilityById
...@@ -1053,12 +1065,15 @@ rhspin:facilityById ...@@ -1053,12 +1065,15 @@ rhspin:facilityById
1053 rdfs:subClassOf spl:URIFunctions ; 1065 rdfs:subClassOf spl:URIFunctions ;
1054 spin:body 1066 spin:body
1055 [ rdf:type sp:Select ; 1067 [ rdf:type sp:Select ;
1056 - sp:resultVariables ([ rdf:type sp:iri ; 1068 + sp:resultVariables ([ sp:expression
1069 + [ rdf:type sp:iri ;
1057 sp:arg1 [ rdf:type fn:concat ; 1070 sp:arg1 [ rdf:type fn:concat ;
1058 sp:arg1 "http://www.reportinghub.no/np/data/npd/Facility-" ; 1071 sp:arg1 "http://www.reportinghub.no/np/data/npd/Facility-" ;
1059 sp:arg2 [ sp:varName "id"^^xsd:string 1072 sp:arg2 [ sp:varName "id"^^xsd:string
1060 ] 1073 ]
1061 ] 1074 ]
1075 + ] ;
1076 + sp:varName "result"^^xsd:string
1062 ]) ; 1077 ]) ;
1063 sp:where () 1078 sp:where ()
1064 ] ; 1079 ] ;
...@@ -1075,12 +1090,15 @@ rhspin:fieldById ...@@ -1075,12 +1090,15 @@ rhspin:fieldById
1075 rdfs:subClassOf spl:URIFunctions ; 1090 rdfs:subClassOf spl:URIFunctions ;
1076 spin:body 1091 spin:body
1077 [ rdf:type sp:Select ; 1092 [ rdf:type sp:Select ;
1078 - sp:resultVariables ([ rdf:type sp:iri ; 1093 + sp:resultVariables ([ sp:expression
1094 + [ rdf:type sp:iri ;
1079 sp:arg1 [ rdf:type fn:concat ; 1095 sp:arg1 [ rdf:type fn:concat ;
1080 sp:arg1 "http://www.reportinghub.no/np/data/npd/Field-" ; 1096 sp:arg1 "http://www.reportinghub.no/np/data/npd/Field-" ;
1081 sp:arg2 [ sp:varName "id"^^xsd:string 1097 sp:arg2 [ sp:varName "id"^^xsd:string
1082 ] 1098 ]
1083 ] 1099 ]
1100 + ] ;
1101 + sp:varName "result"^^xsd:string
1084 ]) ; 1102 ]) ;
1085 sp:where () 1103 sp:where ()
1086 ] ; 1104 ] ;
...@@ -1133,10 +1151,13 @@ rhspin:graphForDDR ...@@ -1133,10 +1151,13 @@ rhspin:graphForDDR
1133 rdfs:subClassOf spin:Functions ; 1151 rdfs:subClassOf spin:Functions ;
1134 spin:body 1152 spin:body
1135 [ rdf:type sp:Select ; 1153 [ rdf:type sp:Select ;
1136 - sp:resultVariables ([ rdf:type rhspin:graphForLicence ; 1154 + sp:resultVariables ([ sp:expression
1155 + [ rdf:type rhspin:graphForLicence ;
1137 arg:licence 1156 arg:licence
1138 [ sp:varName "licence"^^xsd:string 1157 [ sp:varName "licence"^^xsd:string
1139 ] 1158 ]
1159 + ] ;
1160 + sp:varName "result"^^xsd:string
1140 ]) ; 1161 ]) ;
1141 sp:where ([ rdf:type sp:TriplePath ; 1162 sp:where ([ rdf:type sp:TriplePath ;
1142 sp:object 1163 sp:object
...@@ -1180,9 +1201,12 @@ rhspin:graphForLicence ...@@ -1180,9 +1201,12 @@ rhspin:graphForLicence
1180 rdfs:subClassOf spin:Functions ; 1201 rdfs:subClassOf spin:Functions ;
1181 spin:body 1202 spin:body
1182 [ rdf:type sp:Select ; 1203 [ rdf:type sp:Select ;
1183 - sp:resultVariables ([ rdf:type sp:iri ; 1204 + sp:resultVariables ([ sp:expression
1205 + [ rdf:type sp:iri ;
1184 sp:arg1 [ sp:varName "uri"^^xsd:string 1206 sp:arg1 [ sp:varName "uri"^^xsd:string
1185 ] 1207 ]
1208 + ] ;
1209 + sp:varName "result"^^xsd:string
1186 ]) ; 1210 ]) ;
1187 sp:where ([ rdf:type sp:NamedGraph ; 1211 sp:where ([ rdf:type sp:NamedGraph ;
1188 sp:elements ([ sp:object 1212 sp:elements ([ sp:object
...@@ -1221,10 +1245,13 @@ rhspin:graphForWellBoreWithId ...@@ -1221,10 +1245,13 @@ rhspin:graphForWellBoreWithId
1221 rdfs:subClassOf spin:Functions ; 1245 rdfs:subClassOf spin:Functions ;
1222 spin:body 1246 spin:body
1223 [ rdf:type sp:Select ; 1247 [ rdf:type sp:Select ;
1224 - sp:resultVariables ([ rdf:type rhspin:graphForLicence ; 1248 + sp:resultVariables ([ sp:expression
1249 + [ rdf:type rhspin:graphForLicence ;
1225 arg:licence 1250 arg:licence
1226 [ sp:varName "licence"^^xsd:string 1251 [ sp:varName "licence"^^xsd:string
1227 ] 1252 ]
1253 + ] ;
1254 + sp:varName "result"^^xsd:string
1228 ]) ; 1255 ]) ;
1229 sp:where ([ rdf:type sp:NamedGraph ; 1256 sp:where ([ rdf:type sp:NamedGraph ;
1230 sp:elements ([ sp:object 1257 sp:elements ([ sp:object
...@@ -1259,12 +1286,15 @@ rhspin:licenceById ...@@ -1259,12 +1286,15 @@ rhspin:licenceById
1259 rdfs:subClassOf spl:URIFunctions ; 1286 rdfs:subClassOf spl:URIFunctions ;
1260 spin:body 1287 spin:body
1261 [ rdf:type sp:Select ; 1288 [ rdf:type sp:Select ;
1262 - sp:resultVariables ([ rdf:type sp:iri ; 1289 + sp:resultVariables ([ sp:expression
1290 + [ rdf:type sp:iri ;
1263 sp:arg1 [ rdf:type fn:concat ; 1291 sp:arg1 [ rdf:type fn:concat ;
1264 sp:arg1 "http://www.reportinghub.no/np/data/npd/Licence-" ; 1292 sp:arg1 "http://www.reportinghub.no/np/data/npd/Licence-" ;
1265 sp:arg2 [ sp:varName "id"^^xsd:string 1293 sp:arg2 [ sp:varName "id"^^xsd:string
1266 ] 1294 ]
1267 ] 1295 ]
1296 + ] ;
1297 + sp:varName "result"^^xsd:string
1268 ]) ; 1298 ]) ;
1269 sp:where () 1299 sp:where ()
1270 ] ; 1300 ] ;
...@@ -1411,11 +1441,14 @@ rhspin:normalizeWellBoreName ...@@ -1411,11 +1441,14 @@ rhspin:normalizeWellBoreName
1411 rdfs:subClassOf spin:Functions ; 1441 rdfs:subClassOf spin:Functions ;
1412 spin:body 1442 spin:body
1413 [ rdf:type sp:Select ; 1443 [ rdf:type sp:Select ;
1414 - sp:resultVariables ([ rdf:type xsd:string ; 1444 + sp:resultVariables ([ sp:expression
1445 + [ rdf:type xsd:string ;
1415 sp:arg1 [ rdf:type spif:trim ; 1446 sp:arg1 [ rdf:type spif:trim ;
1416 sp:arg1 [ sp:varName "result"^^xsd:string 1447 sp:arg1 [ sp:varName "result"^^xsd:string
1417 ] 1448 ]
1418 ] 1449 ]
1450 + ] ;
1451 + sp:varName "theResult"^^xsd:string
1419 ]) ; 1452 ]) ;
1420 sp:where ([ rdf:type sp:Bind ; 1453 sp:where ([ rdf:type sp:Bind ;
1421 sp:expression 1454 sp:expression
...@@ -1687,17 +1720,17 @@ rhspin:npdIndividualById ...@@ -1687,17 +1720,17 @@ rhspin:npdIndividualById
1687 ] ; 1720 ] ;
1688 spin:constraint 1721 spin:constraint
1689 [ rdf:type spl:Argument ; 1722 [ rdf:type spl:Argument ;
1723 + rdfs:comment "The NPD id to match."^^xsd:string ;
1724 + spl:predicate arg:id ;
1725 + spl:valueType xsd:string
1726 + ] ;
1727 + spin:constraint
1728 + [ rdf:type spl:Argument ;
1690 rdfs:comment "The rdf:type that the result must have."^^xsd:string ; 1729 rdfs:comment "The rdf:type that the result must have."^^xsd:string ;
1691 spl:optional "true"^^xsd:boolean ; 1730 spl:optional "true"^^xsd:boolean ;
1692 spl:predicate arg:type ; 1731 spl:predicate arg:type ;
1693 spl:valueType rdfs:Class 1732 spl:valueType rdfs:Class
1694 ] ; 1733 ] ;
1695 - spin:constraint
1696 - [ rdf:type spl:Argument ;
1697 - rdfs:comment "The NPD id to match."^^xsd:string ;
1698 - spl:predicate arg:id ;
1699 - spl:valueType xsd:string
1700 - ] ;
1701 spin:returnType <http://www.reportinghub.no/np/schema/npd#Individual> . 1734 spin:returnType <http://www.reportinghub.no/np/schema/npd#Individual> .
1702 1735
1703 rhspin:npdIndividualByName 1736 rhspin:npdIndividualByName
...@@ -1762,17 +1795,17 @@ rhspin:npdIndividualByName ...@@ -1762,17 +1795,17 @@ rhspin:npdIndividualByName
1762 ] ; 1795 ] ;
1763 spin:constraint 1796 spin:constraint
1764 [ rdf:type spl:Argument ; 1797 [ rdf:type spl:Argument ;
1798 + rdfs:comment "The NPD name to match."^^xsd:string ;
1799 + spl:predicate arg:name ;
1800 + spl:valueType xsd:string
1801 + ] ;
1802 + spin:constraint
1803 + [ rdf:type spl:Argument ;
1765 rdfs:comment "The rdf:type that the result must have."^^xsd:string ; 1804 rdfs:comment "The rdf:type that the result must have."^^xsd:string ;
1766 spl:optional "true"^^xsd:boolean ; 1805 spl:optional "true"^^xsd:boolean ;
1767 spl:predicate arg:type ; 1806 spl:predicate arg:type ;
1768 spl:valueType rdfs:Class 1807 spl:valueType rdfs:Class
1769 ] ; 1808 ] ;
1770 - spin:constraint
1771 - [ rdf:type spl:Argument ;
1772 - rdfs:comment "The NPD name to match."^^xsd:string ;
1773 - spl:predicate arg:name ;
1774 - spl:valueType xsd:string
1775 - ] ;
1776 spin:returnType <http://www.reportinghub.no/np/schema/npd#Individual> . 1809 spin:returnType <http://www.reportinghub.no/np/schema/npd#Individual> .
1777 1810
1778 rhspin:npdName 1811 rhspin:npdName
...@@ -1818,9 +1851,8 @@ rhspin:npdTripleExists ...@@ -1818,9 +1851,8 @@ rhspin:npdTripleExists
1818 ] ; 1851 ] ;
1819 spin:constraint 1852 spin:constraint
1820 [ rdf:type spl:Argument ; 1853 [ rdf:type spl:Argument ;
1821 - rdfs:comment "The subject to find"^^xsd:string ; 1854 + rdfs:comment "The object to match."^^xsd:string ;
1822 - spl:predicate sp:arg1 ; 1855 + spl:predicate sp:arg3
1823 - spl:valueType rdfs:Resource
1824 ] ; 1856 ] ;
1825 spin:constraint 1857 spin:constraint
1826 [ rdf:type spl:Argument ; 1858 [ rdf:type spl:Argument ;
...@@ -1830,8 +1862,9 @@ rhspin:npdTripleExists ...@@ -1830,8 +1862,9 @@ rhspin:npdTripleExists
1830 ] ; 1862 ] ;
1831 spin:constraint 1863 spin:constraint
1832 [ rdf:type spl:Argument ; 1864 [ rdf:type spl:Argument ;
1833 - rdfs:comment "The object to match."^^xsd:string ; 1865 + rdfs:comment "The subject to find"^^xsd:string ;
1834 - spl:predicate sp:arg3 1866 + spl:predicate sp:arg1 ;
1867 + spl:valueType rdfs:Resource
1835 ] ; 1868 ] ;
1836 spin:returnType xsd:boolean . 1869 spin:returnType xsd:boolean .
1837 1870
...@@ -1842,7 +1875,8 @@ rhspin:parentCompanyByName ...@@ -1842,7 +1875,8 @@ rhspin:parentCompanyByName
1842 rdfs:subClassOf spl:URIFunctions ; 1875 rdfs:subClassOf spl:URIFunctions ;
1843 spin:body 1876 spin:body
1844 [ rdf:type sp:Select ; 1877 [ rdf:type sp:Select ;
1845 - sp:resultVariables ([ rdf:type sp:iri ; 1878 + sp:resultVariables ([ sp:expression
1879 + [ rdf:type sp:iri ;
1846 sp:arg1 [ rdf:type fn:concat ; 1880 sp:arg1 [ rdf:type fn:concat ;
1847 sp:arg1 "http://www.reportinghub.no/np/data/npd/ParentCompany-" ; 1881 sp:arg1 "http://www.reportinghub.no/np/data/npd/ParentCompany-" ;
1848 sp:arg2 [ rdf:type rhspin:normalizeString ; 1882 sp:arg2 [ rdf:type rhspin:normalizeString ;
...@@ -1850,6 +1884,8 @@ rhspin:parentCompanyByName ...@@ -1850,6 +1884,8 @@ rhspin:parentCompanyByName
1850 ] 1884 ]
1851 ] 1885 ]
1852 ] 1886 ]
1887 + ] ;
1888 + sp:varName "result"^^xsd:string
1853 ]) ; 1889 ]) ;
1854 sp:where () 1890 sp:where ()
1855 ] ; 1891 ] ;
...@@ -1920,12 +1956,15 @@ rhspin:tufById ...@@ -1920,12 +1956,15 @@ rhspin:tufById
1920 rdfs:subClassOf spl:URIFunctions ; 1956 rdfs:subClassOf spl:URIFunctions ;
1921 spin:body 1957 spin:body
1922 [ rdf:type sp:Select ; 1958 [ rdf:type sp:Select ;
1923 - sp:resultVariables ([ rdf:type sp:iri ; 1959 + sp:resultVariables ([ sp:expression
1960 + [ rdf:type sp:iri ;
1924 sp:arg1 [ rdf:type fn:concat ; 1961 sp:arg1 [ rdf:type fn:concat ;
1925 sp:arg1 "http://www.reportinghub.no/np/data/npd/TUF-" ; 1962 sp:arg1 "http://www.reportinghub.no/np/data/npd/TUF-" ;
1926 sp:arg2 [ sp:varName "id"^^xsd:string 1963 sp:arg2 [ sp:varName "id"^^xsd:string
1927 ] 1964 ]
1928 ] 1965 ]
1966 + ] ;
1967 + sp:varName "result"^^xsd:string
1929 ]) ; 1968 ]) ;
1930 sp:where () 1969 sp:where ()
1931 ] ; 1970 ] ;
...@@ -1990,7 +2029,8 @@ rhspin:wellBoreById ...@@ -1990,7 +2029,8 @@ rhspin:wellBoreById
1990 rdfs:subClassOf spl:URIFunctions ; 2029 rdfs:subClassOf spl:URIFunctions ;
1991 spin:body 2030 spin:body
1992 [ rdf:type sp:Select ; 2031 [ rdf:type sp:Select ;
1993 - sp:resultVariables ([ rdf:type sp:iri ; 2032 + sp:resultVariables ([ sp:expression
2033 + [ rdf:type sp:iri ;
1994 sp:arg1 [ rdf:type fn:concat ; 2034 sp:arg1 [ rdf:type fn:concat ;
1995 sp:arg1 "http://www.reportinghub.no/np/data/npd/WellBore-" ; 2035 sp:arg1 "http://www.reportinghub.no/np/data/npd/WellBore-" ;
1996 sp:arg2 [ rdf:type rhspin:normalizeString ; 2036 sp:arg2 [ rdf:type rhspin:normalizeString ;
...@@ -1998,6 +2038,8 @@ rhspin:wellBoreById ...@@ -1998,6 +2038,8 @@ rhspin:wellBoreById
1998 ] 2038 ]
1999 ] 2039 ]
2000 ] 2040 ]
2041 + ] ;
2042 + sp:varName "result"^^xsd:string
2001 ]) ; 2043 ]) ;
2002 sp:where () 2044 sp:where ()
2003 ] ; 2045 ] ;
...@@ -2059,7 +2101,8 @@ rhspin:wellByName ...@@ -2059,7 +2101,8 @@ rhspin:wellByName
2059 rdfs:subClassOf spl:URIFunctions ; 2101 rdfs:subClassOf spl:URIFunctions ;
2060 spin:body 2102 spin:body
2061 [ rdf:type sp:Select ; 2103 [ rdf:type sp:Select ;
2062 - sp:resultVariables ([ rdf:type sp:iri ; 2104 + sp:resultVariables ([ sp:expression
2105 + [ rdf:type sp:iri ;
2063 sp:arg1 [ rdf:type fn:concat ; 2106 sp:arg1 [ rdf:type fn:concat ;
2064 sp:arg1 "http://www.reportinghub.no/np/data/npd/Well-" ; 2107 sp:arg1 "http://www.reportinghub.no/np/data/npd/Well-" ;
2065 sp:arg2 [ rdf:type rhspin:normalizeString ; 2108 sp:arg2 [ rdf:type rhspin:normalizeString ;
...@@ -2067,6 +2110,8 @@ rhspin:wellByName ...@@ -2067,6 +2110,8 @@ rhspin:wellByName
2067 ] 2110 ]
2068 ] 2111 ]
2069 ] 2112 ]
2113 + ] ;
2114 + sp:varName "result"^^xsd:string
2070 ]) ; 2115 ]) ;
2071 sp:where () 2116 sp:where ()
2072 ] ; 2117 ] ;
......