David Price

Working dpr2

...@@ -35,16 +35,14 @@ ...@@ -35,16 +35,14 @@
35 sp:subject spin:_arg1 35 sp:subject spin:_arg1
36 ]) ; 36 ]) ;
37 sp:graphNameNode <http://www.reportinghub.no/data/erh> 37 sp:graphNameNode <http://www.reportinghub.no/data/erh>
38 - ] [ rdf:type sp:TriplePath ; 38 + ] [ rdf:type sp:Bind ;
39 - sp:object 39 + sp:expression
40 - [ sp:varName "name"^^xsd:string 40 + [ rdf:type ep-spin-lib:selectNPDorERHorEPName ;
41 - ] ; 41 + sp:arg1 [ sp:varName "productionFlowFacility"^^xsd:string
42 - sp:path [ rdf:type sp:AltPath ; 42 + ]
43 - sp:path1 <http://www.reportinghub.no/np/schema/npd#name> ;
44 - sp:path2 <http://www.reportinghub.no/ep/schema/core#name>
45 ] ; 43 ] ;
46 - sp:subject 44 + sp:variable
47 - [ sp:varName "productionFlowFacility"^^xsd:string 45 + [ sp:varName "name"^^xsd:string
48 ] 46 ]
49 ]) 47 ])
50 ] ; 48 ] ;
...@@ -82,13 +80,16 @@ ...@@ -82,13 +80,16 @@
82 sp:subject 80 sp:subject
83 [ sp:varName "facilityPart"^^xsd:string 81 [ sp:varName "facilityPart"^^xsd:string
84 ] 82 ]
85 - ] [ sp:object 83 + ] [ rdf:type sp:NamedGraph ;
84 + sp:elements ([ sp:object
86 [ sp:varName "facilityWholeName"^^xsd:string 85 [ sp:varName "facilityWholeName"^^xsd:string
87 ] ; 86 ] ;
88 sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ; 87 sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
89 sp:subject 88 sp:subject
90 [ sp:varName "facilityWhole"^^xsd:string 89 [ sp:varName "facilityWhole"^^xsd:string
91 ] 90 ]
91 + ]) ;
92 + sp:graphNameNode <http://www.reportinghub.no/np/data/npd>
92 ]) 93 ])
93 ] ; 94 ] ;
94 spin:constraint 95 spin:constraint
......
...@@ -78,8 +78,8 @@ WHERE { ...@@ -78,8 +78,8 @@ WHERE {
78 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionOperationMarineShip" /> 78 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionOperationMarineShip" />
79 79
80 80
81 - 81 + <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionFlows" />
82 - <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionVolumes" /> 82 +<dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductionVolumes" />
83 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductFlows" /> 83 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:ProductFlows" />
84 84
85 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:InjectionVolumes" /> 85 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:InjectionVolumes" />
......
1 +# baseURI: http://www.reportinghub.no/test/dpr2/testcase/epim-dpr2/PL147/test-results/TRYM_DAY_2012-02-28_final-dpr2-importedfacts.ttl
2 +# imports: http://www.reportinghub.no/data/erh
3 +# imports: http://www.reportinghub.no/np/data/npd
4 +# imports: http://www.reportinghub.no/test/dpr2/testcase/epim-dpr2/PL147/test-results/TRYM_DAY_2012-02-28_final-dpr2
5 +
6 +@prefix TRYM_DAY_2012-02-28_final-dpr2-importedfacts: <http://www.reportinghub.no/test/dpr2/testcase/epim-dpr2/PL147/test-results/TRYM_DAY_2012-02-28_final-dpr2-importedfacts.ttl#> .
7 +@prefix owl: <http://www.w3.org/2002/07/owl#> .
8 +@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
9 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
10 +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
11 +
12 +<http://www.reportinghub.no/test/dpr2/testcase/epim-dpr2/PL147/test-results/TRYM_DAY_2012-02-28_final-dpr2-importedfacts.ttl>
13 + rdf:type owl:Ontology ;
14 + owl:imports <http://www.reportinghub.no/data/erh> , <http://www.reportinghub.no/np/data/npd> , <http://www.reportinghub.no/test/dpr2/testcase/epim-dpr2/PL147/test-results/TRYM_DAY_2012-02-28_final-dpr2> ;
15 + owl:versionInfo "Created with TopBraid Composer"^^xsd:string .