David Price

DPR2 HTML now only uses normalized UoM and value strings

......@@ -2929,21 +2929,25 @@ ep-core:partPerMillionByVolume
ep-core:pascal
rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
rdfs:domain ep-core:Pressure ;
rdfs:label "Pascal"^^xsd:string .
rdfs:label "Pascal"^^xsd:string ;
ep-core:unitSymbol "Pa"^^xsd:string .
ep-core:pascal-1
rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
rdfs:domain ep-core:Compressibility ;
rdfs:label "per Pascal"^^xsd:string .
rdfs:label "per Pascal"^^xsd:string ;
ep-core:unitSymbol "per Pa"^^xsd:string .
ep-core:pascal_m-1
rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
rdfs:label "Pascal per metre"^^xsd:string .
rdfs:label "Pascal per metre"^^xsd:string ;
ep-core:unitSymbol "Pa/m"^^xsd:string .
ep-core:pascal_second
rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
rdfs:domain ep-core:PlasticViscosity ;
rdfs:label "Pa.second"^^xsd:string .
rdfs:label "Pa.second"^^xsd:string ;
ep-core:unitSymbol "Pa s"^^xsd:string .
ep-core:pdl
rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
......
......@@ -136,12 +136,14 @@ dpr-tables:FluidSampleAnalysisResults
sp:subject
[ sp:varName "materialPair"^^xsd:string
]
] [ sp:object
[ sp:varName "massRatioPercent"^^xsd:string
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "massRatio"^^xsd:string
]
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#percent> ;
sp:subject
[ sp:varName "massRatio"^^xsd:string
sp:variable
[ sp:varName "massRatioPercent"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
......@@ -152,20 +154,20 @@ dpr-tables:FluidSampleAnalysisResults
sp:subject
[ sp:varName "materialPair"^^xsd:string
]
] [ sp:object
[ sp:varName "moleRatioPercent"^^xsd:string
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "moleRatio"^^xsd:string
]
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#percent> ;
sp:subject
[ sp:varName "moleRatio"^^xsd:string
sp:variable
[ sp:varName "moleRatioPercent"^^xsd:string
]
])
])
])
] ;
rhspin:tableHeaders ("Fluid Sample Name"^^xsd:string "Component"^^xsd:string """Mole Ratio
Percent"""^^xsd:string """Mass Ratio
Percent"""^^xsd:string) .
rhspin:tableHeaders ("Fluid Sample Name"^^xsd:string "Component"^^xsd:string "Mole Ratio"^^xsd:string "Mass Ratio"^^xsd:string) .
dpr-tables:FluidSamples
rdf:type rhspin:TableTemplate ;
......@@ -871,12 +873,14 @@ dpr-tables:ProductFlows
sp:subject
[ sp:varName "pressure"^^xsd:string
]
] [ sp:object
[ sp:varName "pressureValue"^^xsd:string
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "pressure"^^xsd:string
]
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#pascal> ;
sp:subject
[ sp:varName "pressure"^^xsd:string
sp:variable
[ sp:varName "pressureValue"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
......@@ -892,12 +896,14 @@ dpr-tables:ProductFlows
sp:subject
[ sp:varName "temperature"^^xsd:string
]
] [ sp:object
[ sp:varName "temperatureValue"^^xsd:string
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "temperature"^^xsd:string
]
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#kelvin> ;
sp:subject
[ sp:varName "temperature"^^xsd:string
sp:variable
[ sp:varName "temperatureValue"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
......@@ -913,12 +919,14 @@ dpr-tables:ProductFlows
sp:subject
[ sp:varName "density"^^xsd:string
]
] [ sp:object
[ sp:varName "densityValue"^^xsd:string
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "density"^^xsd:string
]
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#kilogram_m-3> ;
sp:subject
[ sp:varName "density"^^xsd:string
sp:variable
[ sp:varName "densityValue"^^xsd:string
]
])
])
......@@ -1263,26 +1271,32 @@ dpr-tables:ProductionVolumes
sp:subject
[ sp:varName "temperature"^^xsd:string
]
] [ sp:object
[ sp:varName "temperatureValue"^^xsd:string
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "temperature"^^xsd:string
]
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#kelvin> ;
sp:subject
[ sp:varName "temperature"^^xsd:string
sp:variable
[ sp:varName "temperatureValue"^^xsd:string
]
] [ sp:object
[ sp:varName "pressureValue"^^xsd:string
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "pressure"^^xsd:string
]
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#pascal> ;
sp:subject
[ sp:varName "pressure"^^xsd:string
sp:variable
[ sp:varName "pressureValue"^^xsd:string
]
] [ sp:object
[ sp:varName "densityValue"^^xsd:string
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
sp:arg1 [ sp:varName "density"^^xsd:string
]
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#kilogram_m-3> ;
sp:subject
[ sp:varName "density"^^xsd:string
sp:variable
[ sp:varName "densityValue"^^xsd:string
]
])
])
......