David Price

Merge branch 'master' into npd5

This diff could not be displayed because it is too large.
1 # Saved by TopBraid on Tue Sep 20 20:27:24 BST 2011 1 # Saved by TopBraid on Tue Sep 20 20:27:24 BST 2011
2 # baseURI: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-facility-v1.0 2 # baseURI: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-facility-v1.0
3 -# imports: http://www.witsml.org/schemas/131 3 +# imports: http://www.epim.no/schemas/mprml/1
4 # imports: http://spinrdf.org/spin 4 # imports: http://spinrdf.org/spin
5 5
6 @prefix : <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-facility-v1.0#> . 6 @prefix : <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-facility-v1.0#> .
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
14 14
15 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-facility-v1.0> 15 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-facility-v1.0>
16 rdf:type owl:Ontology ; 16 rdf:type owl:Ontology ;
17 - owl:imports <http://www.witsml.org/schemas/131> , <http://spinrdf.org/spin> ; 17 + owl:imports <http://www.epim.no/schemas/mprml/1> , <http://spinrdf.org/spin> ;
18 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 18 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<xsd:schema xmlns:witsml="http://www.witsml.org/schemas/131" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.witsml.org/schemas/131" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.3.1"> 2 +<xsd:schema xmlns:witsml="http://www.epim.no/schemas/mprml/1" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.epim.no/schemas/mprml/1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">
3 <!-- --> 3 <!-- -->
4 <!-- Energistics License Agreement --> 4 <!-- Energistics License Agreement -->
5 <!-- This file is distributed under the Energistics License Agreement at --> 5 <!-- This file is distributed under the Energistics License Agreement at -->
6 <!-- http://www.posc.org/about/license.shtml. --> 6 <!-- http://www.posc.org/about/license.shtml. -->
7 <!-- Use of this file constitutes agreement with the Energistics License Agreement. --> 7 <!-- Use of this file constitutes agreement with the Energistics License Agreement. -->
8 <!-- --> 8 <!-- -->
9 + <!-- change log-->
10 + <!-- 25/10-2011, changed reportVersion tag under context element from beeing a string representation to be specified in the form of 1.0, 1.1,2.0,2.1-->
11 + <!-- 25/10-2011, changed global namespace to be http://www.epim.no/schemas/mprml/1-->
12 + <!-- 25/10-2011, changed version attribute to reflect correct version and name from 1.0.0.0(PRODML) to 1.0(MPRML)-->
13 + <!-- 25/10-2011, added salt to grp_commonPropertiesProductVolume -->
14 +
9 <xsd:attributeGroup name="attgrp_uid"> 15 <xsd:attributeGroup name="attgrp_uid">
10 <xsd:attribute name="uid" type="witsml:uidString" use="optional"> 16 <xsd:attribute name="uid" type="witsml:uidString" use="optional">
11 <xsd:annotation> 17 <xsd:annotation>
...@@ -3697,30 +3703,26 @@ ...@@ -3697,30 +3703,26 @@
3697 <xsd:documentation>The date and time at which the parameter applies. If no time is specified then the value is static.</xsd:documentation> 3703 <xsd:documentation>The date and time at which the parameter applies. If no time is specified then the value is static.</xsd:documentation>
3698 </xsd:annotation> 3704 </xsd:annotation>
3699 </xsd:element> 3705 </xsd:element>
3700 - 3706 + <xsd:element name="dTimStart" type="witsml:timestamp" minOccurs="0">
3701 - <xsd:element name="dTimStart" type="witsml:timestamp" minOccurs="0"> 3707 + <xsd:annotation>
3702 - <xsd:annotation> 3708 + <xsd:documentation>The beginning date and time that the period represents.</xsd:documentation>
3703 - <xsd:documentation>The beginning date and time that the period represents.</xsd:documentation> 3709 + </xsd:annotation>
3704 - </xsd:annotation> 3710 + </xsd:element>
3705 - </xsd:element> 3711 + <xsd:element name="dTimEnd" type="witsml:timestamp" minOccurs="0">
3706 - <xsd:element name="dTimEnd" type="witsml:timestamp" minOccurs="0"> 3712 + <xsd:annotation>
3707 - <xsd:annotation> 3713 + <xsd:documentation>The ending date and time that the period represents.</xsd:documentation>
3708 - <xsd:documentation>The ending date and time that the period represents.</xsd:documentation> 3714 + </xsd:annotation>
3709 - </xsd:annotation> 3715 + </xsd:element>
3710 - </xsd:element> 3716 + <xsd:element name="dateStart" type="witsml:date" minOccurs="0">
3711 - 3717 + <xsd:annotation>
3712 - <xsd:element name="dateStart" type="witsml:date" minOccurs="0"> 3718 + <xsd:documentation>The beginning date that the period represents.</xsd:documentation>
3713 - <xsd:annotation> 3719 + </xsd:annotation>
3714 - <xsd:documentation>The beginning date that the period represents.</xsd:documentation> 3720 + </xsd:element>
3715 - </xsd:annotation> 3721 + <xsd:element name="dateEnd" type="witsml:date" minOccurs="0">
3716 - </xsd:element> 3722 + <xsd:annotation>
3717 - <xsd:element name="dateEnd" type="witsml:date" minOccurs="0"> 3723 + <xsd:documentation>The ending date that the period represents.</xsd:documentation>
3718 - <xsd:annotation> 3724 + </xsd:annotation>
3719 - <xsd:documentation>The ending date that the period represents.</xsd:documentation> 3725 + </xsd:element>
3720 - </xsd:annotation>
3721 - </xsd:element>
3722 -
3723 -
3724 <xsd:choice> 3726 <xsd:choice>
3725 <xsd:element name="measureValue" type="witsml:generalQualifiedMeasure" maxOccurs="unbounded"> 3727 <xsd:element name="measureValue" type="witsml:generalQualifiedMeasure" maxOccurs="unbounded">
3726 <xsd:annotation> 3728 <xsd:annotation>
...@@ -4055,6 +4057,11 @@ ...@@ -4055,6 +4057,11 @@
4055 <xsd:documentation>The density of the fluid, possibly corrected to specific conditions of temperature and pressure.</xsd:documentation> 4057 <xsd:documentation>The density of the fluid, possibly corrected to specific conditions of temperature and pressure.</xsd:documentation>
4056 </xsd:annotation> 4058 </xsd:annotation>
4057 </xsd:element> 4059 </xsd:element>
4060 + <xsd:element name="work" type="witsml:workMeasure" minOccurs="0">
4061 + <xsd:annotation>
4062 + <xsd:documentation>The electrical energy represented by the product.</xsd:documentation>
4063 + </xsd:annotation>
4064 + </xsd:element>
4058 <xsd:element name="balanceDetail" type="witsml:cs_productVolumeSalesDetail" minOccurs="0" maxOccurs="unbounded"> 4065 <xsd:element name="balanceDetail" type="witsml:cs_productVolumeSalesDetail" minOccurs="0" maxOccurs="unbounded">
4059 <xsd:annotation> 4066 <xsd:annotation>
4060 <xsd:documentation>Provides details on the sale.</xsd:documentation> 4067 <xsd:documentation>Provides details on the sale.</xsd:documentation>
...@@ -4203,7 +4210,7 @@ ...@@ -4203,7 +4210,7 @@
4203 <xsd:restriction base="witsml:abstractTypeEnum"> 4210 <xsd:restriction base="witsml:abstractTypeEnum">
4204 <xsd:enumeration value="bill of lading"> 4211 <xsd:enumeration value="bill of lading">
4205 <xsd:annotation> 4212 <xsd:annotation>
4206 - <xsd:documentation>xxxxxxxxxxxx</xsd:documentation> 4213 + <xsd:documentation>The bill of lading date for the cargo involved</xsd:documentation>
4207 </xsd:annotation> 4214 </xsd:annotation>
4208 </xsd:enumeration> 4215 </xsd:enumeration>
4209 <xsd:enumeration value="transaction date"> 4216 <xsd:enumeration value="transaction date">
...@@ -5261,6 +5268,12 @@ ...@@ -5261,6 +5268,12 @@
5261 <xsd:documentation>The basic sediment and water as measured on the previous reporting period (e.g., day).</xsd:documentation> 5268 <xsd:documentation>The basic sediment and water as measured on the previous reporting period (e.g., day).</xsd:documentation>
5262 </xsd:annotation> 5269 </xsd:annotation>
5263 </xsd:element> 5270 </xsd:element>
5271 + <xsd:element name="salt" type="witsml:densityMeasure" minOccurs="0">
5272 + <xsd:annotation>
5273 + <xsd:documentation>Salt content. The product formed by neutralization of an acid and a base. The term is more specifically applied to sodium
5274 + chloride.</xsd:documentation>
5275 + </xsd:annotation>
5276 + </xsd:element>
5264 <xsd:element name="densityValue" type="witsml:cs_densityValue" minOccurs="0"> 5277 <xsd:element name="densityValue" type="witsml:cs_densityValue" minOccurs="0">
5265 <xsd:annotation> 5278 <xsd:annotation>
5266 <xsd:documentation>The density of the fluid, possibly corrected to specific conditions of temperature and pressure.</xsd:documentation> 5279 <xsd:documentation>The density of the fluid, possibly corrected to specific conditions of temperature and pressure.</xsd:documentation>
...@@ -6889,7 +6902,7 @@ ...@@ -6889,7 +6902,7 @@
6889 <xsd:documentation>A textual comment about the report.</xsd:documentation> 6902 <xsd:documentation>A textual comment about the report.</xsd:documentation>
6890 </xsd:annotation> 6903 </xsd:annotation>
6891 </xsd:element> 6904 </xsd:element>
6892 - <xsd:element name="reportVersion" type="witsml:commentString" minOccurs="0"> 6905 + <xsd:element name="reportVersion" type="witsml:reportVersionString" minOccurs="0">
6893 <xsd:annotation> 6906 <xsd:annotation>
6894 <xsd:documentation>The current report version.</xsd:documentation> 6907 <xsd:documentation>The current report version.</xsd:documentation>
6895 </xsd:annotation> 6908 </xsd:annotation>
...@@ -7709,6 +7722,16 @@ ...@@ -7709,6 +7722,16 @@
7709 <xsd:documentation>Pressure</xsd:documentation> 7722 <xsd:documentation>Pressure</xsd:documentation>
7710 </xsd:annotation> 7723 </xsd:annotation>
7711 </xsd:enumeration> 7724 </xsd:enumeration>
7725 + <xsd:enumeration value="choke size">
7726 + <xsd:annotation>
7727 + <xsd:documentation>Size of choke</xsd:documentation>
7728 + </xsd:annotation>
7729 + </xsd:enumeration>
7730 + <xsd:enumeration value="density">
7731 + <xsd:annotation>
7732 + <xsd:documentation>Density</xsd:documentation>
7733 + </xsd:annotation>
7734 + </xsd:enumeration>
7712 <!--added msv--> 7735 <!--added msv-->
7713 </xsd:restriction> 7736 </xsd:restriction>
7714 </xsd:simpleType> 7737 </xsd:simpleType>
...@@ -11241,8 +11264,21 @@ ...@@ -11241,8 +11264,21 @@
11241 </xsd:annotation> 11264 </xsd:annotation>
11242 <xsd:restriction base="witsml:abstractString"> 11265 <xsd:restriction base="witsml:abstractString">
11243 <xsd:maxLength value="16"/> 11266 <xsd:maxLength value="16"/>
11244 - <xsd:pattern value="1\.0\.0\.[1-9]?[0-9]\(PRODML\)"/> 11267 + <xsd:pattern value="[1-9]\.[0-9]\(MPRML\)"/>
11268 + </xsd:restriction>
11269 + <!--modified by msv-->
11270 + </xsd:simpleType>
11271 + <!--added by msv-->
11272 + <xsd:simpleType name="reportVersionString">
11273 + <xsd:annotation>
11274 + <xsd:documentation>The version of the schema. The first three levels are fixed. The fourth level can vary to represent the constraints defined in enumerations and XML
11275 + loader files.</xsd:documentation>
11276 + </xsd:annotation>
11277 + <xsd:restriction base="witsml:abstractString">
11278 + <xsd:maxLength value="16"/>
11279 + <xsd:pattern value="[1-9]\.[0-9]"/>
11245 </xsd:restriction> 11280 </xsd:restriction>
11281 + <!--modified by msv-->
11246 </xsd:simpleType> 11282 </xsd:simpleType>
11247 <xsd:complexType name="nameStruct"> 11283 <xsd:complexType name="nameStruct">
11248 <xsd:annotation> 11284 <xsd:annotation>
......
1 -# Saved by TopBraid on Thu Oct 06 15:30:05 BST 2011
2 # baseURI: http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest 1 # baseURI: http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest
2 +# imports: http://spinrdf.org/spin
3 # imports: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector 3 # imports: http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector
4 -# imports: http://www.witsml.org/schemas/131
5 # imports: http://www.reportinghub.no/np/data/npd 4 # imports: http://www.reportinghub.no/np/data/npd
6 -# imports: http://spinrdf.org/spin
7 5
8 @prefix : <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest#> . 6 @prefix : <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest#> .
9 @prefix TRANSFORM_mpr-collector: <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector#> . 7 @prefix TRANSFORM_mpr-collector: <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector#> .
10 @prefix owl: <http://www.w3.org/2002/07/owl#> . 8 @prefix owl: <http://www.w3.org/2002/07/owl#> .
11 -@prefix p131: <http://www.witsml.org/schemas/131#> .
12 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 9 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
13 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 10 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
14 @prefix sp: <http://spinrdf.org/sp#> . 11 @prefix sp: <http://spinrdf.org/sp#> .
...@@ -18,5 +15,5 @@ ...@@ -18,5 +15,5 @@
18 15
19 <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest> 16 <http://www.reportinghub.no/test/mpr/TEST_mpr-xml-ingest>
20 rdf:type owl:Ontology ; 17 rdf:type owl:Ontology ;
21 - owl:imports <http://www.witsml.org/schemas/131> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/np/data/npd> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector> ; 18 + owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-collector> , <http://www.reportinghub.no/np/data/npd> ;
22 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 19 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......
1 -# Saved by TopBraid on Thu Oct 06 15:30:05 BST 2011
2 # baseURI: null 1 # baseURI: null
3 2
4 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> . 3 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
......