data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
8274703b 1 parent b4dfff53

Added updated DPR2 test files, improved PDF a bit.

Inline Side-by-side
Showing 8 changed files with 39 additions and 15 deletions
...@@ -1544,7 +1544,8 @@ ep-core:inchUS ...@@ -1544,7 +1544,8 @@ ep-core:inchUS
1544 ep-core:inch_64 1544 ep-core:inch_64
1545 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 1545 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
1546 rdfs:domain ep-core:Length ; 1546 rdfs:domain ep-core:Length ;
1547 - rdfs:label "inch/64"^^xsd:string . 1547 + rdfs:label "inch/64"^^xsd:string ;
1548 + ep-core:unitSymbol "in/64"^^xsd:string .
1548 1549
1549 ep-core:j_cm-2 1550 ep-core:j_cm-2
1550 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 1551 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
...@@ -3223,7 +3224,8 @@ ep-core:sixteenth_inch ...@@ -3223,7 +3224,8 @@ ep-core:sixteenth_inch
3223 ep-core:sixtyFourth_Inch 3224 ep-core:sixtyFourth_Inch
3224 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 3225 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
3225 rdfs:domain ep-core:Length ; 3226 rdfs:domain ep-core:Length ;
3226 - rdfs:label "Sixty-Fourth of an Inch"^^xsd:string . 3227 + rdfs:label "Sixty-Fourth of an Inch"^^xsd:string ;
3228 + ep-core:unitSymbol "in/64"^^xsd:string .
3227 3229
3228 ep-core:sm3_sm-3 3230 ep-core:sm3_sm-3
3229 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 3231 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
......
...@@ -3976,12 +3976,14 @@ dpr-tables:WellInjectionTest ...@@ -3976,12 +3976,14 @@ dpr-tables:WellInjectionTest
3976 sp:subject 3976 sp:subject
3977 [ sp:varName "wellTestChoke"^^xsd:string 3977 [ sp:varName "wellTestChoke"^^xsd:string
3978 ] 3978 ]
3979 - ] [ sp:object 3979 + ] [ rdf:type sp:Bind ;
3980 - [ sp:varName "chokeOrificeSizeValue"^^xsd:string 3980 + sp:expression
3981 + [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ;
3982 + sp:arg1 [ sp:varName "chokeOrificeSize"^^xsd:string
3983 + ]
3981 ] ; 3984 ] ;
3982 - sp:predicate <http://www.reportinghub.no/ep/schema/core#sixtyFourth_Inch> ; 3985 + sp:variable
3983 - sp:subject 3986 + [ sp:varName "chokeOrificeSizeValue"^^xsd:string
3984 - [ sp:varName "chokeOrificeSize"^^xsd:string
3985 ] 3987 ]
3986 ]) 3988 ])
3987 ] [ rdf:type sp:Optional ; 3989 ] [ rdf:type sp:Optional ;
...@@ -4025,8 +4027,7 @@ Pressure"""^^xsd:string """Wellhead ...@@ -4025,8 +4027,7 @@ Pressure"""^^xsd:string """Wellhead
4025 Flowing 4027 Flowing
4026 Pressure"""^^xsd:string """Wellhead 4028 Pressure"""^^xsd:string """Wellhead
4027 Max 4029 Max
4028 -Pressure"""^^xsd:string """Choke 4030 +Pressure"""^^xsd:string "Choke"^^xsd:string) .
4029 -64 inch"""^^xsd:string) .
4030 4031
4031 dpr-tables:WellInjectionTestResults 4032 dpr-tables:WellInjectionTestResults
4032 rdf:type rhspin:TableTemplate ; 4033 rdf:type rhspin:TableTemplate ;
......
...@@ -25,9 +25,13 @@ WHERE { ...@@ -25,9 +25,13 @@ WHERE {
25 } }</h2> 25 } }</h2>
26 26
27 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:PersonnelInformation" /> 27 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:PersonnelInformation" />
28 +
29 +
30 +
31 +
28 32
29 <table> 33 <table>
30 - <tr><th>Facility</th><th>Total Beds Available</th></tr> 34 +
31 <ui:forEach ui:resultSet="{# SELECT ?facilityName ?beds 35 <ui:forEach ui:resultSet="{# SELECT ?facilityName ?beds
32 WHERE { 36 WHERE {
33 ?report a ep-report:ProductionReport . 37 ?report a ep-report:ProductionReport .
...@@ -44,9 +48,12 @@ WHERE { ...@@ -44,9 +48,12 @@ WHERE {
44 } 48 }
45 49
46 }" > 50 }" >
47 - <tr><td>{= ?facilityName }</td><td>{= ?beds}</td></tr> 51 + <tr><td>{= ?facilityName }</td><td>{= ?beds}</td><td>Total Beds Available</td></tr>
48 </ui:forEach> 52 </ui:forEach>
49 </table> 53 </table>
54 +
55 +
56 +
50 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:HSEInformation" /> 57 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:HSEInformation" />
51 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:SafetyInformation" /> 58 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:SafetyInformation" />
52 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:OperationInformation" /> 59 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:OperationInformation" />
...@@ -80,12 +87,20 @@ WHERE { ...@@ -80,12 +87,20 @@ WHERE {
80 87
81 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellTest" /> 88 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellTest" />
82 <hr /> 89 <hr />
83 - <h2>Well Injection Test Information</h2> 90 +
91 +
92 + <h2>Well Injection Test Information</h2>
93 +
84 94
85 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInjectionTest" /> 95 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInjectionTest" />
86 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInjectionTestResults" /> 96 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellInjectionTestResults" />
87 97
88 - <h2>Well Fluid Level Test Information</h2> 98 +
99 + <h2>Well Fluid Level Test Information</h2>
100 +
101 +
102 +
103 +
89 104
90 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellFluidLevelTest" /> 105 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellFluidLevelTest" />
91 106
...@@ -95,7 +110,14 @@ WHERE { ...@@ -95,7 +110,14 @@ WHERE {
95 110
96 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellProductionTestResults" /> 111 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:WellProductionTestResults" />
97 112
98 - <h2>Fluid Sample Information</h2> 113 + <ui:if ui:condition="{# ASK WHERE {
114 + ?report a ep-report:ProductionReport .
115 + ?fluidSampleReport ep-core:partOf ?report .
116 + ?fluidSampleReport a ep-report:FluidSampleReport . } }">
117 + <h2>Fluid Sample Information</h2>
118 + </ui:if>
119 +
120 +
99 121
100 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:FluidSamples" /> 122 <dprswp:Table arg:report="{= ?report }" arg:template="dpr-tables:FluidSamples" />
101 123
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
7 <DocumentDate>2012-03-04T00:00:00.0Z</DocumentDate> 7 <DocumentDate>2012-03-04T00:00:00.0Z</DocumentDate>
8 <documentClass namingSystem="EC">Dong E&amp;P Norge AS</documentClass> 8 <documentClass namingSystem="EC">Dong E&amp;P Norge AS</documentClass>
9 <documentClass namingSystem="EC">DPR 2.0</documentClass> 9 <documentClass namingSystem="EC">DPR 2.0</documentClass>
10 - <documentClass namingSystem="ERH">dpr2</documentClass>
11 <FileCreationInformation> 10 <FileCreationInformation>
12 11
13 <FileCreationDate>2012-03-14T00:00:00.0Z</FileCreationDate> 12 <FileCreationDate>2012-03-14T00:00:00.0Z</FileCreationDate>
......