Holger Knublauch

Attempt to fix conflict

1 -# Saved by TopBraid on Mon Aug 01 13:33:06 PDT 2011 1 +# Saved by TopBraid on Thu Aug 04 15:07:45 BST 2011
2 # baseURI: http://www.reportinghub.no/ep/schema/1.1/core 2 # baseURI: http://www.reportinghub.no/ep/schema/1.1/core
3 # imports: http://www.linkedmodel.org/1.2/schema/vaem 3 # imports: http://www.linkedmodel.org/1.2/schema/vaem
4 +# imports: http://www.reportinghub.no/iso15926/bindEP-NativeOWL
4 5
6 +@prefix bindEP-NativeOWL: <http://www.reportinghub.no/iso15926/bindEP-NativeOWL#> .
5 @prefix ep-core: <http://www.reportinghub.no/ep/schema/core#> . 7 @prefix ep-core: <http://www.reportinghub.no/ep/schema/core#> .
6 @prefix ep-core-1.1: <http://www.reportinghub.no/ep/schema/1.1/core#> . 8 @prefix ep-core-1.1: <http://www.reportinghub.no/ep/schema/1.1/core#> .
7 @prefix owl: <http://www.w3.org/2002/07/owl#> . 9 @prefix owl: <http://www.w3.org/2002/07/owl#> .
...@@ -11,7 +13,7 @@ ...@@ -11,7 +13,7 @@
11 13
12 <http://www.reportinghub.no/ep/schema/1.1/core> 14 <http://www.reportinghub.no/ep/schema/1.1/core>
13 rdf:type owl:Ontology ; 15 rdf:type owl:Ontology ;
14 - owl:imports <http://www.linkedmodel.org/1.2/schema/vaem> ; 16 + owl:imports <http://www.reportinghub.no/iso15926/bindEP-NativeOWL> , <http://www.linkedmodel.org/1.2/schema/vaem> ;
15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 17 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
16 18
17 ep-core:basisFor 19 ep-core:basisFor
...@@ -19,7 +21,7 @@ ep-core:basisFor ...@@ -19,7 +21,7 @@ ep-core:basisFor
19 rdfs:label "basis for"^^xsd:string . 21 rdfs:label "basis for"^^xsd:string .
20 22
21 ep-core:derivedFrom 23 ep-core:derivedFrom
22 - rdf:type owl:TransitiveProperty , owl:ObjectProperty ; 24 + rdf:type owl:ObjectProperty , owl:TransitiveProperty ;
23 rdfs:label "derived from"^^xsd:string . 25 rdfs:label "derived from"^^xsd:string .
24 26
25 ep-core:hasPart 27 ep-core:hasPart
......
This diff could not be displayed because it is too large.
1 -# Saved by TopBraid on Tue Jul 26 22:48:40 CEST 2011 1 +# Saved by TopBraid on Thu Aug 04 13:47:58 BST 2011
2 -# baseURI: http://www.reportinghub.no/ep/schema/1.1/equipment 2 +# baseURI: http://www.reportinghub.no/ep/schema/equipment
3 # imports: http://www.reportinghub.no/ep/schema/1.1/core 3 # imports: http://www.reportinghub.no/ep/schema/1.1/core
4 4
5 +@prefix : <http://www.reportinghub.no/ep/schema/equipment#> .
5 @prefix ep-eqt: <http://www.reportinghub.no/ep/schema/equipment#> . 6 @prefix ep-eqt: <http://www.reportinghub.no/ep/schema/equipment#> .
6 -@prefix ep-eqt-1.1: <http://www.reportinghub.no/ep/schema/1.1/equipment#> .
7 @prefix owl: <http://www.w3.org/2002/07/owl#> . 7 @prefix owl: <http://www.w3.org/2002/07/owl#> .
8 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 8 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
9 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 9 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
10 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 10 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
11 11
12 -<http://www.reportinghub.no/ep/schema/1.1/equipment> 12 +<http://www.reportinghub.no/ep/schema/equipment>
13 rdf:type owl:Ontology ; 13 rdf:type owl:Ontology ;
14 owl:imports <http://www.reportinghub.no/ep/schema/1.1/core> ; 14 owl:imports <http://www.reportinghub.no/ep/schema/1.1/core> ;
15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......
1 -# Saved by TopBraid on Tue Jul 26 22:56:33 CEST 2011 1 +# Saved by TopBraid on Thu Aug 04 14:54:00 BST 2011
2 -# baseURI: http://www.reportinghub.no/ep/schema/1.1/report 2 +# baseURI: http://www.reportinghub.no/ep/schema/report
3 -# imports: http://www.reportinghub.no/ep/schema/1.1/activity
4 # imports: http://www.reportinghub.no/ep/schema/1.1/core 3 # imports: http://www.reportinghub.no/ep/schema/1.1/core
5 4
5 +@prefix : <http://www.reportinghub.no/ep/schema/report#> .
6 @prefix ep-report: <http://www.reportinghub.no/ep/schema/report#> . 6 @prefix ep-report: <http://www.reportinghub.no/ep/schema/report#> .
7 -@prefix ep-report-1.1: <http://www.reportinghub.no/ep/schema/1.1/report#> .
8 @prefix owl: <http://www.w3.org/2002/07/owl#> . 7 @prefix owl: <http://www.w3.org/2002/07/owl#> .
9 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 8 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
10 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 9 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
11 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 10 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
12 11
13 -<http://www.reportinghub.no/ep/schema/1.1/report> 12 +<http://www.reportinghub.no/ep/schema/report>
14 rdf:type owl:Ontology ; 13 rdf:type owl:Ontology ;
15 - owl:imports <http://www.reportinghub.no/ep/schema/1.1/activity> , <http://www.reportinghub.no/ep/schema/1.1/core> ; 14 + owl:imports <http://www.reportinghub.no/ep/schema/1.1/core> ;
16 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
16 +
17 +ep-report:DailyDrillingReport
18 + rdf:type owl:Class ;
19 + rdfs:subClassOf ep-report:Report .
20 +
21 +ep-report:FinalDailyDrillingReport
22 + rdf:type owl:Class ;
23 + rdfs:subClassOf ep-report:DailyDrillingReport .
24 +
25 +ep-report:NormalDailyDrillingReport
26 + rdf:type owl:Class ;
27 + rdfs:subClassOf ep-report:DailyDrillingReport .
28 +
29 +ep-report:PreliminaryDailyDrillingReport
30 + rdf:type owl:Class ;
31 + rdfs:subClassOf ep-report:DailyDrillingReport .
32 +
33 +ep-report:Report
34 + rdf:type owl:Class ;
35 + rdfs:subClassOf owl:Thing .
......
1 -# Saved by TopBraid on Mon Aug 01 13:33:39 PDT 2011 1 +# Saved by TopBraid on Thu Aug 04 14:29:37 BST 2011
2 -# baseURI: http://www.reportinghub.no/ep/schema/1.1/well 2 +# baseURI: http://www.reportinghub.no/ep/schema/well
3 # imports: http://www.reportinghub.no/ep/schema/1.1/core 3 # imports: http://www.reportinghub.no/ep/schema/1.1/core
4 4
5 +@prefix : <http://www.reportinghub.no/ep/schema/well#> .
5 @prefix ep-well: <http://www.reportinghub.no/ep/schema/well#> . 6 @prefix ep-well: <http://www.reportinghub.no/ep/schema/well#> .
6 -@prefix ep-well-1.1: <http://www.reportinghub.no/ep/schema/1.1/well#> .
7 @prefix owl: <http://www.w3.org/2002/07/owl#> . 7 @prefix owl: <http://www.w3.org/2002/07/owl#> .
8 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 8 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
9 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 9 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
10 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 10 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
11 11
12 -<http://www.reportinghub.no/ep/schema/1.1/well> 12 +<http://www.reportinghub.no/ep/schema/well>
13 rdf:type owl:Ontology ; 13 rdf:type owl:Ontology ;
14 owl:imports <http://www.reportinghub.no/ep/schema/1.1/core> ; 14 owl:imports <http://www.reportinghub.no/ep/schema/1.1/core> ;
15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 15 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
16 16
17 +ep-well:AllOrPartOfTheLifeOfAWellBore
18 + rdf:type owl:Class ;
19 + rdfs:label "all or part of the life of a well bore"^^xsd:string .
20 +
21 +ep-well:TemporalPartOfAWellBore
22 + rdf:type owl:Class ;
23 + rdfs:label "temporal part of a well bore"^^xsd:string ;
24 + rdfs:subClassOf ep-well:AllOrPartOfTheLifeOfAWellBore .
25 +
17 ep-well:Well 26 ep-well:Well
18 rdf:type owl:Class ; 27 rdf:type owl:Class ;
19 rdfs:label "Well"^^xsd:string ; 28 rdfs:label "Well"^^xsd:string ;
...@@ -31,8 +40,8 @@ ep-well:Well ...@@ -31,8 +40,8 @@ ep-well:Well
31 40
32 ep-well:WellBore 41 ep-well:WellBore
33 rdf:type owl:Class ; 42 rdf:type owl:Class ;
34 - rdfs:label "Well bore"^^xsd:string ; 43 + rdfs:label "well bore"^^xsd:string ;
35 - rdfs:subClassOf owl:Thing ; 44 + rdfs:subClassOf ep-well:AllOrPartOfTheLifeOfAWellBore ;
36 rdfs:subClassOf 45 rdfs:subClassOf
37 [ rdf:type owl:Restriction ; 46 [ rdf:type owl:Restriction ;
38 owl:cardinality "1"^^xsd:nonNegativeInteger ; 47 owl:cardinality "1"^^xsd:nonNegativeInteger ;
......
1 -# Saved by TopBraid on Wed Aug 03 06:33:37 BST 2011 1 +# Saved by TopBraid on Thu Aug 04 16:06:56 BST 2011
2 # baseURI: null 2 # baseURI: null
3 3
4 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> . 4 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
......
1 -# Saved by TopBraid on Wed Aug 03 12:31:51 BST 2011 1 +# Saved by TopBraid on Thu Aug 04 16:09:10 BST 2011
2 # baseURI: null 2 # baseURI: null
3 3
4 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> . 4 @prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
......
1 -# baseURI: http://www.reportinghub.no/ep/transform/1.1/ddr/normalization 1 +# Saved by TopBraid on Thu Aug 04 14:25:22 BST 2011
2 -# imports: http://spinrdf.org/spin 2 +# baseURI: http://www.reportinghub.no/ep/transform/1.1/normalization
3 -# imports: http://www.reportinghub.no/ep/transform/1.1/ddr 3 +# imports: file:///www.reportinghub.no/examples/xml/NPD_110412124707.xml
4 - 4 +# imports: http://www.reportinghub.no/ep/transform/1.1/ddr/drillReport
5 -@prefix ddr-normalization: <http://www.reportinghub.no/ep/transform/ddr/normalization#> . 5 +# imports: http://www.reportinghub.no/ep/schema/report
6 -@prefix ddr-normalization-1.1: <http://www.reportinghub.no/ep/transform/1.1/ddr/normalization#> . 6 +# imports: http://www.reportinghub.no/ep/transform/1.1/ddr/statusInfo
7 -@prefix ep-spin-lib: <http://www.reportinghub.no/ep/spin/lib#> . 7 +# imports: http://www.reportinghub.no/ep/schema/equipment
8 -@prefix normalization: <http://www.reportinghub.no/ep/transform/normalization#> . 8 +# imports: http://spinrdf.org/spin
9 -@prefix owl: <http://www.w3.org/2002/07/owl#> . 9 +# imports: http://www.reportinghub.no/ep/schema/activity
10 -@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 10 +# imports: http://www.reportinghub.no/ep/schema/well
11 -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 11 +
12 -@prefix rhspin: <http://www.reportinghub.no/spin/rh#> . 12 +@prefix : <http://www.reportinghub.no/ep/transform/1.1/normalization#> .
13 -@prefix sp: <http://spinrdf.org/sp#> . 13 +@prefix owl: <http://www.w3.org/2002/07/owl#> .
14 -@prefix spin: <http://spinrdf.org/spin#> . 14 +@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
15 -@prefix spl: <http://spinrdf.org/spl#> . 15 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
16 -@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 16 +@prefix sp: <http://spinrdf.org/sp#> .
17 - 17 +@prefix spin: <http://spinrdf.org/spin#> .
18 -<http://www.reportinghub.no/ep/schema/ddr#Obj_drillReport> 18 +@prefix spl: <http://spinrdf.org/spl#> .
19 - spin:rule 19 +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
20 - [ rdf:type sp:Construct ; 20 +
21 - rdfs:comment "STEP 101 Make Well and Well Bore Instances"^^xsd:string ; 21 +<http://www.reportinghub.no/ep/transform/1.1/normalization>
22 - sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/well#WellBore> ; 22 + rdf:type owl:Ontology ;
23 - sp:predicate rdf:type ; 23 + owl:imports <http://www.reportinghub.no/ep/schema/well> , <http://www.reportinghub.no/ep/transform/1.1/ddr/statusInfo> , <http://www.reportinghub.no/ep/schema/activity> , <http://spinrdf.org/spin> , <file:///www.reportinghub.no/examples/xml/NPD_110412124707.xml> , <http://www.reportinghub.no/ep/schema/report> , <http://www.reportinghub.no/ep/transform/1.1/ddr/drillReport> , <http://www.reportinghub.no/ep/schema/equipment> ;
24 - sp:subject _:b1 24 + owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
25 - ] [ sp:object _:b2 ;
26 - sp:predicate rdfs:label ;
27 - sp:subject _:b1
28 - ] [ sp:object <http://www.reportinghub.no/ep/schema/well#Well> ;
29 - sp:predicate rdf:type ;
30 - sp:subject _:b3
31 - ] [ sp:object _:b4 ;
32 - sp:predicate rdfs:label ;
33 - sp:subject _:b3
34 - ] [ sp:object _:b1 ;
35 - sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ;
36 - sp:subject _:b3
37 - ]) ;
38 - sp:where ([ sp:object _:b2 ;
39 - sp:predicate <http://www.reportinghub.no/ep/schema/ddr#nameWellbore> ;
40 - sp:subject spin:_this
41 - ] [ sp:object _:b4 ;
42 - sp:predicate <http://www.reportinghub.no/ep/schema/ddr#nameWell> ;
43 - sp:subject spin:_this
44 - ] [ rdf:type sp:Bind ;
45 - sp:expression
46 - [ rdf:type rhspin:wellByName ;
47 - sp:arg1 _:b4
48 - ] ;
49 - sp:variable _:b3
50 - ] [ rdf:type sp:Bind ;
51 - sp:expression
52 - [ rdf:type rhspin:wellBoreByName ;
53 - sp:arg1 _:b2
54 - ] ;
55 - sp:variable _:b1
56 - ])
57 - ] .
58 -
59 -<http://www.reportinghub.no/ep/transform/1.1/ddr/normalization>
60 - rdf:type owl:Ontology ;
61 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/transform/1.1/ddr> ;
62 - owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
63 -
64 -_:b1 sp:varName "wellBore"^^xsd:string .
65 -
66 -_:b2 sp:varName "nameWellBore"^^xsd:string .
67 -
68 -_:b3 sp:varName "well"^^xsd:string .
69 -
70 -_:b4 sp:varName "nameWell"^^xsd:string .
......
1 +# Saved by TopBraid on Thu Aug 04 14:29:43 BST 2011
2 +# baseURI: http://www.reportinghub.no/iso15926/bindEP-NativeOWL
3 +# imports: http://www.reportinghub.no/ep/schema/1.1.1/ddr
4 +# imports: http://purl.org/dc/elements/1.1/
5 +# imports: http://www.w3.org/2004/02/skos/core
6 +# imports: http://www.reportinghub.no/ep/schema/report
7 +# imports: http://www.reportinghub.no/iso15926/nativeOWL
8 +# imports: http://www.reportinghub.no/ep/schema/equipment
9 +# imports: http://purl.org/dc/terms/
10 +# imports: http://www.reportinghub.no/ep/schema/well
11 +# imports: http://www.reportinghub.no/ep/schema/activity
12 +
13 +@prefix : <http://www.reportinghub.no/iso15926/bindEP-NativeOWL#> .
14 +@prefix iso15926: <http://www.reportinghub.no/iso15926/nativeOWL#> .
15 +@prefix owl: <http://www.w3.org/2002/07/owl#> .
16 +@prefix p1: <http://example.org/file1#> .
17 +@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
18 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
19 +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
20 +
21 +<http://www.reportinghub.no/ep/schema/well#AllOrPartOfTheLifeOfAWellBore>
22 + rdfs:subClassOf iso15926:PossibleIndividual .
23 +
24 +<http://www.reportinghub.no/iso15926/bindEP-NativeOWL>
25 + rdf:type owl:Ontology ;
26 + owl:imports <http://purl.org/dc/elements/1.1/> , <http://www.reportinghub.no/ep/schema/activity> , <http://www.reportinghub.no/ep/schema/1.1.1/ddr> , <http://www.w3.org/2004/02/skos/core> , <http://purl.org/dc/terms/> , <http://www.reportinghub.no/ep/schema/equipment> , <http://www.reportinghub.no/ep/schema/well> , <http://www.reportinghub.no/ep/schema/report> , <http://www.reportinghub.no/iso15926/nativeOWL> ;
27 + owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
1 +# Saved by TopBraid on Thu Aug 04 15:12:00 BST 2011
2 +# baseURI: http://www.reportinghub.no/iso15926/nativeOWL
3 +# imports: http://purl.org/dc/elements/1.1/
4 +# imports: http://www.w3.org/2004/02/skos/core
5 +# imports: http://purl.org/dc/terms/
6 +
7 +@prefix : <http://www.reportinghub.no/iso15926/nativeOWL#> .
8 +@prefix owl: <http://www.w3.org/2002/07/owl#> .
9 +@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
10 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
11 +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
12 +
13 +<http://www.reportinghub.no/iso15926/nativeOWL>
14 + rdf:type owl:Ontology ;
15 + owl:imports <http://www.w3.org/2004/02/skos/core> , <http://purl.org/dc/terms/> , <http://purl.org/dc/elements/1.1/> ;
16 + owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
17 +
18 +:Activity
19 + rdf:type owl:Class ;
20 + rdfs:label "activity"^^xsd:string ;
21 + rdfs:subClassOf :PossibleIndividual .
22 +
23 +:PossibleIndividual
24 + rdf:type owl:Class ;
25 + rdfs:label "possible individual"^^xsd:string ;
26 + rdfs:subClassOf owl:Thing .
27 +
28 +:hasPart
29 + rdf:type owl:TransitiveProperty ;
30 + rdfs:domain :PossibleIndividual ;
31 + rdfs:label "has part"^^xsd:string ;
32 + rdfs:range :PossibleIndividual ;
33 + owl:inverseOf :partOf .
34 +
35 +:hasTemporalPart
36 + rdf:type owl:TransitiveProperty ;
37 + rdfs:domain :PossibleIndividual ;
38 + rdfs:label "has temporal part"^^xsd:string ;
39 + rdfs:range :PossibleIndividual ;
40 + rdfs:subPropertyOf :hasPart ;
41 + owl:inverseOf :temporalPartOf .
42 +
43 +:partOf
44 + rdf:type owl:TransitiveProperty , owl:ObjectProperty ;
45 + rdfs:domain :PossibleIndividual ;
46 + rdfs:label "part of"^^xsd:string ;
47 + rdfs:range :PossibleIndividual ;
48 + owl:inverseOf :hasPart .
49 +
50 +:temporalPartOf
51 + rdf:type owl:TransitiveProperty , owl:ObjectProperty ;
52 + rdfs:domain :PossibleIndividual ;
53 + rdfs:label "temporal part of"^^xsd:string ;
54 + rdfs:range :PossibleIndividual ;
55 + rdfs:subPropertyOf :partOf ;
56 + owl:inverseOf :hasTemporalPart .
...@@ -14,6 +14,11 @@ ...@@ -14,6 +14,11 @@
14 @prefix spl: <http://spinrdf.org/spl#> . 14 @prefix spl: <http://spinrdf.org/spl#> .
15 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 15 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
16 16
17 +<http://spinrdf.org/arg#company>
18 + rdf:type rdf:Property ;
19 + rdfs:label "company"^^xsd:string ;
20 + rdfs:subPropertyOf sp:arg .
21 +
17 <http://spinrdf.org/arg#id> 22 <http://spinrdf.org/arg#id>
18 rdf:type rdf:Property ; 23 rdf:type rdf:Property ;
19 rdfs:label "id"^^xsd:string ; 24 rdfs:label "id"^^xsd:string ;
...@@ -42,7 +47,7 @@ ...@@ -42,7 +47,7 @@
42 <http://www.reportinghub.no/spin/rh> 47 <http://www.reportinghub.no/spin/rh>
43 rdf:type owl:Ontology ; 48 rdf:type owl:Ontology ;
44 rdfs:comment "A collection of SPIN functions and templates to support working with the ReportingHub schemas."^^xsd:string ; 49 rdfs:comment "A collection of SPIN functions and templates to support working with the ReportingHub schemas."^^xsd:string ;
45 - owl:imports <http://www.reportinghub.no/1.1/schema/npd> , <http://spinrdf.org/spin> , <http://topbraid.org/spin/spinmapl> ; 50 + owl:imports <http://topbraid.org/spin/spinmapl> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/1.1/schema/npd> ;
46 owl:versionInfo "0.1.0"^^xsd:string . 51 owl:versionInfo "0.1.0"^^xsd:string .
47 52
48 rhspin:GetWellBoresOfWell 53 rhspin:GetWellBoresOfWell
...@@ -118,6 +123,68 @@ rhspin:companyById ...@@ -118,6 +123,68 @@ rhspin:companyById
118 spl:valueType xsd:string 123 spl:valueType xsd:string
119 ] . 124 ] .
120 125
126 +rhspin:companyHasLicenceForWellBore
127 + rdf:type spin:MagicProperty ;
128 + rdfs:comment "A magic property that defines a relationship between companies (left side) and well bores (right side). It matches those well bores that the company currently holds a licence for. The query is optimized for the direction when the company is given and the well bores variable."^^xsd:string ;
129 + rdfs:label "company has licence for well bore"^^xsd:string ;
130 + rdfs:subClassOf spin:MagicProperties ;
131 + spin:body
132 + [ rdf:type sp:Select ;
133 + sp:distinct "true"^^xsd:boolean ;
134 + sp:resultVariables (_:b3) ;
135 + sp:where ([ rdf:type sp:Bind ;
136 + sp:expression
137 + [ rdf:type xsd:date ;
138 + sp:arg1 [ rdf:type fn:substring ;
139 + sp:arg1 [ rdf:type xsd:string ;
140 + sp:arg1 [ rdf:type sp:now
141 + ]
142 + ] ;
143 + sp:arg2 1 ;
144 + sp:arg3 10
145 + ]
146 + ] ;
147 + sp:variable _:b4
148 + ] [ sp:object spin:_arg1 ;
149 + sp:predicate <http://www.reportinghub.no/schema/npd#shareHolder> ;
150 + sp:subject _:b5
151 + ] [ sp:object _:b6 ;
152 + sp:predicate <http://www.reportinghub.no/schema/npd#licenceShared> ;
153 + sp:subject _:b5
154 + ] [ sp:object <http://www.reportinghub.no/schema/npd#LS_Active> ;
155 + sp:predicate <http://www.reportinghub.no/schema/npd#licenseStatus> ;
156 + sp:subject _:b6
157 + ] [ sp:object _:b7 ;
158 + sp:predicate <http://www.reportinghub.no/schema/npd#startDate> ;
159 + sp:subject _:b6
160 + ] [ rdf:type sp:Filter ;
161 + sp:expression
162 + [ rdf:type sp:le ;
163 + sp:arg1 _:b7 ;
164 + sp:arg2 _:b4
165 + ]
166 + ] [ sp:object _:b8 ;
167 + sp:predicate <http://www.reportinghub.no/schema/npd#endDate> ;
168 + sp:subject _:b6
169 + ] [ rdf:type sp:Filter ;
170 + sp:expression
171 + [ rdf:type sp:gt ;
172 + sp:arg1 _:b8 ;
173 + sp:arg2 _:b4
174 + ]
175 + ] [ sp:object _:b6 ;
176 + sp:predicate <http://www.reportinghub.no/schema/npd#drilledInProductionLicence> ;
177 + sp:subject _:b3
178 + ])
179 + ] ;
180 + spin:constraint
181 + [ rdf:type spl:Argument ;
182 + rdfs:comment "The Company to match."^^xsd:string ;
183 + spl:predicate sp:arg1 ;
184 + spl:valueType <http://www.reportinghub.no/schema/npd#Company>
185 + ] ;
186 + spin:returnType <http://www.reportinghub.no/schema/npd#WellBore> .
187 +
121 rhspin:discoveryById 188 rhspin:discoveryById
122 rdf:type spin:Function ; 189 rdf:type spin:Function ;
123 rdfs:label "discovery by id"^^xsd:string ; 190 rdfs:label "discovery by id"^^xsd:string ;
...@@ -214,7 +281,7 @@ rhspin:normalizeString ...@@ -214,7 +281,7 @@ rhspin:normalizeString
214 rdfs:subClassOf spl:StringFunctions ; 281 rdfs:subClassOf spl:StringFunctions ;
215 spin:body 282 spin:body
216 [ rdf:type sp:Select ; 283 [ rdf:type sp:Select ;
217 - sp:resultVariables (_:b3) ; 284 + sp:resultVariables (_:b9) ;
218 sp:where ([ rdf:type sp:Bind ; 285 sp:where ([ rdf:type sp:Bind ;
219 sp:expression 286 sp:expression
220 [ rdf:type spif:regex ; 287 [ rdf:type spif:regex ;
...@@ -222,67 +289,67 @@ rhspin:normalizeString ...@@ -222,67 +289,67 @@ rhspin:normalizeString
222 sp:arg2 "\\((.*)\\)" ; 289 sp:arg2 "\\((.*)\\)" ;
223 sp:arg3 "" 290 sp:arg3 ""
224 ] ; 291 ] ;
225 - sp:variable _:b4 292 + sp:variable _:b10
226 ] [ rdf:type sp:Bind ; 293 ] [ rdf:type sp:Bind ;
227 sp:expression 294 sp:expression
228 [ rdf:type spif:trim ; 295 [ rdf:type spif:trim ;
229 - sp:arg1 _:b4 296 + sp:arg1 _:b10
230 ] ; 297 ] ;
231 - sp:variable _:b5 298 + sp:variable _:b11
232 ] [ rdf:type sp:Bind ; 299 ] [ rdf:type sp:Bind ;
233 sp:expression 300 sp:expression
234 [ rdf:type spif:encodeURL ; 301 [ rdf:type spif:encodeURL ;
235 - sp:arg1 _:b5 302 + sp:arg1 _:b11
236 ] ; 303 ] ;
237 - sp:variable _:b6 304 + sp:variable _:b12
238 ] [ rdf:type sp:Bind ; 305 ] [ rdf:type sp:Bind ;
239 sp:expression 306 sp:expression
240 [ rdf:type spif:regex ; 307 [ rdf:type spif:regex ;
241 - sp:arg1 _:b6 ; 308 + sp:arg1 _:b12 ;
242 sp:arg2 "%2F" ; 309 sp:arg2 "%2F" ;
243 sp:arg3 "_" 310 sp:arg3 "_"
244 ] ; 311 ] ;
245 - sp:variable _:b7 312 + sp:variable _:b13
246 ] [ rdf:type sp:Bind ; 313 ] [ rdf:type sp:Bind ;
247 sp:expression 314 sp:expression
248 [ rdf:type spif:regex ; 315 [ rdf:type spif:regex ;
249 - sp:arg1 _:b7 ; 316 + sp:arg1 _:b13 ;
250 sp:arg2 "%[0-9A-F][0-9A-F]" ; 317 sp:arg2 "%[0-9A-F][0-9A-F]" ;
251 sp:arg3 "" 318 sp:arg3 ""
252 ] ; 319 ] ;
253 - sp:variable _:b8 320 + sp:variable _:b14
254 ] [ rdf:type sp:Bind ; 321 ] [ rdf:type sp:Bind ;
255 sp:expression 322 sp:expression
256 [ rdf:type spif:regex ; 323 [ rdf:type spif:regex ;
257 - sp:arg1 _:b8 ; 324 + sp:arg1 _:b14 ;
258 sp:arg2 "\\+" ; 325 sp:arg2 "\\+" ;
259 sp:arg3 "_" 326 sp:arg3 "_"
260 ] ; 327 ] ;
261 - sp:variable _:b9 328 + sp:variable _:b15
262 ] [ rdf:type sp:Bind ; 329 ] [ rdf:type sp:Bind ;
263 sp:expression 330 sp:expression
264 [ rdf:type spif:regex ; 331 [ rdf:type spif:regex ;
265 - sp:arg1 _:b9 ; 332 + sp:arg1 _:b15 ;
266 sp:arg2 "_+" ; 333 sp:arg2 "_+" ;
267 sp:arg3 "_" 334 sp:arg3 "_"
268 ] ; 335 ] ;
269 - sp:variable _:b10 336 + sp:variable _:b16
270 ] [ rdf:type sp:Bind ; 337 ] [ rdf:type sp:Bind ;
271 sp:expression 338 sp:expression
272 [ rdf:type spif:regex ; 339 [ rdf:type spif:regex ;
273 - sp:arg1 _:b10 ; 340 + sp:arg1 _:b16 ;
274 sp:arg2 "\\*" ; 341 sp:arg2 "\\*" ;
275 sp:arg3 "" 342 sp:arg3 ""
276 ] ; 343 ] ;
277 - sp:variable _:b11 344 + sp:variable _:b17
278 ] [ rdf:type sp:Bind ; 345 ] [ rdf:type sp:Bind ;
279 sp:expression 346 sp:expression
280 [ rdf:type xsd:string ; 347 [ rdf:type xsd:string ;
281 sp:arg1 [ rdf:type spif:upperCase ; 348 sp:arg1 [ rdf:type spif:upperCase ;
282 - sp:arg1 _:b11 349 + sp:arg1 _:b17
283 ] 350 ]
284 ] ; 351 ] ;
285 - sp:variable _:b3 352 + sp:variable _:b9
286 ]) 353 ])
287 ] ; 354 ] ;
288 spin:constraint 355 spin:constraint
...@@ -401,26 +468,44 @@ rhspin:wellByName ...@@ -401,26 +468,44 @@ rhspin:wellByName
401 ] ; 468 ] ;
402 spin:returnType <http://www.reportinghub.no/schema/npd#Well> . 469 spin:returnType <http://www.reportinghub.no/schema/npd#Well> .
403 470
404 -_:b3 sp:varName "normalizedStr"^^xsd:string . 471 +_:b3 sp:varName "wellBore"^^xsd:string .
405 472
406 -_:b4 sp:varName "s1"^^xsd:string . 473 +_:b8 sp:varName "endDate"^^xsd:string .
407 474
408 -_:b5 sp:varName "s2"^^xsd:string . 475 +_:b7 sp:varName "startDate"^^xsd:string .
409 476
410 -_:b6 sp:varName "t0a"^^xsd:string . 477 +_:b6 sp:varName "licence"^^xsd:string .
411 478
412 -_:b7 sp:varName "t0b"^^xsd:string . 479 +_:b5 sp:varName "share"^^xsd:string .
413 480
414 -_:b8 sp:varName "t1"^^xsd:string . 481 +_:b4 sp:varName "nowDate"^^xsd:string .
415 482
416 -_:b9 sp:varName "t2"^^xsd:string . 483 +_:b17
484 + sp:varName "t4"^^xsd:string .
417 485
418 -_:b10 486 +_:b16
419 sp:varName "t3"^^xsd:string . 487 sp:varName "t3"^^xsd:string .
420 488
489 +_:b15
490 + sp:varName "t2"^^xsd:string .
491 +
492 +_:b14
493 + sp:varName "t1"^^xsd:string .
494 +
495 +_:b13
496 + sp:varName "t0b"^^xsd:string .
497 +
498 +_:b12
499 + sp:varName "t0a"^^xsd:string .
500 +
421 _:b11 501 _:b11
422 - sp:varName "t4"^^xsd:string . 502 + sp:varName "s2"^^xsd:string .
423 503
424 -_:b1 sp:varName "wellBoreName"^^xsd:string . 504 +_:b10
505 + sp:varName "s1"^^xsd:string .
506 +
507 +_:b9 sp:varName "normalizedStr"^^xsd:string .
425 508
426 _:b2 sp:varName "wellBore"^^xsd:string . 509 _:b2 sp:varName "wellBore"^^xsd:string .
510 +
511 +_:b1 sp:varName "wellBoreName"^^xsd:string .
......
1 <html> 1 <html>
2 <head> 2 <head>
3 - <title>ReportingHub - Upload DDR</title> 3 + <title>ReportingHub - Validate or Upload DDR</title>
4 <link href="lib/rh/rh.css" rel="stylesheet" type="text/css" /> 4 <link href="lib/rh/rh.css" rel="stylesheet" type="text/css" />
5 + <script type="text/javascript" src="lib/rh/jquery/jquery.js"></script>
5 </head> 6 </head>
6 <body> 7 <body>
7 <div id="wrapper"> 8 <div id="wrapper">
...@@ -9,16 +10,31 @@ ...@@ -9,16 +10,31 @@
9 <rhswp:Header /> 10 <rhswp:Header />
10 11
11 <div id="content"> 12 <div id="content">
12 - <h3>Upload a Daily Drilling Report</h3> 13 + <h3>Validate or Upload a Daily Drilling Report</h3>
13 <p> 14 <p>
14 Please select a DDR XML file: 15 Please select a DDR XML file:
15 </p> 16 </p>
16 - <form action="ddrFileUpload" enctype="multipart/form-data" method="post"> 17 + <form enctype="multipart/form-data" id="theForm" method="post">
17 <div> 18 <div>
18 <input name="file" type="file" /> 19 <input name="file" type="file" />
19 </div> 20 </div>
20 <br /> 21 <br />
21 - <input type="submit" value="Upload" /> 22 + <input id="validateButton" type="radio" name="type" value="validate" checked="checked" />Validate only<br />
23 + <input id="uploadButton" type="radio" name="type" value="upload" />Validate &amp; upload<br />
24 + <script>
25 +
26 + function updateAction() {
27 + var newAction = $("#validateButton").attr("checked") ? "validate-report" : "submit-report";
28 + $("#theForm").attr("action", newAction);
29 + }
30 +
31 + $("#validateButton").change(updateAction);
32 + $("#uploadButton").change(updateAction);
33 +
34 + updateAction();
35 + </script>
36 + <br />
37 + <input type="submit" value="Submit" />
22 </form> 38 </form>
23 </div> 39 </div>
24 </div> 40 </div>
......