data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
72dcf17d 1 parent 52d6b3bf

Fixed MPRG HTML to use normalized UoM value function everywhere

Inline Side-by-side
Showing 2 changed files with 129 additions and 417 deletions
...@@ -1727,7 +1727,8 @@ ep-core:kiloNewton ...@@ -1727,7 +1727,8 @@ ep-core:kiloNewton
1727 ep-core:kilogram 1727 ep-core:kilogram
1728 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 1728 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
1729 rdfs:domain ep-core:Mass ; 1729 rdfs:domain ep-core:Mass ;
1730 - rdfs:label "kilogram"^^xsd:string . 1730 + rdfs:label "kilogram"^^xsd:string ;
1731 + ep-core:unitSymbol "kg"^^xsd:string .
1731 1732
1732 ep-core:kilogram_dm-3 1733 ep-core:kilogram_dm-3
1733 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 1734 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
...@@ -1735,7 +1736,8 @@ ep-core:kilogram_dm-3 ...@@ -1735,7 +1736,8 @@ ep-core:kilogram_dm-3
1735 1736
1736 ep-core:kilogram_l-1 1737 ep-core:kilogram_l-1
1737 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 1738 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
1738 - rdfs:label "kilogram per litre"^^xsd:string . 1739 + rdfs:label "kilogram per litre"^^xsd:string ;
1740 + ep-core:unitSymbol "kg/L"^^xsd:string .
1739 1741
1740 ep-core:kilogram_m-3 1742 ep-core:kilogram_m-3
1741 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 1743 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
...@@ -2340,7 +2342,8 @@ ep-core:megahertz ...@@ -2340,7 +2342,8 @@ ep-core:megahertz
2340 ep-core:megajoule 2342 ep-core:megajoule
2341 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 2343 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
2342 rdfs:domain ep-core:Work ; 2344 rdfs:domain ep-core:Work ;
2343 - rdfs:label "megajoules"^^xsd:string . 2345 + rdfs:label "megajoules"^^xsd:string ;
2346 + ep-core:unitSymbol "MJ"^^xsd:string .
2344 2347
2345 ep-core:megajoule_m-3 2348 ep-core:megajoule_m-3
2346 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 2349 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
5 # imports: http://www.reportinghub.no/ep/transform/transform-helper-schema 5 # imports: http://www.reportinghub.no/ep/transform/transform-helper-schema
6 6
7 @prefix arg: <http://spinrdf.org/arg#> . 7 @prefix arg: <http://spinrdf.org/arg#> .
8 +@prefix ep-spin-lib: <http://www.reportinghub.no/ep/spin/lib#> .
8 @prefix fn: <http://www.w3.org/2005/xpath-functions#> . 9 @prefix fn: <http://www.w3.org/2005/xpath-functions#> .
9 @prefix mpr-tables: <http://www.reportinghub.no/ep/spin/mpr-tables#> . 10 @prefix mpr-tables: <http://www.reportinghub.no/ep/spin/mpr-tables#> .
10 @prefix owl: <http://www.w3.org/2002/07/owl#> . 11 @prefix owl: <http://www.w3.org/2002/07/owl#> .
...@@ -184,12 +185,14 @@ mpr-tables:Cargo ...@@ -184,12 +185,14 @@ mpr-tables:Cargo
184 sp:subject 185 sp:subject
185 [ sp:varName "massQuantity"^^xsd:string 186 [ sp:varName "massQuantity"^^xsd:string
186 ] 187 ]
187 - ] [ sp:object 188 + ] [ rdf:type sp:Bind ;
188 - [ sp:varName "massValue"^^xsd:string 189 + sp:expression
190 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
191 + sp:arg1 [ sp:varName "massQuantity"^^xsd:string
192 + ]
189 ] ; 193 ] ;
190 - sp:predicate <http://www.reportinghub.no/ep/schema/core#kilogram> ; 194 + sp:variable
191 - sp:subject 195 + [ sp:varName "massValue"^^xsd:string
192 - [ sp:varName "massQuantity"^^xsd:string
193 ] 196 ]
194 ] [ sp:object 197 ] [ sp:object
195 [ sp:varName "movedProduct"^^xsd:string 198 [ sp:varName "movedProduct"^^xsd:string
...@@ -210,12 +213,14 @@ mpr-tables:Cargo ...@@ -210,12 +213,14 @@ mpr-tables:Cargo
210 sp:subject 213 sp:subject
211 [ sp:varName "volumeQuantity"^^xsd:string 214 [ sp:varName "volumeQuantity"^^xsd:string
212 ] 215 ]
213 - ] [ sp:object 216 + ] [ rdf:type sp:Bind ;
214 - [ sp:varName "volumeValue"^^xsd:string 217 + sp:expression
218 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
219 + sp:arg1 [ sp:varName "volumeQuantity"^^xsd:string
220 + ]
215 ] ; 221 ] ;
216 - sp:predicate <http://www.reportinghub.no/ep/schema/core#metre3> ; 222 + sp:variable
217 - sp:subject 223 + [ sp:varName "volumeValue"^^xsd:string
218 - [ sp:varName "volumeQuantity"^^xsd:string
219 ] 224 ]
220 ] [ sp:object 225 ] [ sp:object
221 [ sp:varName "movedProduct"^^xsd:string 226 [ sp:varName "movedProduct"^^xsd:string
...@@ -236,12 +241,14 @@ mpr-tables:Cargo ...@@ -236,12 +241,14 @@ mpr-tables:Cargo
236 sp:subject 241 sp:subject
237 [ sp:varName "densityQuantity"^^xsd:string 242 [ sp:varName "densityQuantity"^^xsd:string
238 ] 243 ]
239 - ] [ sp:object 244 + ] [ rdf:type sp:Bind ;
240 - [ sp:varName "densityValue"^^xsd:string 245 + sp:expression
246 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
247 + sp:arg1 [ sp:varName "densityQuantity"^^xsd:string
248 + ]
241 ] ; 249 ] ;
242 - sp:predicate <http://www.reportinghub.no/ep/schema/core#kilogram_m-3> ; 250 + sp:variable
243 - sp:subject 251 + [ sp:varName "densityValue"^^xsd:string
244 - [ sp:varName "densityQuantity"^^xsd:string
245 ] 252 ]
246 ] [ sp:object 253 ] [ sp:object
247 [ sp:varName "cargoNumber"^^xsd:string 254 [ sp:varName "cargoNumber"^^xsd:string
...@@ -483,12 +490,14 @@ mpr-tables:Cargo ...@@ -483,12 +490,14 @@ mpr-tables:Cargo
483 sp:subject 490 sp:subject
484 [ sp:varName "ownedShare"^^xsd:string 491 [ sp:varName "ownedShare"^^xsd:string
485 ] 492 ]
486 - ] [ sp:object 493 + ] [ rdf:type sp:Bind ;
487 - [ sp:varName "ownedPercent"^^xsd:string 494 + sp:expression
495 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
496 + sp:arg1 [ sp:varName "ownedShare"^^xsd:string
497 + ]
488 ] ; 498 ] ;
489 - sp:predicate <http://www.reportinghub.no/ep/schema/core#percent> ; 499 + sp:variable
490 - sp:subject 500 + [ sp:varName "ownedPercent"^^xsd:string
491 - [ sp:varName "ownedVolumeRatio"^^xsd:string
492 ] 501 ]
493 ] [ rdf:type sp:Optional ; 502 ] [ rdf:type sp:Optional ;
494 sp:elements ([ sp:object 503 sp:elements ([ sp:object
...@@ -518,7 +527,7 @@ mpr-tables:Cargo ...@@ -518,7 +527,7 @@ mpr-tables:Cargo
518 527
519 mpr-tables:CargoOwnership 528 mpr-tables:CargoOwnership
520 rdf:type rhspin:TableTemplate ; 529 rdf:type rhspin:TableTemplate ;
521 - rdfs:label "Cargo Ownership Information1"^^xsd:string ; 530 + rdfs:label "Cargo Ownership Information"^^xsd:string ;
522 rdfs:subClassOf rhspin:MPRGTableTemplates ; 531 rdfs:subClassOf rhspin:MPRGTableTemplates ;
523 spin:body 532 spin:body
524 [ rdf:type sp:Select ; 533 [ rdf:type sp:Select ;
...@@ -742,12 +751,14 @@ mpr-tables:CargoOwnership ...@@ -742,12 +751,14 @@ mpr-tables:CargoOwnership
742 sp:subject 751 sp:subject
743 [ sp:varName "materialPart"^^xsd:string 752 [ sp:varName "materialPart"^^xsd:string
744 ] 753 ]
745 - ] [ sp:object 754 + ] [ rdf:type sp:Bind ;
746 - [ sp:varName "ratio"^^xsd:string 755 + sp:expression
756 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
757 + sp:arg1 [ sp:varName "materialPart"^^xsd:string
758 + ]
747 ] ; 759 ] ;
748 - sp:predicate <http://www.reportinghub.no/ep/schema/material#volumeRatio> ; 760 + sp:variable
749 - sp:subject 761 + [ sp:varName "ratio"^^xsd:string
750 - [ sp:varName "materialPart"^^xsd:string
751 ] 762 ]
752 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Ratio> ; 763 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Ratio> ;
753 sp:predicate rdf:type ; 764 sp:predicate rdf:type ;
...@@ -911,12 +922,14 @@ mpr-tables:GasSales ...@@ -911,12 +922,14 @@ mpr-tables:GasSales
911 sp:subject 922 sp:subject
912 [ sp:varName "sellerEnergyQuantity"^^xsd:string 923 [ sp:varName "sellerEnergyQuantity"^^xsd:string
913 ] 924 ]
914 - ] [ sp:object 925 + ] [ rdf:type sp:Bind ;
915 - [ sp:varName "sellerEnergyValue"^^xsd:string 926 + sp:expression
927 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
928 + sp:arg1 [ sp:varName "sellerEnergyQuantity"^^xsd:string
929 + ]
916 ] ; 930 ] ;
917 - sp:predicate <http://www.reportinghub.no/ep/schema/core#megajoule> ; 931 + sp:variable
918 - sp:subject 932 + [ sp:varName "sellerEnergyValue"^^xsd:string
919 - [ sp:varName "sellerEnergyQuantity"^^xsd:string
920 ] 933 ]
921 ] [ sp:object 934 ] [ sp:object
922 [ sp:varName "totalMaterialThatFlows"^^xsd:string 935 [ sp:varName "totalMaterialThatFlows"^^xsd:string
...@@ -937,12 +950,14 @@ mpr-tables:GasSales ...@@ -937,12 +950,14 @@ mpr-tables:GasSales
937 sp:subject 950 sp:subject
938 [ sp:varName "sellerVolumeQuantity"^^xsd:string 951 [ sp:varName "sellerVolumeQuantity"^^xsd:string
939 ] 952 ]
940 - ] [ sp:object 953 + ] [ rdf:type sp:Bind ;
941 - [ sp:varName "sellerVolumeValue"^^xsd:string 954 + sp:expression
955 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
956 + sp:arg1 [ sp:varName "sellerVolumeQuantity"^^xsd:string
957 + ]
942 ] ; 958 ] ;
943 - sp:predicate <http://www.reportinghub.no/ep/schema/core#metre3> ; 959 + sp:variable
944 - sp:subject 960 + [ sp:varName "sellerVolumeValue"^^xsd:string
945 - [ sp:varName "sellerVolumeQuantity"^^xsd:string
946 ] 961 ]
947 ] [ sp:object 962 ] [ sp:object
948 [ sp:varName "totalMaterialThatFlows"^^xsd:string 963 [ sp:varName "totalMaterialThatFlows"^^xsd:string
...@@ -988,12 +1003,14 @@ mpr-tables:GasSales ...@@ -988,12 +1003,14 @@ mpr-tables:GasSales
988 sp:subject 1003 sp:subject
989 [ sp:varName "buyerEnergyQuantity"^^xsd:string 1004 [ sp:varName "buyerEnergyQuantity"^^xsd:string
990 ] 1005 ]
991 - ] [ sp:object 1006 + ] [ rdf:type sp:Bind ;
992 - [ sp:varName "buyerEnergyValue"^^xsd:string 1007 + sp:expression
1008 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1009 + sp:arg1 [ sp:varName "buyerEnergyQuantity"^^xsd:string
1010 + ]
993 ] ; 1011 ] ;
994 - sp:predicate <http://www.reportinghub.no/ep/schema/core#megajoule> ; 1012 + sp:variable
995 - sp:subject 1013 + [ sp:varName "buyerEnergyValue"^^xsd:string
996 - [ sp:varName "buyerEnergyQuantity"^^xsd:string
997 ] 1014 ]
998 ] [ sp:object 1015 ] [ sp:object
999 [ sp:varName "salesActivityMovedProduct"^^xsd:string 1016 [ sp:varName "salesActivityMovedProduct"^^xsd:string
...@@ -1014,12 +1031,14 @@ mpr-tables:GasSales ...@@ -1014,12 +1031,14 @@ mpr-tables:GasSales
1014 sp:subject 1031 sp:subject
1015 [ sp:varName "buyerVolumeQuantity"^^xsd:string 1032 [ sp:varName "buyerVolumeQuantity"^^xsd:string
1016 ] 1033 ]
1017 - ] [ sp:object 1034 + ] [ rdf:type sp:Bind ;
1018 - [ sp:varName "buyerVolumeValue"^^xsd:string 1035 + sp:expression
1036 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1037 + sp:arg1 [ sp:varName "buyerVolumeQuantity"^^xsd:string
1038 + ]
1019 ] ; 1039 ] ;
1020 - sp:predicate <http://www.reportinghub.no/ep/schema/core#metre3> ; 1040 + sp:variable
1021 - sp:subject 1041 + [ sp:varName "buyerVolumeValue"^^xsd:string
1022 - [ sp:varName "buyerVolumeQuantity"^^xsd:string
1023 ] 1042 ]
1024 ] [ sp:object 1043 ] [ sp:object
1025 [ sp:varName "salesActivityMovedProduct"^^xsd:string 1044 [ sp:varName "salesActivityMovedProduct"^^xsd:string
...@@ -1430,38 +1449,10 @@ mpr-tables:ProductionFlows ...@@ -1430,38 +1449,10 @@ mpr-tables:ProductionFlows
1430 sp:subject 1449 sp:subject
1431 [ sp:varName "mass"^^xsd:string 1450 [ sp:varName "mass"^^xsd:string
1432 ] 1451 ]
1433 - ] [ sp:object
1434 - [ sp:varName "massValue"^^xsd:string
1435 - ] ;
1436 - sp:predicate
1437 - [ sp:varName "massPredicate"^^xsd:string
1438 - ] ;
1439 - sp:subject
1440 - [ sp:varName "mass"^^xsd:string
1441 - ]
1442 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
1443 - sp:predicate rdf:type ;
1444 - sp:subject
1445 - [ sp:varName "massPredicate"^^xsd:string
1446 - ]
1447 - ] [ sp:object
1448 - [ sp:varName "massPropertyName"^^xsd:string
1449 - ] ;
1450 - sp:predicate rdfs:label ;
1451 - sp:subject
1452 - [ sp:varName "massPredicate"^^xsd:string
1453 - ]
1454 ] [ rdf:type sp:Bind ; 1452 ] [ rdf:type sp:Bind ;
1455 sp:expression 1453 sp:expression
1456 - [ rdf:type fn:concat ; 1454 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1457 - sp:arg1 [ rdf:type spif:decimalFormat ; 1455 + sp:arg1 [ sp:varName "mass"^^xsd:string
1458 - arg:number
1459 - [ sp:varName "massValue"^^xsd:string
1460 - ] ;
1461 - arg:pattern "#.##"
1462 - ] ;
1463 - sp:arg2 " " ;
1464 - sp:arg3 [ sp:varName "massPropertyName"^^xsd:string
1465 ] 1456 ]
1466 ] ; 1457 ] ;
1467 sp:variable 1458 sp:variable
...@@ -1488,12 +1479,14 @@ mpr-tables:ProductionFlows ...@@ -1488,12 +1479,14 @@ mpr-tables:ProductionFlows
1488 sp:subject 1479 sp:subject
1489 [ sp:varName "pressure"^^xsd:string 1480 [ sp:varName "pressure"^^xsd:string
1490 ] 1481 ]
1491 - ] [ sp:object 1482 + ] [ rdf:type sp:Bind ;
1492 - [ sp:varName "pressureInAtmospheres"^^xsd:string 1483 + sp:expression
1484 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1485 + sp:arg1 [ sp:varName "pressure"^^xsd:string
1486 + ]
1493 ] ; 1487 ] ;
1494 - sp:predicate <http://www.reportinghub.no/ep/schema/core#atmosphere> ; 1488 + sp:variable
1495 - sp:subject 1489 + [ sp:varName "pressureInAtmospheres"^^xsd:string
1496 - [ sp:varName "pressure"^^xsd:string
1497 ] 1490 ]
1498 ]) 1491 ])
1499 ] [ rdf:type sp:Optional ; 1492 ] [ rdf:type sp:Optional ;
...@@ -1509,12 +1502,14 @@ mpr-tables:ProductionFlows ...@@ -1509,12 +1502,14 @@ mpr-tables:ProductionFlows
1509 sp:subject 1502 sp:subject
1510 [ sp:varName "temperature"^^xsd:string 1503 [ sp:varName "temperature"^^xsd:string
1511 ] 1504 ]
1512 - ] [ sp:object 1505 + ] [ rdf:type sp:Bind ;
1513 - [ sp:varName "temperatureInCelsius"^^xsd:string 1506 + sp:expression
1507 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1508 + sp:arg1 [ sp:varName "temperature"^^xsd:string
1509 + ]
1514 ] ; 1510 ] ;
1515 - sp:predicate <http://www.reportinghub.no/ep/schema/core#celsius> ; 1511 + sp:variable
1516 - sp:subject 1512 + [ sp:varName "temperatureInCelsius"^^xsd:string
1517 - [ sp:varName "temperature"^^xsd:string
1518 ] 1513 ]
1519 ]) 1514 ])
1520 ] [ sp:object 1515 ] [ sp:object
...@@ -1529,12 +1524,14 @@ mpr-tables:ProductionFlows ...@@ -1529,12 +1524,14 @@ mpr-tables:ProductionFlows
1529 sp:subject 1524 sp:subject
1530 [ sp:varName "volume"^^xsd:string 1525 [ sp:varName "volume"^^xsd:string
1531 ] 1526 ]
1532 - ] [ sp:object 1527 + ] [ rdf:type sp:Bind ;
1533 - [ sp:varName "volumeInMetre3"^^xsd:string 1528 + sp:expression
1529 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1530 + sp:arg1 [ sp:varName "volume"^^xsd:string
1531 + ]
1534 ] ; 1532 ] ;
1535 - sp:predicate <http://www.reportinghub.no/ep/schema/core#metre3> ; 1533 + sp:variable
1536 - sp:subject 1534 + [ sp:varName "volumeInMetre3"^^xsd:string
1537 - [ sp:varName "volume"^^xsd:string
1538 ] 1535 ]
1539 ] [ rdf:type sp:Optional ; 1536 ] [ rdf:type sp:Optional ;
1540 sp:elements ([ sp:object 1537 sp:elements ([ sp:object
...@@ -1544,12 +1541,14 @@ mpr-tables:ProductionFlows ...@@ -1544,12 +1541,14 @@ mpr-tables:ProductionFlows
1544 sp:subject 1541 sp:subject
1545 [ sp:varName "stateOfMaterialThatFlowsInPeriod"^^xsd:string 1542 [ sp:varName "stateOfMaterialThatFlowsInPeriod"^^xsd:string
1546 ] 1543 ]
1547 - ] [ sp:object 1544 + ] [ rdf:type sp:Bind ;
1548 - [ sp:varName "grossCalorificValueInMegaJouleMetre_3"^^xsd:string 1545 + sp:expression
1546 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1547 + sp:arg1 [ sp:varName "calorificValue"^^xsd:string
1548 + ]
1549 ] ; 1549 ] ;
1550 - sp:predicate <http://www.reportinghub.no/ep/schema/core#megajoule_m-3> ; 1550 + sp:variable
1551 - sp:subject 1551 + [ sp:varName "grossCalorificValueInMegaJouleMetre_3"^^xsd:string
1552 - [ sp:varName "calorificValue"^^xsd:string
1553 ] 1552 ]
1554 ]) 1553 ])
1555 ]) 1554 ])
...@@ -1557,7 +1556,7 @@ mpr-tables:ProductionFlows ...@@ -1557,7 +1556,7 @@ mpr-tables:ProductionFlows
1557 ]) 1556 ])
1558 ]) 1557 ])
1559 ] ; 1558 ] ;
1560 - rhspin:tableHeaders ("facility"^^xsd:string "flow name"^^xsd:string "type"^^xsd:string "subtype"^^xsd:string "purpose"^^xsd:string "product"^^xsd:string "material type"^^xsd:string "gross or net"^^xsd:string "duration type"^^xsd:string "mass "^^xsd:string "pressure (atm)"^^xsd:string "temperature (C)"^^xsd:string "volume (m^3"^^xsd:string "gross calorific value (MJ/m^3)"^^xsd:string) . 1559 + rhspin:tableHeaders ("facility"^^xsd:string "flow name"^^xsd:string "type"^^xsd:string "subtype"^^xsd:string "purpose"^^xsd:string "product"^^xsd:string "material type"^^xsd:string "gross or net"^^xsd:string "duration type"^^xsd:string "mass "^^xsd:string "pressure"^^xsd:string "temperature"^^xsd:string "volume"^^xsd:string "gross calorific"^^xsd:string) .
1561 1560
1562 mpr-tables:ProductionFlowsAll 1561 mpr-tables:ProductionFlowsAll
1563 rdf:type rhspin:TableTemplate ; 1562 rdf:type rhspin:TableTemplate ;
...@@ -1735,38 +1734,10 @@ mpr-tables:ProductionFlowsAll ...@@ -1735,38 +1734,10 @@ mpr-tables:ProductionFlowsAll
1735 sp:subject 1734 sp:subject
1736 [ sp:varName "materialQuantityValue"^^xsd:string 1735 [ sp:varName "materialQuantityValue"^^xsd:string
1737 ] 1736 ]
1738 - ] [ sp:object
1739 - [ sp:varName "materialValue"^^xsd:string
1740 - ] ;
1741 - sp:predicate
1742 - [ sp:varName "materialProperty"^^xsd:string
1743 - ] ;
1744 - sp:subject
1745 - [ sp:varName "materialQuantityValue"^^xsd:string
1746 - ]
1747 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
1748 - sp:predicate rdf:type ;
1749 - sp:subject
1750 - [ sp:varName "materialProperty"^^xsd:string
1751 - ]
1752 - ] [ sp:object
1753 - [ sp:varName "materialPropertyName"^^xsd:string
1754 - ] ;
1755 - sp:predicate rdfs:label ;
1756 - sp:subject
1757 - [ sp:varName "materialProperty"^^xsd:string
1758 - ]
1759 ] [ rdf:type sp:Bind ; 1737 ] [ rdf:type sp:Bind ;
1760 sp:expression 1738 sp:expression
1761 - [ rdf:type fn:concat ; 1739 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1762 - sp:arg1 [ rdf:type spif:decimalFormat ; 1740 + sp:arg1 [ sp:varName "materialQuantityValue"^^xsd:string
1763 - arg:number
1764 - [ sp:varName "materialValue"^^xsd:string
1765 - ] ;
1766 - arg:pattern "#.##"
1767 - ] ;
1768 - sp:arg2 " " ;
1769 - sp:arg3 [ sp:varName "materialPropertyName"^^xsd:string
1770 ] 1741 ]
1771 ] ; 1742 ] ;
1772 sp:variable 1743 sp:variable
...@@ -1793,38 +1764,10 @@ mpr-tables:ProductionFlowsAll ...@@ -1793,38 +1764,10 @@ mpr-tables:ProductionFlowsAll
1793 sp:subject 1764 sp:subject
1794 [ sp:varName "stateVolume"^^xsd:string 1765 [ sp:varName "stateVolume"^^xsd:string
1795 ] 1766 ]
1796 - ] [ sp:object
1797 - [ sp:varName "volumeValue"^^xsd:string
1798 - ] ;
1799 - sp:predicate
1800 - [ sp:varName "volumePredicate"^^xsd:string
1801 - ] ;
1802 - sp:subject
1803 - [ sp:varName "stateVolume"^^xsd:string
1804 - ]
1805 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
1806 - sp:predicate rdf:type ;
1807 - sp:subject
1808 - [ sp:varName "volumePredicate"^^xsd:string
1809 - ]
1810 - ] [ sp:object
1811 - [ sp:varName "volumeUnit"^^xsd:string
1812 - ] ;
1813 - sp:predicate rdfs:label ;
1814 - sp:subject
1815 - [ sp:varName "volumePredicate"^^xsd:string
1816 - ]
1817 ] [ rdf:type sp:Bind ; 1767 ] [ rdf:type sp:Bind ;
1818 sp:expression 1768 sp:expression
1819 - [ rdf:type fn:concat ; 1769 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1820 - sp:arg1 [ rdf:type spif:decimalFormat ; 1770 + sp:arg1 [ sp:varName "stateVolume"^^xsd:string
1821 - arg:number
1822 - [ sp:varName "volumeValue"^^xsd:string
1823 - ] ;
1824 - arg:pattern "#.##"
1825 - ] ;
1826 - sp:arg2 " " ;
1827 - sp:arg3 [ sp:varName "volumeUnit"^^xsd:string
1828 ] 1771 ]
1829 ] ; 1772 ] ;
1830 sp:variable 1773 sp:variable
...@@ -1851,38 +1794,10 @@ mpr-tables:ProductionFlowsAll ...@@ -1851,38 +1794,10 @@ mpr-tables:ProductionFlowsAll
1851 sp:subject 1794 sp:subject
1852 [ sp:varName "stateDensity"^^xsd:string 1795 [ sp:varName "stateDensity"^^xsd:string
1853 ] 1796 ]
1854 - ] [ sp:object
1855 - [ sp:varName "densityValue"^^xsd:string
1856 - ] ;
1857 - sp:predicate
1858 - [ sp:varName "densityPredicate"^^xsd:string
1859 - ] ;
1860 - sp:subject
1861 - [ sp:varName "stateDensity"^^xsd:string
1862 - ]
1863 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
1864 - sp:predicate rdf:type ;
1865 - sp:subject
1866 - [ sp:varName "densityPredicate"^^xsd:string
1867 - ]
1868 - ] [ sp:object
1869 - [ sp:varName "densityUnit"^^xsd:string
1870 - ] ;
1871 - sp:predicate rdfs:label ;
1872 - sp:subject
1873 - [ sp:varName "densityPredicate"^^xsd:string
1874 - ]
1875 ] [ rdf:type sp:Bind ; 1797 ] [ rdf:type sp:Bind ;
1876 sp:expression 1798 sp:expression
1877 - [ rdf:type fn:concat ; 1799 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
1878 - sp:arg1 [ rdf:type spif:decimalFormat ; 1800 + sp:arg1 [ sp:varName "stateDensity"^^xsd:string
1879 - arg:number
1880 - [ sp:varName "densityValue"^^xsd:string
1881 - ] ;
1882 - arg:pattern "#.##"
1883 - ] ;
1884 - sp:arg2 " " ;
1885 - sp:arg3 [ sp:varName "densityUnit"^^xsd:string
1886 ] 1801 ]
1887 ] ; 1802 ] ;
1888 sp:variable 1803 sp:variable
...@@ -2089,50 +2004,10 @@ mpr-tables:ProductionInventory ...@@ -2089,50 +2004,10 @@ mpr-tables:ProductionInventory
2089 sp:subject 2004 sp:subject
2090 [ sp:varName "materialQuantityValue"^^xsd:string 2005 [ sp:varName "materialQuantityValue"^^xsd:string
2091 ] 2006 ]
2092 - ] [ sp:object
2093 - [ sp:varName "materialValue"^^xsd:string
2094 - ] ;
2095 - sp:predicate
2096 - [ sp:varName "materialProperty"^^xsd:string
2097 - ] ;
2098 - sp:subject
2099 - [ sp:varName "materialQuantityValue"^^xsd:string
2100 - ]
2101 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
2102 - sp:predicate rdf:type ;
2103 - sp:subject
2104 - [ sp:varName "materialProperty"^^xsd:string
2105 - ]
2106 - ] [ sp:object
2107 - [ sp:varName "materialPropertyName"^^xsd:string
2108 - ] ;
2109 - sp:predicate rdfs:label ;
2110 - sp:subject
2111 - [ sp:varName "materialProperty"^^xsd:string
2112 - ]
2113 - ] [ sp:object
2114 - [ sp:varName "materialQuantity"^^xsd:string
2115 - ] ;
2116 - sp:predicate rdf:type ;
2117 - sp:subject
2118 - [ sp:varName "materialQuantityValue"^^xsd:string
2119 - ]
2120 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#PropertySpace> ;
2121 - sp:predicate rdf:type ;
2122 - sp:subject
2123 - [ sp:varName "materialQuantity"^^xsd:string
2124 - ]
2125 ] [ rdf:type sp:Bind ; 2007 ] [ rdf:type sp:Bind ;
2126 sp:expression 2008 sp:expression
2127 - [ rdf:type fn:concat ; 2009 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
2128 - sp:arg1 [ rdf:type spif:decimalFormat ; 2010 + sp:arg1 [ sp:varName "materialQuantityValue"^^xsd:string
2129 - arg:number
2130 - [ sp:varName "materialValue"^^xsd:string
2131 - ] ;
2132 - arg:pattern "#.##"
2133 - ] ;
2134 - sp:arg2 " " ;
2135 - sp:arg3 [ sp:varName "materialPropertyName"^^xsd:string
2136 ] 2011 ]
2137 ] ; 2012 ] ;
2138 sp:variable 2013 sp:variable
...@@ -2159,38 +2034,10 @@ mpr-tables:ProductionInventory ...@@ -2159,38 +2034,10 @@ mpr-tables:ProductionInventory
2159 sp:subject 2034 sp:subject
2160 [ sp:varName "volumeQuantityValue"^^xsd:string 2035 [ sp:varName "volumeQuantityValue"^^xsd:string
2161 ] 2036 ]
2162 - ] [ sp:object
2163 - [ sp:varName "volumeValue"^^xsd:string
2164 - ] ;
2165 - sp:predicate
2166 - [ sp:varName "volumePredicate"^^xsd:string
2167 - ] ;
2168 - sp:subject
2169 - [ sp:varName "volumeQuantityValue"^^xsd:string
2170 - ]
2171 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
2172 - sp:predicate rdf:type ;
2173 - sp:subject
2174 - [ sp:varName "volumePredicate"^^xsd:string
2175 - ]
2176 - ] [ sp:object
2177 - [ sp:varName "volumeUnit"^^xsd:string
2178 - ] ;
2179 - sp:predicate rdfs:label ;
2180 - sp:subject
2181 - [ sp:varName "volumePredicate"^^xsd:string
2182 - ]
2183 ] [ rdf:type sp:Bind ; 2037 ] [ rdf:type sp:Bind ;
2184 sp:expression 2038 sp:expression
2185 - [ rdf:type fn:concat ; 2039 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
2186 - sp:arg1 [ rdf:type spif:decimalFormat ; 2040 + sp:arg1 [ sp:varName "volumeQuantityValue"^^xsd:string
2187 - arg:number
2188 - [ sp:varName "volumeValue"^^xsd:string
2189 - ] ;
2190 - arg:pattern "#.##"
2191 - ] ;
2192 - sp:arg2 " " ;
2193 - sp:arg3 [ sp:varName "volumeUnit"^^xsd:string
2194 ] 2041 ]
2195 ] ; 2042 ] ;
2196 sp:variable 2043 sp:variable
...@@ -2217,38 +2064,10 @@ mpr-tables:ProductionInventory ...@@ -2217,38 +2064,10 @@ mpr-tables:ProductionInventory
2217 sp:subject 2064 sp:subject
2218 [ sp:varName "densityQuantityValue"^^xsd:string 2065 [ sp:varName "densityQuantityValue"^^xsd:string
2219 ] 2066 ]
2220 - ] [ sp:object
2221 - [ sp:varName "densityValue"^^xsd:string
2222 - ] ;
2223 - sp:predicate
2224 - [ sp:varName "densityPredicate"^^xsd:string
2225 - ] ;
2226 - sp:subject
2227 - [ sp:varName "densityQuantityValue"^^xsd:string
2228 - ]
2229 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
2230 - sp:predicate rdf:type ;
2231 - sp:subject
2232 - [ sp:varName "densityPredicate"^^xsd:string
2233 - ]
2234 - ] [ sp:object
2235 - [ sp:varName "densityUnit"^^xsd:string
2236 - ] ;
2237 - sp:predicate rdfs:label ;
2238 - sp:subject
2239 - [ sp:varName "densityPredicate"^^xsd:string
2240 - ]
2241 ] [ rdf:type sp:Bind ; 2067 ] [ rdf:type sp:Bind ;
2242 sp:expression 2068 sp:expression
2243 - [ rdf:type fn:concat ; 2069 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
2244 - sp:arg1 [ rdf:type spif:decimalFormat ; 2070 + sp:arg1 [ sp:varName "densityQuantityValue"^^xsd:string
2245 - arg:number
2246 - [ sp:varName "densityValue"^^xsd:string
2247 - ] ;
2248 - arg:pattern "#.##"
2249 - ] ;
2250 - sp:arg2 " " ;
2251 - sp:arg3 [ sp:varName "densityUnit"^^xsd:string
2252 ] 2071 ]
2253 ] ; 2072 ] ;
2254 sp:variable 2073 sp:variable
...@@ -2485,12 +2304,14 @@ mpr-tables:ProductionInventoryOwnership ...@@ -2485,12 +2304,14 @@ mpr-tables:ProductionInventoryOwnership
2485 sp:subject 2304 sp:subject
2486 [ sp:varName "ownedQuantityType"^^xsd:string 2305 [ sp:varName "ownedQuantityType"^^xsd:string
2487 ] 2306 ]
2488 - ] [ sp:object 2307 + ] [ rdf:type sp:Bind ;
2489 - [ sp:varName "ownedVolumeValue"^^xsd:string 2308 + sp:expression
2309 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
2310 + sp:arg1 [ sp:varName "ownedQuantityType"^^xsd:string
2311 + ]
2490 ] ; 2312 ] ;
2491 - sp:predicate <http://www.reportinghub.no/ep/schema/core#metre3> ; 2313 + sp:variable
2492 - sp:subject 2314 + [ sp:varName "ownedVolumeValue"^^xsd:string
2493 - [ sp:varName "ownedQuantityType"^^xsd:string
2494 ] 2315 ]
2495 ] [ sp:object 2316 ] [ sp:object
2496 [ sp:varName "partOfOrg"^^xsd:string 2317 [ sp:varName "partOfOrg"^^xsd:string
...@@ -2688,38 +2509,10 @@ mpr-tables:ProductionSales ...@@ -2688,38 +2509,10 @@ mpr-tables:ProductionSales
2688 sp:subject 2509 sp:subject
2689 [ sp:varName "materialQuantityValue"^^xsd:string 2510 [ sp:varName "materialQuantityValue"^^xsd:string
2690 ] 2511 ]
2691 - ] [ sp:object
2692 - [ sp:varName "materialValue"^^xsd:string
2693 - ] ;
2694 - sp:predicate
2695 - [ sp:varName "materialProperty"^^xsd:string
2696 - ] ;
2697 - sp:subject
2698 - [ sp:varName "materialQuantityValue"^^xsd:string
2699 - ]
2700 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
2701 - sp:predicate rdf:type ;
2702 - sp:subject
2703 - [ sp:varName "materialProperty"^^xsd:string
2704 - ]
2705 - ] [ sp:object
2706 - [ sp:varName "materialPropertyName"^^xsd:string
2707 - ] ;
2708 - sp:predicate rdfs:label ;
2709 - sp:subject
2710 - [ sp:varName "materialProperty"^^xsd:string
2711 - ]
2712 ] [ rdf:type sp:Bind ; 2512 ] [ rdf:type sp:Bind ;
2713 sp:expression 2513 sp:expression
2714 - [ rdf:type fn:concat ; 2514 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
2715 - sp:arg1 [ rdf:type spif:decimalFormat ; 2515 + sp:arg1 [ sp:varName "materialQuantityValue"^^xsd:string
2716 - arg:number
2717 - [ sp:varName "materialValue"^^xsd:string
2718 - ] ;
2719 - arg:pattern "#.##"
2720 - ] ;
2721 - sp:arg2 " " ;
2722 - sp:arg3 [ sp:varName "materialPropertyName"^^xsd:string
2723 ] 2516 ]
2724 ] ; 2517 ] ;
2725 sp:variable 2518 sp:variable
...@@ -2746,38 +2539,10 @@ mpr-tables:ProductionSales ...@@ -2746,38 +2539,10 @@ mpr-tables:ProductionSales
2746 sp:subject 2539 sp:subject
2747 [ sp:varName "stateVolume"^^xsd:string 2540 [ sp:varName "stateVolume"^^xsd:string
2748 ] 2541 ]
2749 - ] [ sp:object
2750 - [ sp:varName "volumeValue"^^xsd:string
2751 - ] ;
2752 - sp:predicate
2753 - [ sp:varName "volumePredicate"^^xsd:string
2754 - ] ;
2755 - sp:subject
2756 - [ sp:varName "stateVolume"^^xsd:string
2757 - ]
2758 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
2759 - sp:predicate rdf:type ;
2760 - sp:subject
2761 - [ sp:varName "volumePredicate"^^xsd:string
2762 - ]
2763 - ] [ sp:object
2764 - [ sp:varName "volumeUnit"^^xsd:string
2765 - ] ;
2766 - sp:predicate rdfs:label ;
2767 - sp:subject
2768 - [ sp:varName "volumePredicate"^^xsd:string
2769 - ]
2770 ] [ rdf:type sp:Bind ; 2542 ] [ rdf:type sp:Bind ;
2771 sp:expression 2543 sp:expression
2772 - [ rdf:type fn:concat ; 2544 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
2773 - sp:arg1 [ rdf:type spif:decimalFormat ; 2545 + sp:arg1 [ sp:varName "stateVolume"^^xsd:string
2774 - arg:number
2775 - [ sp:varName "volumeValue"^^xsd:string
2776 - ] ;
2777 - arg:pattern "#.##"
2778 - ] ;
2779 - sp:arg2 " " ;
2780 - sp:arg3 [ sp:varName "volumeUnit"^^xsd:string
2781 ] 2546 ]
2782 ] ; 2547 ] ;
2783 sp:variable 2548 sp:variable
...@@ -2804,38 +2569,10 @@ mpr-tables:ProductionSales ...@@ -2804,38 +2569,10 @@ mpr-tables:ProductionSales
2804 sp:subject 2569 sp:subject
2805 [ sp:varName "stateDensity"^^xsd:string 2570 [ sp:varName "stateDensity"^^xsd:string
2806 ] 2571 ]
2807 - ] [ sp:object
2808 - [ sp:varName "densityValue"^^xsd:string
2809 - ] ;
2810 - sp:predicate
2811 - [ sp:varName "densityPredicate"^^xsd:string
2812 - ] ;
2813 - sp:subject
2814 - [ sp:varName "stateDensity"^^xsd:string
2815 - ]
2816 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
2817 - sp:predicate rdf:type ;
2818 - sp:subject
2819 - [ sp:varName "densityPredicate"^^xsd:string
2820 - ]
2821 - ] [ sp:object
2822 - [ sp:varName "densityUnit"^^xsd:string
2823 - ] ;
2824 - sp:predicate rdfs:label ;
2825 - sp:subject
2826 - [ sp:varName "densityPredicate"^^xsd:string
2827 - ]
2828 ] [ rdf:type sp:Bind ; 2572 ] [ rdf:type sp:Bind ;
2829 sp:expression 2573 sp:expression
2830 - [ rdf:type fn:concat ; 2574 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
2831 - sp:arg1 [ rdf:type spif:decimalFormat ; 2575 + sp:arg1 [ sp:varName "stateDensity"^^xsd:string
2832 - arg:number
2833 - [ sp:varName "densityValue"^^xsd:string
2834 - ] ;
2835 - arg:pattern "#.##"
2836 - ] ;
2837 - sp:arg2 " " ;
2838 - sp:arg3 [ sp:varName "densityUnit"^^xsd:string
2839 ] 2576 ]
2840 ] ; 2577 ] ;
2841 sp:variable 2578 sp:variable
...@@ -3174,38 +2911,10 @@ mpr-tables:WellProductionFlows ...@@ -3174,38 +2911,10 @@ mpr-tables:WellProductionFlows
3174 sp:subject 2911 sp:subject
3175 [ sp:varName "stateVolume"^^xsd:string 2912 [ sp:varName "stateVolume"^^xsd:string
3176 ] 2913 ]
3177 - ] [ sp:object
3178 - [ sp:varName "volumeValue"^^xsd:string
3179 - ] ;
3180 - sp:predicate
3181 - [ sp:varName "volumePredicate"^^xsd:string
3182 - ] ;
3183 - sp:subject
3184 - [ sp:varName "stateVolume"^^xsd:string
3185 - ]
3186 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
3187 - sp:predicate rdf:type ;
3188 - sp:subject
3189 - [ sp:varName "volumePredicate"^^xsd:string
3190 - ]
3191 - ] [ sp:object
3192 - [ sp:varName "volumeUnit"^^xsd:string
3193 - ] ;
3194 - sp:predicate rdfs:label ;
3195 - sp:subject
3196 - [ sp:varName "volumePredicate"^^xsd:string
3197 - ]
3198 ] [ rdf:type sp:Bind ; 2914 ] [ rdf:type sp:Bind ;
3199 sp:expression 2915 sp:expression
3200 - [ rdf:type fn:concat ; 2916 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
3201 - sp:arg1 [ rdf:type spif:decimalFormat ; 2917 + sp:arg1 [ sp:varName "stateVolume"^^xsd:string
3202 - arg:number
3203 - [ sp:varName "volumeValue"^^xsd:string
3204 - ] ;
3205 - arg:pattern "#.##"
3206 - ] ;
3207 - sp:arg2 " " ;
3208 - sp:arg3 [ sp:varName "volumeUnit"^^xsd:string
3209 ] 2918 ]
3210 ] ; 2919 ] ;
3211 sp:variable 2920 sp:variable
......