Showing
1 changed file
with
70 additions
and
30 deletions
| ... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | ||
| 20 | <http://www.reportinghub.no/ep/spin/mpr-tables> | 20 | <http://www.reportinghub.no/ep/spin/mpr-tables> |
| 21 | rdf:type owl:Ontology ; | 21 | rdf:type owl:Ontology ; |
| 22 | - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> ; | 22 | + owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> ; |
| 23 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . | 23 | owl:versionInfo "Created with TopBraid Composer"^^xsd:string . |
| 24 | 24 | ||
| 25 | mpr-tables:Cargo | 25 | mpr-tables:Cargo |
| ... | @@ -1454,13 +1454,14 @@ mpr-tables:ProductionFlowsAll | ... | @@ -1454,13 +1454,14 @@ mpr-tables:ProductionFlowsAll |
| 1454 | [ rdf:type sp:Select ; | 1454 | [ rdf:type sp:Select ; |
| 1455 | sp:orderBy ([ sp:varName "facilityName"^^xsd:string | 1455 | sp:orderBy ([ sp:varName "facilityName"^^xsd:string |
| 1456 | ] [ sp:varName "purposeTypeName"^^xsd:string | 1456 | ] [ sp:varName "purposeTypeName"^^xsd:string |
| 1457 | + ] [ sp:varName "materialTypeName"^^xsd:string | ||
| 1457 | ]) ; | 1458 | ]) ; |
| 1458 | sp:resultVariables ([ sp:varName "facilityName"^^xsd:string | 1459 | sp:resultVariables ([ sp:varName "facilityName"^^xsd:string |
| 1459 | ] [ sp:varName "purposeTypeName"^^xsd:string | 1460 | ] [ sp:varName "purposeTypeName"^^xsd:string |
| 1460 | ] [ sp:varName "materialTypeName"^^xsd:string | 1461 | ] [ sp:varName "materialTypeName"^^xsd:string |
| 1461 | ] [ sp:varName "massValueString"^^xsd:string | 1462 | ] [ sp:varName "massValueString"^^xsd:string |
| 1462 | ] [ sp:varName "volumeValueString"^^xsd:string | 1463 | ] [ sp:varName "volumeValueString"^^xsd:string |
| 1463 | - ] [ sp:varName "temperatureInCelcius"^^xsd:string | 1464 | + ] [ sp:varName "densityValueString"^^xsd:string |
| 1464 | ] [ sp:varName "definitionTypeName"^^xsd:string | 1465 | ] [ sp:varName "definitionTypeName"^^xsd:string |
| 1465 | ] [ sp:varName "definitionSubTypeName"^^xsd:string | 1466 | ] [ sp:varName "definitionSubTypeName"^^xsd:string |
| 1466 | ] [ sp:varName "grossOrNet"^^xsd:string | 1467 | ] [ sp:varName "grossOrNet"^^xsd:string |
| ... | @@ -1553,8 +1554,7 @@ mpr-tables:ProductionFlowsAll | ... | @@ -1553,8 +1554,7 @@ mpr-tables:ProductionFlowsAll |
| 1553 | sp:subject | 1554 | sp:subject |
| 1554 | [ sp:varName "productionFlowFacility"^^xsd:string | 1555 | [ sp:varName "productionFlowFacility"^^xsd:string |
| 1555 | ] | 1556 | ] |
| 1556 | - ] [ rdf:type sp:Optional ; | 1557 | + ] [ sp:object |
| 1557 | - sp:elements ([ sp:object | ||
| 1558 | [ sp:varName "productionFlowMixedPart"^^xsd:string | 1558 | [ sp:varName "productionFlowMixedPart"^^xsd:string |
| 1559 | ] ; | 1559 | ] ; |
| 1560 | sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; | 1560 | sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; |
| ... | @@ -1592,7 +1592,8 @@ mpr-tables:ProductionFlowsAll | ... | @@ -1592,7 +1592,8 @@ mpr-tables:ProductionFlowsAll |
| 1592 | sp:subject | 1592 | sp:subject |
| 1593 | [ sp:varName "flowDuringMonth"^^xsd:string | 1593 | [ sp:varName "flowDuringMonth"^^xsd:string |
| 1594 | ] | 1594 | ] |
| 1595 | - ] [ sp:object | 1595 | + ] [ rdf:type sp:Optional ; |
| 1596 | + sp:elements ([ sp:object | ||
| 1596 | [ sp:varName "materialQuantityValue"^^xsd:string | 1597 | [ sp:varName "materialQuantityValue"^^xsd:string |
| 1597 | ] ; | 1598 | ] ; |
| 1598 | sp:predicate rdf:type ; | 1599 | sp:predicate rdf:type ; |
| ... | @@ -1641,82 +1642,121 @@ mpr-tables:ProductionFlowsAll | ... | @@ -1641,82 +1642,121 @@ mpr-tables:ProductionFlowsAll |
| 1641 | sp:variable | 1642 | sp:variable |
| 1642 | [ sp:varName "massValueString"^^xsd:string | 1643 | [ sp:varName "massValueString"^^xsd:string |
| 1643 | ] | 1644 | ] |
| 1644 | - ] [ sp:object | 1645 | + ]) |
| 1646 | + ] [ rdf:type sp:Optional ; | ||
| 1647 | + sp:elements ([ sp:object | ||
| 1645 | [ sp:varName "flowDuringMonthMaterial"^^xsd:string | 1648 | [ sp:varName "flowDuringMonthMaterial"^^xsd:string |
| 1646 | ] ; | 1649 | ] ; |
| 1647 | sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; | 1650 | sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; |
| 1648 | sp:subject | 1651 | sp:subject |
| 1649 | - [ sp:varName "stateOfMaterialThatFlowsInPeriod"^^xsd:string | 1652 | + [ sp:varName "stateOfMaterialThatFlowsInPeriodVolume"^^xsd:string |
| 1650 | ] | 1653 | ] |
| 1651 | - ] [ rdf:type sp:Optional ; | 1654 | + ] [ sp:object |
| 1652 | - sp:elements ([ sp:object | 1655 | + [ sp:varName "stateVolume"^^xsd:string |
| 1653 | - [ sp:varName "temperature"^^xsd:string | ||
| 1654 | ] ; | 1656 | ] ; |
| 1655 | sp:predicate rdf:type ; | 1657 | sp:predicate rdf:type ; |
| 1656 | sp:subject | 1658 | sp:subject |
| 1657 | - [ sp:varName "stateOfMaterialThatFlowsInPeriod"^^xsd:string | 1659 | + [ sp:varName "stateOfMaterialThatFlowsInPeriodVolume"^^xsd:string |
| 1658 | ] | 1660 | ] |
| 1659 | - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Temperature> ; | 1661 | + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Volume> ; |
| 1660 | sp:predicate rdf:type ; | 1662 | sp:predicate rdf:type ; |
| 1661 | sp:subject | 1663 | sp:subject |
| 1662 | - [ sp:varName "temperature"^^xsd:string | 1664 | + [ sp:varName "stateVolume"^^xsd:string |
| 1663 | ] | 1665 | ] |
| 1664 | ] [ sp:object | 1666 | ] [ sp:object |
| 1665 | - [ sp:varName "temperatureInCelcius"^^xsd:string | 1667 | + [ sp:varName "volumeValue"^^xsd:string |
| 1668 | + ] ; | ||
| 1669 | + sp:predicate | ||
| 1670 | + [ sp:varName "volumePredicate"^^xsd:string | ||
| 1666 | ] ; | 1671 | ] ; |
| 1667 | - sp:predicate <http://www.reportinghub.no/ep/schema/core#celsius> ; | ||
| 1668 | sp:subject | 1672 | sp:subject |
| 1669 | - [ sp:varName "temperature"^^xsd:string | 1673 | + [ sp:varName "stateVolume"^^xsd:string |
| 1674 | + ] | ||
| 1675 | + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ; | ||
| 1676 | + sp:predicate rdf:type ; | ||
| 1677 | + sp:subject | ||
| 1678 | + [ sp:varName "volumePredicate"^^xsd:string | ||
| 1679 | + ] | ||
| 1680 | + ] [ sp:object | ||
| 1681 | + [ sp:varName "volumeUnit"^^xsd:string | ||
| 1682 | + ] ; | ||
| 1683 | + sp:predicate rdfs:label ; | ||
| 1684 | + sp:subject | ||
| 1685 | + [ sp:varName "volumePredicate"^^xsd:string | ||
| 1686 | + ] | ||
| 1687 | + ] [ rdf:type sp:Bind ; | ||
| 1688 | + sp:expression | ||
| 1689 | + [ rdf:type fn:concat ; | ||
| 1690 | + sp:arg1 [ rdf:type spif:decimalFormat ; | ||
| 1691 | + arg:number | ||
| 1692 | + [ sp:varName "volumeValue"^^xsd:string | ||
| 1693 | + ] ; | ||
| 1694 | + arg:pattern "#.##" | ||
| 1695 | + ] ; | ||
| 1696 | + sp:arg2 " " ; | ||
| 1697 | + sp:arg3 [ sp:varName "volumeUnit"^^xsd:string | ||
| 1698 | + ] | ||
| 1699 | + ] ; | ||
| 1700 | + sp:variable | ||
| 1701 | + [ sp:varName "volumeValueString"^^xsd:string | ||
| 1670 | ] | 1702 | ] |
| 1671 | ]) | 1703 | ]) |
| 1704 | + ] [ rdf:type sp:Optional ; | ||
| 1705 | + sp:elements ([ sp:object | ||
| 1706 | + [ sp:varName "flowDuringMonthMaterial"^^xsd:string | ||
| 1707 | + ] ; | ||
| 1708 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; | ||
| 1709 | + sp:subject | ||
| 1710 | + [ sp:varName "stateOfMaterialThatFlowsInPeriodDensity"^^xsd:string | ||
| 1711 | + ] | ||
| 1672 | ] [ sp:object | 1712 | ] [ sp:object |
| 1673 | - [ sp:varName "volume"^^xsd:string | 1713 | + [ sp:varName "stateDensity"^^xsd:string |
| 1674 | ] ; | 1714 | ] ; |
| 1675 | sp:predicate rdf:type ; | 1715 | sp:predicate rdf:type ; |
| 1676 | sp:subject | 1716 | sp:subject |
| 1677 | - [ sp:varName "stateOfMaterialThatFlowsInPeriod"^^xsd:string | 1717 | + [ sp:varName "stateOfMaterialThatFlowsInPeriodDensity"^^xsd:string |
| 1678 | ] | 1718 | ] |
| 1679 | - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Volume> ; | 1719 | + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Density> ; |
| 1680 | sp:predicate rdf:type ; | 1720 | sp:predicate rdf:type ; |
| 1681 | sp:subject | 1721 | sp:subject |
| 1682 | - [ sp:varName "volume"^^xsd:string | 1722 | + [ sp:varName "stateDensity"^^xsd:string |
| 1683 | ] | 1723 | ] |
| 1684 | ] [ sp:object | 1724 | ] [ sp:object |
| 1685 | - [ sp:varName "volumeValue"^^xsd:string | 1725 | + [ sp:varName "densityValue"^^xsd:string |
| 1686 | ] ; | 1726 | ] ; |
| 1687 | sp:predicate | 1727 | sp:predicate |
| 1688 | - [ sp:varName "volumePredicate"^^xsd:string | 1728 | + [ sp:varName "densityPredicate"^^xsd:string |
| 1689 | ] ; | 1729 | ] ; |
| 1690 | sp:subject | 1730 | sp:subject |
| 1691 | - [ sp:varName "volume"^^xsd:string | 1731 | + [ sp:varName "stateDensity"^^xsd:string |
| 1692 | ] | 1732 | ] |
| 1693 | ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ; | 1733 | ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ; |
| 1694 | sp:predicate rdf:type ; | 1734 | sp:predicate rdf:type ; |
| 1695 | sp:subject | 1735 | sp:subject |
| 1696 | - [ sp:varName "volumePredicate"^^xsd:string | 1736 | + [ sp:varName "densityPredicate"^^xsd:string |
| 1697 | ] | 1737 | ] |
| 1698 | ] [ sp:object | 1738 | ] [ sp:object |
| 1699 | - [ sp:varName "volumeUnit"^^xsd:string | 1739 | + [ sp:varName "densityUnit"^^xsd:string |
| 1700 | ] ; | 1740 | ] ; |
| 1701 | sp:predicate rdfs:label ; | 1741 | sp:predicate rdfs:label ; |
| 1702 | sp:subject | 1742 | sp:subject |
| 1703 | - [ sp:varName "volumePredicate"^^xsd:string | 1743 | + [ sp:varName "densityPredicate"^^xsd:string |
| 1704 | ] | 1744 | ] |
| 1705 | ] [ rdf:type sp:Bind ; | 1745 | ] [ rdf:type sp:Bind ; |
| 1706 | sp:expression | 1746 | sp:expression |
| 1707 | [ rdf:type fn:concat ; | 1747 | [ rdf:type fn:concat ; |
| 1708 | sp:arg1 [ rdf:type spif:decimalFormat ; | 1748 | sp:arg1 [ rdf:type spif:decimalFormat ; |
| 1709 | arg:number | 1749 | arg:number |
| 1710 | - [ sp:varName "volumeValue"^^xsd:string | 1750 | + [ sp:varName "densityValue"^^xsd:string |
| 1711 | ] ; | 1751 | ] ; |
| 1712 | arg:pattern "#.##" | 1752 | arg:pattern "#.##" |
| 1713 | ] ; | 1753 | ] ; |
| 1714 | sp:arg2 " " ; | 1754 | sp:arg2 " " ; |
| 1715 | - sp:arg3 [ sp:varName "volumeUnit"^^xsd:string | 1755 | + sp:arg3 [ sp:varName "densityUnit"^^xsd:string |
| 1716 | ] | 1756 | ] |
| 1717 | ] ; | 1757 | ] ; |
| 1718 | sp:variable | 1758 | sp:variable |
| 1719 | - [ sp:varName "volumeValueString"^^xsd:string | 1759 | + [ sp:varName "densityValueString"^^xsd:string |
| 1720 | ] | 1760 | ] |
| 1721 | ]) | 1761 | ]) |
| 1722 | ] [ rdf:type sp:Optional ; | 1762 | ] [ rdf:type sp:Optional ; |
| ... | @@ -1826,7 +1866,7 @@ mpr-tables:ProductionFlowsAll | ... | @@ -1826,7 +1866,7 @@ mpr-tables:ProductionFlowsAll |
| 1826 | ]) | 1866 | ]) |
| 1827 | ]) | 1867 | ]) |
| 1828 | ] ; | 1868 | ] ; |
| 1829 | - rhspin:tableHeaders ("Facility"^^xsd:string "Purpose"^^xsd:string "Material"^^xsd:string "Mass"^^xsd:string "Volume"^^xsd:string "Temperature C"^^xsd:string "Flow type"^^xsd:string "Flow subtype"^^xsd:string "Gross/Net"^^xsd:string) . | 1869 | + rhspin:tableHeaders ("Facility"^^xsd:string "Purpose"^^xsd:string "Material"^^xsd:string "Mass"^^xsd:string "Volume"^^xsd:string "Density"^^xsd:string "Flow type"^^xsd:string "Flow subtype"^^xsd:string "Gross/Net"^^xsd:string) . |
| 1830 | 1870 | ||
| 1831 | mpr-tables:ProductionInventory | 1871 | mpr-tables:ProductionInventory |
| 1832 | rdf:type rhspin:TableTemplate ; | 1872 | rdf:type rhspin:TableTemplate ; | ... | ... |
-
Please register or login to post a comment