David Leal

Tidied up to start work again

1 -# Saved by TopBraid on Sun Oct 09 08:50:58 BST 2011 1 +# Saved by TopBraid on Sun Oct 09 10:30:44 BST 2011
2 # baseURI: http://www.reportinghub.no/ep/dpr/spin/1.1/lib 2 # baseURI: http://www.reportinghub.no/ep/dpr/spin/1.1/lib
3 # imports: http://www.reportinghub.no/ep/schema/1.0/geography 3 # imports: http://www.reportinghub.no/ep/schema/1.0/geography
4 # imports: http://www.reportinghub.no/ep/schema/1.0/well 4 # imports: http://www.reportinghub.no/ep/schema/1.0/well
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 21
22 <http://www.reportinghub.no/ep/dpr/spin/1.1/lib> 22 <http://www.reportinghub.no/ep/dpr/spin/1.1/lib>
23 rdf:type owl:Ontology ; 23 rdf:type owl:Ontology ;
24 - owl:imports <http://www.reportinghub.no/ep/schema/1.0/geography> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.witsml.org/schemas/131/addendum/combo> , <http://spinrdf.org/spin> ; 24 + owl:imports <http://spinrdf.org/spin> , <http://www.witsml.org/schemas/131/addendum/combo> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/geography> ;
25 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 25 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
26 26
27 ep-dpr-spin-lib:Function 27 ep-dpr-spin-lib:Function
...@@ -87,7 +87,7 @@ ep-dpr-spin-lib:selectProductionFacilityType ...@@ -87,7 +87,7 @@ ep-dpr-spin-lib:selectProductionFacilityType
87 sp:arg1 spin:_arg1 ; 87 sp:arg1 spin:_arg1 ;
88 sp:arg2 combo:RF_country 88 sp:arg2 combo:RF_country
89 ] ; 89 ] ;
90 - sp:arg2 ep-geog:Country ; 90 + sp:arg2 <http://www.reportinghub.no/ep/schema/geography#Country> ;
91 sp:arg3 [ rdf:type sp:if ; 91 sp:arg3 [ rdf:type sp:if ;
92 sp:arg1 [ rdf:type sp:eq ; 92 sp:arg1 [ rdf:type sp:eq ;
93 sp:arg1 spin:_arg1 ; 93 sp:arg1 spin:_arg1 ;
...@@ -147,7 +147,7 @@ ep-dpr-spin-lib:selectProductionFacilityType ...@@ -147,7 +147,7 @@ ep-dpr-spin-lib:selectProductionFacilityType
147 sp:arg1 spin:_arg1 ; 147 sp:arg1 spin:_arg1 ;
148 sp:arg2 combo:RF_state 148 sp:arg2 combo:RF_state
149 ] ; 149 ] ;
150 - sp:arg2 ep-geog:State ; 150 + sp:arg2 <http://www.reportinghub.no/ep/schema/geography#State> ;
151 sp:arg3 [ rdf:type sp:if ; 151 sp:arg3 [ rdf:type sp:if ;
152 sp:arg1 [ rdf:type sp:eq ; 152 sp:arg1 [ rdf:type sp:eq ;
153 sp:arg1 spin:_arg1 ; 153 sp:arg1 spin:_arg1 ;
...@@ -189,7 +189,7 @@ ep-dpr-spin-lib:selectProductionFacilityType ...@@ -189,7 +189,7 @@ ep-dpr-spin-lib:selectProductionFacilityType
189 sp:arg1 spin:_arg1 ; 189 sp:arg1 spin:_arg1 ;
190 sp:arg2 combo:RF_county 190 sp:arg2 combo:RF_county
191 ] ; 191 ] ;
192 - sp:arg2 ep-geog:County ; 192 + sp:arg2 <http://www.reportinghub.no/ep/schema/geography#County> ;
193 sp:arg3 [ rdf:type sp:if ; 193 sp:arg3 [ rdf:type sp:if ;
194 sp:arg1 [ rdf:type sp:eq ; 194 sp:arg1 [ rdf:type sp:eq ;
195 sp:arg1 spin:_arg1 ; 195 sp:arg1 spin:_arg1 ;
......
1 -# Saved by TopBraid on Sun Oct 09 08:50:58 BST 2011 1 +# Saved by TopBraid on Sun Oct 09 10:30:44 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 Sun Oct 09 10:16:31 BST 2011 1 +# Saved by TopBraid on Sun Oct 09 10:33:34 BST 2011
2 # baseURI: http://www.reportinghub.no/ep/spin/1.1/lib 2 # baseURI: http://www.reportinghub.no/ep/spin/1.1/lib
3 # imports: http://www.reportinghub.no/ep/schema/1.0/report 3 # imports: http://www.reportinghub.no/ep/schema/1.0/report
4 # imports: http://www.witsml.org/schemas/1series 4 # imports: http://www.witsml.org/schemas/1series
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
16 @prefix ddr: <http://www.witsml.org/schemas/1series#> . 16 @prefix ddr: <http://www.witsml.org/schemas/1series#> .
17 @prefix dtype: <http://www.linkedmodel.org/schema/dtype#> . 17 @prefix dtype: <http://www.linkedmodel.org/schema/dtype#> .
18 @prefix ep-drill-eqt-typ: <http://www.reportinghub.no/ep/schema/drilling-equipment-type#> . 18 @prefix ep-drill-eqt-typ: <http://www.reportinghub.no/ep/schema/drilling-equipment-type#> .
19 -@prefix ep-geog: <http://www.reportinghub.no/ep/schema/1.0/geography#> .
20 @prefix ep-spin-lib: <http://www.reportinghub.no/ep/spin/lib#> . 19 @prefix ep-spin-lib: <http://www.reportinghub.no/ep/spin/lib#> .
21 @prefix fn: <http://www.w3.org/2005/xpath-functions#> . 20 @prefix fn: <http://www.w3.org/2005/xpath-functions#> .
22 @prefix owl: <http://www.w3.org/2002/07/owl#> . 21 @prefix owl: <http://www.w3.org/2002/07/owl#> .
...@@ -30,7 +29,7 @@ ...@@ -30,7 +29,7 @@
30 29
31 <http://www.reportinghub.no/ep/spin/1.1/lib> 30 <http://www.reportinghub.no/ep/spin/1.1/lib>
32 rdf:type owl:Ontology ; 31 rdf:type owl:Ontology ;
33 - owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/drilling-equipment-type> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> ; 32 + owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/drilling-equipment-type> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://spinrdf.org/spin> , <http://www.witsml.org/schemas/1series> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/facility> ;
34 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 33 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
35 34
36 ep-spin-lib:Function 35 ep-spin-lib:Function
...@@ -505,12 +504,12 @@ ep-spin-lib:buildURI ...@@ -505,12 +504,12 @@ ep-spin-lib:buildURI
505 ] ; 504 ] ;
506 spin:constraint 505 spin:constraint
507 [ rdf:type spl:Argument ; 506 [ rdf:type spl:Argument ;
508 - spl:predicate sp:arg1 ; 507 + spl:predicate sp:arg2 ;
509 spl:valueType xsd:string 508 spl:valueType xsd:string
510 ] ; 509 ] ;
511 spin:constraint 510 spin:constraint
512 [ rdf:type spl:Argument ; 511 [ rdf:type spl:Argument ;
513 - spl:predicate sp:arg2 ; 512 + spl:predicate sp:arg1 ;
514 spl:valueType xsd:string 513 spl:valueType xsd:string
515 ] . 514 ] .
516 515
......