David Price

Continue work on graphs

...@@ -930,15 +930,17 @@ mpr-tables:GasSales ...@@ -930,15 +930,17 @@ mpr-tables:GasSales
930 sp:subject 930 sp:subject
931 [ sp:varName "productionFlowWhole"^^xsd:string 931 [ sp:varName "productionFlowWhole"^^xsd:string
932 ] 932 ]
933 - ] [ sp:object
934 - [ sp:varName "facilityName"^^xsd:string
935 - ] ;
936 - sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
937 - sp:subject
938 - [ sp:varName "productionFlowFacility"^^xsd:string
939 - ]
940 ]) ; 933 ]) ;
941 sp:graphNameNode <http://www.reportinghub.no/data/erh> 934 sp:graphNameNode <http://www.reportinghub.no/data/erh>
935 + ] [ rdf:type sp:Bind ;
936 + sp:expression
937 + [ rdf:type ep-spin-lib:selectNPDorERHorEPName ;
938 + sp:arg1 [ sp:varName "productionFlowFacility"^^xsd:string
939 + ]
940 + ] ;
941 + sp:variable
942 + [ sp:varName "facilityName"^^xsd:string
943 + ]
942 ] [ sp:object 944 ] [ sp:object
943 [ sp:varName "productFlowMonth"^^xsd:string 945 [ sp:varName "productFlowMonth"^^xsd:string
944 ] ; 946 ] ;
...@@ -1059,16 +1061,14 @@ mpr-tables:GasSales ...@@ -1059,16 +1061,14 @@ mpr-tables:GasSales
1059 sp:subject 1061 sp:subject
1060 [ sp:varName "ownerPart"^^xsd:string 1062 [ sp:varName "ownerPart"^^xsd:string
1061 ] 1063 ]
1062 - ] [ rdf:type sp:TriplePath ; 1064 + ] [ rdf:type sp:Bind ;
1063 - sp:object 1065 + sp:expression
1064 - [ sp:varName "sellerName"^^xsd:string 1066 + [ rdf:type ep-spin-lib:selectNPDorERHorEPName ;
1065 - ] ; 1067 + sp:arg1 [ sp:varName "owner"^^xsd:string
1066 - sp:path [ rdf:type sp:AltPath ; 1068 + ]
1067 - sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
1068 - sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
1069 ] ; 1069 ] ;
1070 - sp:subject 1070 + sp:variable
1071 - [ sp:varName "owner"^^xsd:string 1071 + [ sp:varName "sellerName"^^xsd:string
1072 ] 1072 ]
1073 ] [ sp:object 1073 ] [ sp:object
1074 [ sp:varName "buyerEnergyQuantity"^^xsd:string 1074 [ sp:varName "buyerEnergyQuantity"^^xsd:string
...@@ -1163,16 +1163,14 @@ mpr-tables:GasSales ...@@ -1163,16 +1163,14 @@ mpr-tables:GasSales
1163 sp:subject 1163 sp:subject
1164 [ sp:varName "buyerPart"^^xsd:string 1164 [ sp:varName "buyerPart"^^xsd:string
1165 ] 1165 ]
1166 - ] [ rdf:type sp:TriplePath ; 1166 + ] [ rdf:type sp:Bind ;
1167 - sp:object 1167 + sp:expression
1168 - [ sp:varName "buyerName"^^xsd:string 1168 + [ rdf:type ep-spin-lib:selectNPDorERHorEPName ;
1169 - ] ; 1169 + sp:arg1 [ sp:varName "buyer"^^xsd:string
1170 - sp:path [ rdf:type sp:AltPath ; 1170 + ]
1171 - sp:path1 <http://www.reportinghub.no/ep/schema/core#name> ;
1172 - sp:path2 <http://www.reportinghub.no/np/schema/npd#name>
1173 ] ; 1171 ] ;
1174 - sp:subject 1172 + sp:variable
1175 - [ sp:varName "buyer"^^xsd:string 1173 + [ sp:varName "buyerName"^^xsd:string
1176 ] 1174 ]
1177 ]) 1175 ])
1178 ] [ rdf:type sp:Optional ; 1176 ] [ rdf:type sp:Optional ;
...@@ -1216,6 +1214,8 @@ mpr-tables:GasSales ...@@ -1216,6 +1214,8 @@ mpr-tables:GasSales
1216 sp:subject 1214 sp:subject
1217 [ sp:varName "productionFlowWhole"^^xsd:string 1215 [ sp:varName "productionFlowWhole"^^xsd:string
1218 ] 1216 ]
1217 + ]) ;
1218 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
1219 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ; 1219 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowPurposeType> ;
1220 sp:predicate rdf:type ; 1220 sp:predicate rdf:type ;
1221 sp:subject 1221 sp:subject
...@@ -1228,8 +1228,6 @@ mpr-tables:GasSales ...@@ -1228,8 +1228,6 @@ mpr-tables:GasSales
1228 sp:subject 1228 sp:subject
1229 [ sp:varName "productionFlowPurposeType"^^xsd:string 1229 [ sp:varName "productionFlowPurposeType"^^xsd:string
1230 ] 1230 ]
1231 - ]) ;
1232 - sp:graphNameNode <http://www.reportinghub.no/data/erh>
1233 ]) 1231 ])
1234 ] [ rdf:type sp:Optional ; 1232 ] [ rdf:type sp:Optional ;
1235 sp:elements ([ rdf:type sp:NamedGraph ; 1233 sp:elements ([ rdf:type sp:NamedGraph ;
...@@ -1240,6 +1238,8 @@ mpr-tables:GasSales ...@@ -1240,6 +1238,8 @@ mpr-tables:GasSales
1240 sp:subject 1238 sp:subject
1241 [ sp:varName "productionFlowWhole"^^xsd:string 1239 [ sp:varName "productionFlowWhole"^^xsd:string
1242 ] 1240 ]
1241 + ]) ;
1242 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
1243 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ; 1243 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
1244 sp:predicate rdf:type ; 1244 sp:predicate rdf:type ;
1245 sp:subject 1245 sp:subject
...@@ -1252,8 +1252,6 @@ mpr-tables:GasSales ...@@ -1252,8 +1252,6 @@ mpr-tables:GasSales
1252 sp:subject 1252 sp:subject
1253 [ sp:varName "productionFlowDefinitionType"^^xsd:string 1253 [ sp:varName "productionFlowDefinitionType"^^xsd:string
1254 ] 1254 ]
1255 - ]) ;
1256 - sp:graphNameNode <http://www.reportinghub.no/data/erh>
1257 ]) 1255 ])
1258 ]) 1256 ])
1259 ]) 1257 ])
......
...@@ -3376,6 +3376,76 @@ ep-spin-lib:selectMudClass ...@@ -3376,6 +3376,76 @@ ep-spin-lib:selectMudClass
3376 ]) 3376 ])
3377 ] . 3377 ] .
3378 3378
3379 +ep-spin-lib:selectNPDorERHorEPName
3380 + rdf:type spin:Function ;
3381 + rdfs:label "select npd:name, erh:name or ep-core:name"^^xsd:string ;
3382 + rdfs:subClassOf ep-spin-lib:Function ;
3383 + spin:body
3384 + [ rdf:type sp:Select ;
3385 + sp:resultVariables ([ sp:varName "name"^^xsd:string
3386 + ]) ;
3387 + sp:where ([ rdf:type sp:NamedGraph ;
3388 + sp:elements ([ rdf:type sp:Optional ;
3389 + sp:elements ([ sp:object
3390 + [ sp:varName "namenpd"^^xsd:string
3391 + ] ;
3392 + sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
3393 + sp:subject spin:_arg1
3394 + ])
3395 + ]) ;
3396 + sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
3397 + ] [ rdf:type sp:NamedGraph ;
3398 + sp:elements ([ rdf:type sp:Optional ;
3399 + sp:elements ([ sp:object
3400 + [ sp:varName "nameerh"^^xsd:string
3401 + ] ;
3402 + sp:predicate <http://www.reportinghub.no/ep/schema/erhfacts#name> ;
3403 + sp:subject spin:_arg1
3404 + ])
3405 + ]) ;
3406 + sp:graphNameNode <http://www.reportinghub.no/data/erh>
3407 + ] [ rdf:type sp:Optional ;
3408 + sp:elements ([ sp:object
3409 + [ sp:varName "nameep"^^xsd:string
3410 + ] ;
3411 + sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
3412 + sp:subject spin:_arg1
3413 + ])
3414 + ] [ rdf:type sp:Bind ;
3415 + sp:expression
3416 + [ rdf:type sp:if ;
3417 + sp:arg1 [ rdf:type sp:bound ;
3418 + sp:arg1 [ sp:varName "namenpd"^^xsd:string
3419 + ]
3420 + ] ;
3421 + sp:arg2 [ sp:varName "namenpd"^^xsd:string
3422 + ] ;
3423 + sp:arg3 [ rdf:type sp:if ;
3424 + sp:arg1 [ rdf:type sp:bound ;
3425 + sp:arg1 [ sp:varName "nameerh"^^xsd:string
3426 + ]
3427 + ] ;
3428 + sp:arg2 [ sp:varName "nameerh"^^xsd:string
3429 + ] ;
3430 + sp:arg3 [ rdf:type sp:if ;
3431 + sp:arg1 [ rdf:type sp:bound ;
3432 + sp:arg1 [ sp:varName "namereport"^^xsd:string
3433 + ]
3434 + ] ;
3435 + sp:arg2 [ sp:varName "namereport"^^xsd:string
3436 + ] ;
3437 + sp:arg3 [ sp:varName "namereport"^^xsd:string
3438 + ]
3439 + ]
3440 + ]
3441 + ] ;
3442 + sp:variable
3443 + [ sp:varName "name"^^xsd:string
3444 + ]
3445 + ])
3446 + ] ;
3447 + spin:returnType xsd:string .
3448 +
3379 ep-spin-lib:selectPlaneAngleScale 3449 ep-spin-lib:selectPlaneAngleScale
3380 rdf:type spin:Function ; 3450 rdf:type spin:Function ;
3381 rdfs:label "select plane angle scale"^^xsd:string ; 3451 rdfs:label "select plane angle scale"^^xsd:string ;
...@@ -4710,68 +4780,68 @@ _:b33 ...@@ -4710,68 +4780,68 @@ _:b33
4710 _:b57 4780 _:b57
4711 sp:varName "temperatureScale"^^xsd:string . 4781 sp:varName "temperatureScale"^^xsd:string .
4712 4782
4713 -_:b5 sp:varName "uri"^^xsd:string . 4783 +_:b17
4714 -
4715 -_:b11
4716 sp:varName "uri"^^xsd:string . 4784 sp:varName "uri"^^xsd:string .
4717 4785
4718 _:b23 4786 _:b23
4719 sp:varName "uri"^^xsd:string . 4787 sp:varName "uri"^^xsd:string .
4720 4788
4721 -_:b2 sp:varName "uri"^^xsd:string .
4722 -
4723 -_:b1 sp:varName "uri"^^xsd:string .
4724 -
4725 _:b12 4789 _:b12
4726 sp:varName "uri"^^xsd:string . 4790 sp:varName "uri"^^xsd:string .
4727 4791
4728 -_:b9 sp:varName "uri"^^xsd:string . 4792 +_:b15
4729 -
4730 -_:b17
4731 sp:varName "uri"^^xsd:string . 4793 sp:varName "uri"^^xsd:string .
4732 4794
4733 -_:b20 4795 +_:b13
4734 sp:varName "uri"^^xsd:string . 4796 sp:varName "uri"^^xsd:string .
4735 4797
4736 -_:b19 4798 +_:b5 sp:varName "uri"^^xsd:string .
4737 - sp:varName "uri"^^xsd:string .
4738 4799
4739 -_:b18 4800 +_:b8 sp:varName "uri"^^xsd:string .
4801 +
4802 +_:b16
4740 sp:varName "uri"^^xsd:string . 4803 sp:varName "uri"^^xsd:string .
4741 4804
4742 -_:b13 4805 +_:b22
4743 sp:varName "uri"^^xsd:string . 4806 sp:varName "uri"^^xsd:string .
4744 4807
4745 -_:b21 4808 +_:b14
4746 sp:varName "uri"^^xsd:string . 4809 sp:varName "uri"^^xsd:string .
4747 4810
4811 +_:b9 sp:varName "uri"^^xsd:string .
4812 +
4748 _:b10 4813 _:b10
4749 sp:varName "uri"^^xsd:string . 4814 sp:varName "uri"^^xsd:string .
4750 4815
4751 -_:b3 sp:varName "uri"^^xsd:string . 4816 +_:b4 sp:varName "uri"^^xsd:string .
4752 -
4753 -_:b6 sp:varName "uri"^^xsd:string .
4754 4817
4755 _:b7 sp:varName "uri"^^xsd:string . 4818 _:b7 sp:varName "uri"^^xsd:string .
4756 4819
4757 -_:b4 sp:varName "uri"^^xsd:string . 4820 +_:b18
4821 + sp:varName "uri"^^xsd:string .
4758 4822
4759 -_:b14 4823 +_:b21
4760 sp:varName "uri"^^xsd:string . 4824 sp:varName "uri"^^xsd:string .
4761 4825
4762 _:b24 4826 _:b24
4763 sp:varName "uri"^^xsd:string . 4827 sp:varName "uri"^^xsd:string .
4764 4828
4765 -_:b16 4829 +_:b2 sp:varName "uri"^^xsd:string .
4766 - sp:varName "uri"^^xsd:string .
4767 4830
4768 -_:b22 4831 +_:b19
4769 sp:varName "uri"^^xsd:string . 4832 sp:varName "uri"^^xsd:string .
4770 4833
4771 -_:b15 4834 +_:b20
4772 sp:varName "uri"^^xsd:string . 4835 sp:varName "uri"^^xsd:string .
4773 4836
4774 -_:b8 sp:varName "uri"^^xsd:string . 4837 +_:b1 sp:varName "uri"^^xsd:string .
4838 +
4839 +_:b6 sp:varName "uri"^^xsd:string .
4840 +
4841 +_:b3 sp:varName "uri"^^xsd:string .
4842 +
4843 +_:b11
4844 + sp:varName "uri"^^xsd:string .
4775 4845
4776 _:b59 4846 _:b59
4777 sp:varName "volumeScale"^^xsd:string . 4847 sp:varName "volumeScale"^^xsd:string .
......
...@@ -819,7 +819,7 @@ Nothing is done with the namingSystem!"""^^xsd:string ; ...@@ -819,7 +819,7 @@ Nothing is done with the namingSystem!"""^^xsd:string ;
819 [ sp:varName "field"^^xsd:string 819 [ sp:varName "field"^^xsd:string
820 ] 820 ]
821 ]) ; 821 ]) ;
822 - sp:graphNameNode <http://www.reportinghub.no/data/npd> 822 + sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
823 ] [ sp:object 823 ] [ sp:object
824 [ sp:varName "facilityRef"^^xsd:string 824 [ sp:varName "facilityRef"^^xsd:string
825 ] ; 825 ] ;
...@@ -1639,7 +1639,7 @@ Nothing is done with the namingSystem!"""^^xsd:string ; ...@@ -1639,7 +1639,7 @@ Nothing is done with the namingSystem!"""^^xsd:string ;
1639 [ sp:varName "field"^^xsd:string 1639 [ sp:varName "field"^^xsd:string
1640 ] 1640 ]
1641 ]) ; 1641 ]) ;
1642 - sp:graphNameNode <http://www.reportinghub.no/data/npd> 1642 + sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
1643 ] [ sp:object 1643 ] [ sp:object
1644 [ sp:varName "facilityRef"^^xsd:string 1644 [ sp:varName "facilityRef"^^xsd:string
1645 ] ; 1645 ] ;
......
This diff is collapsed. Click to expand it.
1 +# baseURI: http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest-NoNPDFacts
2 +# imports: http://spinrdf.org/spin
3 +# imports: http://www.epim.no/schemas/mprml/1
4 +# imports: http://www.reportinghub.no/data/erh
5 +# imports: http://www.reportinghub.no/ep/spin/prod-property
6 +# imports: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector
7 +
8 +@prefix : <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest-NoNPDFacts#> .
9 +@prefix TRANSFORM_mpr-collector: <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector#> .
10 +@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#> .
11 +@prefix owl: <http://www.w3.org/2002/07/owl#> .
12 +@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
13 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
14 +@prefix sp: <http://spinrdf.org/sp#> .
15 +@prefix spin: <http://spinrdf.org/spin#> .
16 +@prefix spl: <http://spinrdf.org/spl#> .
17 +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
18 +
19 +<http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest-NoNPDFacts>
20 + rdf:type owl:Ontology ;
21 + 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> ;
22 + owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
1 +# baseURI: null
2 +
3 +@prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
4 +@prefix forms: <http://www.topbraid.org/2007/01/forms.owl#> .
5 +@prefix inference: <http://www.topbraid.org/2007/06/inference.owl#> .
6 +@prefix owl: <http://www.w3.org/2002/07/owl#> .
7 +@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
8 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
9 +@prefix visual: <http://topbraid.org/visual#> .
10 +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
11 +
12 +[] rdf:type inference:Configuration ;
13 + composite:child
14 + [ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
15 + <http://spinrdf.org/spin#topSPINOptions>
16 + "singlePass" ;
17 + composite:index "0"^^xsd:int
18 + ] .
1 +# 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
2 +
3 +@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#> .
4 +@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
5 +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
6 +
7 +<http://www.reportinghub.no/test/mpr/testcase/epim-mpr-govt/PL147/test-results/triples/TRYM-MONTH_2012-02-01_final-mprg-gassale-NoFacts.ttl>
8 + rdf:type <http://www.w3.org/2002/07/owl#Ontology> ;
9 + <http://www.w3.org/2002/07/owl#versionInfo>
10 + "Created with TopBraid Composer"^^xsd:string .