David Price

Merge branch 'trygraph'

......@@ -930,15 +930,17 @@ mpr-tables:GasSales
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
] [ sp:object
[ sp:varName "facilityName"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
sp:subject
[ sp:varName "productionFlowFacility"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:selectNPDorERHorEPName ;
sp:arg1 [ sp:varName "productionFlowFacility"^^xsd:string
]
] ;
sp:variable
[ sp:varName "facilityName"^^xsd:string
]
] [ sp:object
[ sp:varName "productFlowMonth"^^xsd:string
] ;
......@@ -1059,16 +1061,14 @@ mpr-tables:GasSales
sp:subject
[ sp:varName "ownerPart"^^xsd:string
]
] [ rdf:type sp:TriplePath ;
sp:object
[ sp:varName "sellerName"^^xsd:string
] ;
sp:path [ rdf:type sp:AltPath ;
sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:selectNPDorERHorEPName ;
sp:arg1 [ sp:varName "owner"^^xsd:string
]
] ;
sp:subject
[ sp:varName "owner"^^xsd:string
sp:variable
[ sp:varName "sellerName"^^xsd:string
]
] [ sp:object
[ sp:varName "buyerEnergyQuantity"^^xsd:string
......@@ -1163,16 +1163,14 @@ mpr-tables:GasSales
sp:subject
[ sp:varName "buyerPart"^^xsd:string
]
] [ rdf:type sp:TriplePath ;
sp:object
[ sp:varName "buyerName"^^xsd:string
] ;
sp:path [ rdf:type sp:AltPath ;
sp:path1 <http://www.reportinghub.no/ep/schema/core#name> ;
sp:path2 <http://www.reportinghub.no/np/schema/npd#name>
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type ep-spin-lib:selectNPDorERHorEPName ;
sp:arg1 [ sp:varName "buyer"^^xsd:string
]
] ;
sp:subject
[ sp:varName "buyer"^^xsd:string
sp:variable
[ sp:varName "buyerName"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
......@@ -1216,20 +1214,20 @@ mpr-tables:GasSales
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowPurposeType"^^xsd:string
]
] [ sp:object
[ sp:varName "purposeTypeName"^^xsd:string
] ;
sp:predicate rdfs:label ;
sp:subject
[ sp:varName "productionFlowPurposeType"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowPurposeType"^^xsd:string
]
] [ sp:object
[ sp:varName "purposeTypeName"^^xsd:string
] ;
sp:predicate rdfs:label ;
sp:subject
[ sp:varName "productionFlowPurposeType"^^xsd:string
]
])
] [ rdf:type sp:Optional ;
sp:elements ([ rdf:type sp:NamedGraph ;
......@@ -1240,20 +1238,20 @@ mpr-tables:GasSales
sp:subject
[ sp:varName "productionFlowWhole"^^xsd:string
]
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowDefinitionType"^^xsd:string
]
] [ sp:object
[ sp:varName "definitionTypeName"^^xsd:string
] ;
sp:predicate rdfs:label ;
sp:subject
[ sp:varName "productionFlowDefinitionType"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
sp:predicate rdf:type ;
sp:subject
[ sp:varName "productionFlowDefinitionType"^^xsd:string
]
] [ sp:object
[ sp:varName "definitionTypeName"^^xsd:string
] ;
sp:predicate rdfs:label ;
sp:subject
[ sp:varName "productionFlowDefinitionType"^^xsd:string
]
])
])
])
......
......@@ -3376,6 +3376,76 @@ ep-spin-lib:selectMudClass
])
] .
ep-spin-lib:selectNPDorERHorEPName
rdf:type spin:Function ;
rdfs:label "select npd:name, erh:name or ep-core:name"^^xsd:string ;
rdfs:subClassOf ep-spin-lib:Function ;
spin:body
[ rdf:type sp:Select ;
sp:resultVariables ([ sp:varName "name"^^xsd:string
]) ;
sp:where ([ rdf:type sp:NamedGraph ;
sp:elements ([ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "namenpd"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
sp:subject spin:_arg1
])
]) ;
sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
] [ rdf:type sp:NamedGraph ;
sp:elements ([ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "nameerh"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/erhfacts#name> ;
sp:subject spin:_arg1
])
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/erh>
] [ rdf:type sp:Optional ;
sp:elements ([ sp:object
[ sp:varName "nameep"^^xsd:string
] ;
sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
sp:subject spin:_arg1
])
] [ rdf:type sp:Bind ;
sp:expression
[ rdf:type sp:if ;
sp:arg1 [ rdf:type sp:bound ;
sp:arg1 [ sp:varName "namenpd"^^xsd:string
]
] ;
sp:arg2 [ sp:varName "namenpd"^^xsd:string
] ;
sp:arg3 [ rdf:type sp:if ;
sp:arg1 [ rdf:type sp:bound ;
sp:arg1 [ sp:varName "nameerh"^^xsd:string
]
] ;
sp:arg2 [ sp:varName "nameerh"^^xsd:string
] ;
sp:arg3 [ rdf:type sp:if ;
sp:arg1 [ rdf:type sp:bound ;
sp:arg1 [ sp:varName "namereport"^^xsd:string
]
] ;
sp:arg2 [ sp:varName "namereport"^^xsd:string
] ;
sp:arg3 [ sp:varName "namereport"^^xsd:string
]
]
]
] ;
sp:variable
[ sp:varName "name"^^xsd:string
]
])
] ;
spin:returnType xsd:string .
ep-spin-lib:selectPlaneAngleScale
rdf:type spin:Function ;
rdfs:label "select plane angle scale"^^xsd:string ;
......@@ -4710,68 +4780,68 @@ _:b33
_:b57
sp:varName "temperatureScale"^^xsd:string .
_:b5 sp:varName "uri"^^xsd:string .
_:b11
_:b17
sp:varName "uri"^^xsd:string .
_:b23
sp:varName "uri"^^xsd:string .
_:b2 sp:varName "uri"^^xsd:string .
_:b1 sp:varName "uri"^^xsd:string .
_:b12
sp:varName "uri"^^xsd:string .
_:b9 sp:varName "uri"^^xsd:string .
_:b17
_:b15
sp:varName "uri"^^xsd:string .
_:b20
_:b13
sp:varName "uri"^^xsd:string .
_:b19
sp:varName "uri"^^xsd:string .
_:b5 sp:varName "uri"^^xsd:string .
_:b18
_:b8 sp:varName "uri"^^xsd:string .
_:b16
sp:varName "uri"^^xsd:string .
_:b13
_:b22
sp:varName "uri"^^xsd:string .
_:b21
_:b14
sp:varName "uri"^^xsd:string .
_:b9 sp:varName "uri"^^xsd:string .
_:b10
sp:varName "uri"^^xsd:string .
_:b3 sp:varName "uri"^^xsd:string .
_:b6 sp:varName "uri"^^xsd:string .
_:b4 sp:varName "uri"^^xsd:string .
_:b7 sp:varName "uri"^^xsd:string .
_:b4 sp:varName "uri"^^xsd:string .
_:b18
sp:varName "uri"^^xsd:string .
_:b14
_:b21
sp:varName "uri"^^xsd:string .
_:b24
sp:varName "uri"^^xsd:string .
_:b16
sp:varName "uri"^^xsd:string .
_:b2 sp:varName "uri"^^xsd:string .
_:b22
_:b19
sp:varName "uri"^^xsd:string .
_:b15
_:b20
sp:varName "uri"^^xsd:string .
_:b8 sp:varName "uri"^^xsd:string .
_:b1 sp:varName "uri"^^xsd:string .
_:b6 sp:varName "uri"^^xsd:string .
_:b3 sp:varName "uri"^^xsd:string .
_:b11
sp:varName "uri"^^xsd:string .
_:b59
sp:varName "volumeScale"^^xsd:string .
......
......@@ -819,7 +819,7 @@ Nothing is done with the namingSystem!"""^^xsd:string ;
[ sp:varName "field"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/npd>
sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
] [ sp:object
[ sp:varName "facilityRef"^^xsd:string
] ;
......@@ -1639,7 +1639,7 @@ Nothing is done with the namingSystem!"""^^xsd:string ;
[ sp:varName "field"^^xsd:string
]
]) ;
sp:graphNameNode <http://www.reportinghub.no/data/npd>
sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
] [ sp:object
[ sp:varName "facilityRef"^^xsd:string
] ;
......
This diff is collapsed. Click to expand it.
# baseURI: http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest-NoFacts
# imports: http://spinrdf.org/spin
# imports: http://www.epim.no/schemas/mprml/1
# imports: http://www.reportinghub.no/ep/schema/1.0/erhfacts
# imports: http://www.reportinghub.no/ep/spin/prod-property
# imports: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector
# imports: http://www.reportinghub.no/np/schema/1.0/npd
@prefix : <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest-NoFacts#> .
@prefix TRANSFORM_mpr-collector: <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector#> .
@prefix TRYM-volumes_2011-08-27_final: <file:///EPIM-Ontologies/www.reportinghub.no/test/mpr/testcase/DongEnergy/dpr-mprformat/TRYM-volumes_2011-08-27_final.xml#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix sp: <http://spinrdf.org/sp#> .
@prefix spin: <http://spinrdf.org/spin#> .
@prefix spl: <http://spinrdf.org/spl#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
<http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest-NoFacts>
rdf:type owl:Ontology ;
owl:imports <http://spinrdf.org/spin> , <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/schema/1.0/erhfacts> , <http://www.reportinghub.no/ep/spin/prod-property> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector> , <http://www.reportinghub.no/np/schema/1.0/npd> ;
owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
# baseURI: null
@prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
@prefix forms: <http://www.topbraid.org/2007/01/forms.owl#> .
@prefix inference: <http://www.topbraid.org/2007/06/inference.owl#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix visual: <http://topbraid.org/visual#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
[] rdf:type inference:Configuration ;
composite:child
[ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
<http://spinrdf.org/spin#topSPINOptions>
"singlePass" ;
composite:index "0"^^xsd:int
] .
# baseURI: http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest-NoNPDFacts
# imports: http://spinrdf.org/spin
# imports: http://www.epim.no/schemas/mprml/1
# imports: http://www.reportinghub.no/data/erh
# imports: http://www.reportinghub.no/ep/spin/prod-property
# imports: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector
@prefix : <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest-NoNPDFacts#> .
@prefix TRANSFORM_mpr-collector: <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector#> .
@prefix TRYM-volumes_2011-08-27_final: <file:///EPIM-Ontologies/www.reportinghub.no/test/mpr/testcase/DongEnergy/dpr-mprformat/TRYM-volumes_2011-08-27_final.xml#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix sp: <http://spinrdf.org/sp#> .
@prefix spin: <http://spinrdf.org/spin#> .
@prefix spl: <http://spinrdf.org/spl#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
<http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest-NoNPDFacts>
rdf:type owl:Ontology ;
owl:imports <http://spinrdf.org/spin> , <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/data/erh> , <http://www.reportinghub.no/ep/spin/prod-property> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector> ;
owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
# baseURI: null
@prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
@prefix forms: <http://www.topbraid.org/2007/01/forms.owl#> .
@prefix inference: <http://www.topbraid.org/2007/06/inference.owl#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix visual: <http://topbraid.org/visual#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
[] rdf:type inference:Configuration ;
composite:child
[ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
<http://spinrdf.org/spin#topSPINOptions>
"singlePass" ;
composite:index "0"^^xsd:int
] .
# baseURI: http://www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/PL147/test-results/triples/TRYM-MONTH_2012-02-01_final-mprg-gassale-NoFacts.ttl
@prefix TRYM-MONTH_2012-02-01_final-mprg-gassale-NoFacts: <http://www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/PL147/test-results/triples/TRYM-MONTH_2012-02-01_final-mprg-gassale-NoFacts.ttl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
<http://www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/PL147/test-results/triples/TRYM-MONTH_2012-02-01_final-mprg-gassale-NoFacts.ttl>
rdf:type <http://www.w3.org/2002/07/owl#Ontology> ;
<http://www.w3.org/2002/07/owl#versionInfo>
"Created with TopBraid Composer"^^xsd:string .