Bob DuCharme

Merge branch 'bob-oct31'

...@@ -252,6 +252,7 @@ dpr-tables:FluidSampleAnalysisResults ...@@ -252,6 +252,7 @@ dpr-tables:FluidSampleAnalysisResults
252 rdfs:subClassOf rhspin:DPRTableTemplates ; 252 rdfs:subClassOf rhspin:DPRTableTemplates ;
253 spin:body 253 spin:body
254 [ rdf:type sp:Select ; 254 [ rdf:type sp:Select ;
255 + sp:distinct "true"^^xsd:boolean ;
255 sp:orderBy ([ sp:varName "sampledFluidName"^^xsd:string 256 sp:orderBy ([ sp:varName "sampledFluidName"^^xsd:string
256 ]) ; 257 ]) ;
257 sp:resultVariables ([ sp:varName "sampledFluidName"^^xsd:string 258 sp:resultVariables ([ sp:varName "sampledFluidName"^^xsd:string
...@@ -347,6 +348,63 @@ dpr-tables:FluidSampleAnalysisResults ...@@ -347,6 +348,63 @@ dpr-tables:FluidSampleAnalysisResults
347 sp:subject 348 sp:subject
348 [ sp:varName "componentType"^^xsd:string 349 [ sp:varName "componentType"^^xsd:string
349 ] 350 ]
351 + ] [ sp:object
352 + [ sp:varName "firstOfPair"^^xsd:string
353 + ] ;
354 + sp:predicate rdf:type ;
355 + sp:subject
356 + [ sp:varName "component"^^xsd:string
357 + ]
358 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#MolePair> ;
359 + sp:predicate rdf:type ;
360 + sp:subject
361 + [ sp:varName "molePair"^^xsd:string
362 + ]
363 + ] [ sp:object
364 + [ sp:varName "firstOfPair"^^xsd:string
365 + ] ;
366 + sp:predicate <http://www.reportinghub.no/ep/schema/core#firstOfPair> ;
367 + sp:subject
368 + [ sp:varName "molePair"^^xsd:string
369 + ]
370 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mole> ;
371 + sp:predicate rdf:type ;
372 + sp:subject
373 + [ sp:varName "firstOfPair"^^xsd:string
374 + ]
375 + ] [ sp:object
376 + [ sp:varName "secondOfPair"^^xsd:string
377 + ] ;
378 + sp:predicate <http://www.reportinghub.no/ep/schema/core#secondOfPair> ;
379 + sp:subject
380 + [ sp:varName "molePair"^^xsd:string
381 + ]
382 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mole> ;
383 + sp:predicate rdf:type ;
384 + sp:subject
385 + [ sp:varName "secondOfPair"^^xsd:string
386 + ]
387 + ] [ sp:object
388 + [ sp:varName "ratio"^^xsd:string
389 + ] ;
390 + sp:predicate <http://www.reportinghub.no/ep/schema/core#divide> ;
391 + sp:subject
392 + [ sp:varName "molePair"^^xsd:string
393 + ]
394 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Ratio> ;
395 + sp:predicate rdf:type ;
396 + sp:subject
397 + [ sp:varName "ratio"^^xsd:string
398 + ]
399 + ] [ rdf:type sp:Bind ;
400 + sp:expression
401 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
402 + sp:arg1 [ sp:varName "ratio"^^xsd:string
403 + ]
404 + ] ;
405 + sp:variable
406 + [ sp:varName "moleRatioPercent"^^xsd:string
407 + ]
350 ] [ rdf:type sp:Optional ; 408 ] [ rdf:type sp:Optional ;
351 sp:elements ([ sp:object 409 sp:elements ([ sp:object
352 [ sp:varName "component"^^xsd:string 410 [ sp:varName "component"^^xsd:string
...@@ -373,24 +431,6 @@ dpr-tables:FluidSampleAnalysisResults ...@@ -373,24 +431,6 @@ dpr-tables:FluidSampleAnalysisResults
373 [ sp:varName "massRatioPercent"^^xsd:string 431 [ sp:varName "massRatioPercent"^^xsd:string
374 ] 432 ]
375 ]) 433 ])
376 - ] [ rdf:type sp:Optional ;
377 - sp:elements ([ sp:object
378 - [ sp:varName "moleRatio"^^xsd:string
379 - ] ;
380 - sp:predicate <http://www.reportinghub.no/ep/schema/material#moleRatio> ;
381 - sp:subject
382 - [ sp:varName "materialPair"^^xsd:string
383 - ]
384 - ] [ rdf:type sp:Bind ;
385 - sp:expression
386 - [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
387 - sp:arg1 [ sp:varName "moleRatio"^^xsd:string
388 - ]
389 - ] ;
390 - sp:variable
391 - [ sp:varName "moleRatioPercent"^^xsd:string
392 - ]
393 - ])
394 ]) 434 ])
395 ] [ rdf:type sp:Optional ; 435 ] [ rdf:type sp:Optional ;
396 sp:elements ([ sp:object 436 sp:elements ([ sp:object
......