David Price

Clean up many uses of outdated DDR proxy schema.

...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity 3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity
4 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose 4 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose
5 # imports: http://www.reportinghub.no/ep/schema/1.0/core 5 # imports: http://www.reportinghub.no/ep/schema/1.0/core
6 -# imports: http://www.reportinghub.no/ep/schema/1.0/ddr
7 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment 6 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment
8 # imports: http://www.reportinghub.no/ep/schema/1.0/report 7 # imports: http://www.reportinghub.no/ep/schema/1.0/report
9 # imports: http://www.reportinghub.no/ep/schema/1.0/well 8 # imports: http://www.reportinghub.no/ep/schema/1.0/well
...@@ -43,7 +42,7 @@ ...@@ -43,7 +42,7 @@
43 42
44 <http://www.reportinghub.no/ep/schema/extract/EXTRACT_ddr-DailyDrillingActivityPurposeType-(v1.1)> 43 <http://www.reportinghub.no/ep/schema/extract/EXTRACT_ddr-DailyDrillingActivityPurposeType-(v1.1)>
45 rdf:type owl:Ontology ; 44 rdf:type owl:Ontology ;
46 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/equipment> ; 45 + owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/equipment> ;
47 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 46 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
48 47
49 _:b1 sp:varName "dailyDrillingActivityPurposeType"^^xsd:string . 48 _:b1 sp:varName "dailyDrillingActivityPurposeType"^^xsd:string .
......
1 -# Saved by TopBraid on Sun Aug 14 20:44:58 BST 2011
2 # baseURI: http://www.reportinghub.no/ep/schema/extract/EXTRACT_ddr-EquipmentType-(v1.1) 1 # baseURI: http://www.reportinghub.no/ep/schema/extract/EXTRACT_ddr-EquipmentType-(v1.1)
3 -# imports: http://www.reportinghub.no/ep/spin/1.1/lib
4 -# imports: http://www.reportinghub.no/ep/schema/1.0/equipment
5 -# imports: http://www.reportinghub.no/ep/schema/1.0/ddr
6 -# imports: http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type
7 # imports: http://spinrdf.org/spin 2 # imports: http://spinrdf.org/spin
3 +# imports: http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type
4 +# imports: http://www.reportinghub.no/ep/schema/1.0/equipment
5 +# imports: http://www.reportinghub.no/ep/spin/1.1/lib
8 6
9 @prefix : <http://www.reportinghub.no/ep/schema/extract/EXTRACT_ddr-EquipmentType-(v1.1)#> . 7 @prefix : <http://www.reportinghub.no/ep/schema/extract/EXTRACT_ddr-EquipmentType-(v1.1)#> .
10 @prefix dc: <http://purl.org/dc/elements/1.1/> . 8 @prefix dc: <http://purl.org/dc/elements/1.1/> .
...@@ -52,7 +50,7 @@ ...@@ -52,7 +50,7 @@
52 50
53 <http://www.reportinghub.no/ep/schema/extract/EXTRACT_ddr-EquipmentType-(v1.1)> 51 <http://www.reportinghub.no/ep/schema/extract/EXTRACT_ddr-EquipmentType-(v1.1)>
54 rdf:type owl:Ontology ; 52 rdf:type owl:Ontology ;
55 - owl:imports <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type> ; 53 + owl:imports <http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/equipment> ;
56 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 54 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
57 55
58 _:b1 sp:varName "equipmentType"^^xsd:string . 56 _:b1 sp:varName "equipmentType"^^xsd:string .
......
1 -# Saved by TopBraid on Sun Aug 14 20:44:58 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#> .
......
This diff could not be displayed because it is too large.
1 # baseURI: http://www.reportinghub.no/ep/spin/ddr-tables 1 # baseURI: http://www.reportinghub.no/ep/spin/ddr-tables
2 # imports: http://spinrdf.org/spin 2 # imports: http://spinrdf.org/spin
3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose 3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose
4 -# imports: http://www.reportinghub.no/ep/schema/1.0/ddr
5 # imports: http://www.reportinghub.no/ep/spin/1.1/lib 4 # imports: http://www.reportinghub.no/ep/spin/1.1/lib
6 # imports: http://www.reportinghub.no/spin/rh 5 # imports: http://www.reportinghub.no/spin/rh
7 6
...@@ -23,7 +22,7 @@ ...@@ -23,7 +22,7 @@
23 <http://www.reportinghub.no/ep/spin/ddr-tables> 22 <http://www.reportinghub.no/ep/spin/ddr-tables>
24 rdf:type owl:Ontology ; 23 rdf:type owl:Ontology ;
25 rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ; 24 rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ;
26 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/spin/1.1/lib> ; 25 + owl:imports <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://spinrdf.org/spin> ;
27 owl:versionInfo "0.1.0"^^xsd:string . 26 owl:versionInfo "0.1.0"^^xsd:string .
28 27
29 ddr-tables:BitRecord 28 ddr-tables:BitRecord
......
1 # baseURI: http://www.reportinghub.no/ep/spin/drilling-tables 1 # baseURI: http://www.reportinghub.no/ep/spin/drilling-tables
2 # imports: http://spinrdf.org/spin 2 # imports: http://spinrdf.org/spin
3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose 3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose
4 -# imports: http://www.reportinghub.no/ep/schema/1.0/ddr 4 +# imports: http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type
5 # imports: http://www.reportinghub.no/spin/rh 5 # imports: http://www.reportinghub.no/spin/rh
6 6
7 @prefix arg: <http://spinrdf.org/arg#> . 7 @prefix arg: <http://spinrdf.org/arg#> .
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 <http://www.reportinghub.no/ep/spin/drilling-tables> 19 <http://www.reportinghub.no/ep/spin/drilling-tables>
20 rdf:type owl:Ontology ; 20 rdf:type owl:Ontology ;
21 rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ; 21 rdfs:comment "A collection of SELECT templates that can be used to assemble tables in DD reports."^^xsd:string ;
22 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://www.reportinghub.no/spin/rh> ; 22 + owl:imports <http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type> , <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://spinrdf.org/spin> ;
23 owl:versionInfo "0.1.0"^^xsd:string . 23 owl:versionInfo "0.1.0"^^xsd:string .
24 24
25 drilling-tables:DailyAndForecastComments 25 drilling-tables:DailyAndForecastComments
......
1 # baseURI: http://www.reportinghub.no/ep/spin/queries 1 # baseURI: http://www.reportinghub.no/ep/spin/queries
2 # imports: http://spinrdf.org/spin 2 # imports: http://spinrdf.org/spin
3 -# imports: http://www.reportinghub.no/ep/schema/1.0/ddr 3 +# imports: http://www.reportinghub.no/ep/schema/1.0/activity
4 +# imports: http://www.reportinghub.no/ep/schema/1.0/core
5 +# imports: http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type
4 6
5 @prefix owl: <http://www.w3.org/2002/07/owl#> . 7 @prefix owl: <http://www.w3.org/2002/07/owl#> .
6 @prefix queries: <http://www.reportinghub.no/ep/spin/queries#> . 8 @prefix queries: <http://www.reportinghub.no/ep/spin/queries#> .
...@@ -28,7 +30,7 @@ ...@@ -28,7 +30,7 @@
28 30
29 <http://www.reportinghub.no/ep/spin/queries> 31 <http://www.reportinghub.no/ep/spin/queries>
30 rdf:type owl:Ontology ; 32 rdf:type owl:Ontology ;
31 - owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.0/ddr> ; 33 + owl:imports <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/drilling-equipment-type> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://spinrdf.org/spin> ;
32 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 34 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
33 35
34 queries:TestQuery1 36 queries:TestQuery1
...@@ -42,10 +44,9 @@ queries:TestQuery1 ...@@ -42,10 +44,9 @@ queries:TestQuery1
42 ] ; 44 ] ;
43 spin:constraint 45 spin:constraint
44 [ rdf:type spl:Argument ; 46 [ rdf:type spl:Argument ;
45 - rdfs:comment "An optional integer value."^^xsd:string ; 47 + rdfs:comment "A string argument"^^xsd:string ;
46 - spl:optional "true"^^xsd:boolean ; 48 + spl:predicate <http://spinrdf.org/arg#arg1> ;
47 - spl:predicate <http://spinrdf.org/arg#arg3> ; 49 + spl:valueType xsd:string
48 - spl:valueType xsd:integer
49 ] ; 50 ] ;
50 spin:constraint 51 spin:constraint
51 [ rdf:type spl:Argument ; 52 [ rdf:type spl:Argument ;
...@@ -55,9 +56,10 @@ queries:TestQuery1 ...@@ -55,9 +56,10 @@ queries:TestQuery1
55 ] ; 56 ] ;
56 spin:constraint 57 spin:constraint
57 [ rdf:type spl:Argument ; 58 [ rdf:type spl:Argument ;
58 - rdfs:comment "A string argument"^^xsd:string ; 59 + rdfs:comment "An optional integer value."^^xsd:string ;
59 - spl:predicate <http://spinrdf.org/arg#arg1> ; 60 + spl:optional "true"^^xsd:boolean ;
60 - spl:valueType xsd:string 61 + spl:predicate <http://spinrdf.org/arg#arg3> ;
62 + spl:valueType xsd:integer
61 ] . 63 ] .
62 64
63 queries:TestQuery2 65 queries:TestQuery2
...@@ -71,13 +73,13 @@ queries:TestQuery2 ...@@ -71,13 +73,13 @@ queries:TestQuery2
71 ] ; 73 ] ;
72 spin:constraint 74 spin:constraint
73 [ rdf:type spl:Argument ; 75 [ rdf:type spl:Argument ;
74 - rdfs:comment "A string argument"^^xsd:string ;
75 - spl:predicate <http://spinrdf.org/arg#arg1> ;
76 - spl:valueType xsd:string
77 - ] ;
78 - spin:constraint
79 - [ rdf:type spl:Argument ;
80 rdfs:comment "A float value"^^xsd:string ; 76 rdfs:comment "A float value"^^xsd:string ;
81 spl:predicate <http://spinrdf.org/arg#arg2> ; 77 spl:predicate <http://spinrdf.org/arg#arg2> ;
82 spl:valueType xsd:float 78 spl:valueType xsd:float
79 + ] ;
80 + spin:constraint
81 + [ rdf:type spl:Argument ;
82 + rdfs:comment "A string argument"^^xsd:string ;
83 + spl:predicate <http://spinrdf.org/arg#arg1> ;
84 + spl:valueType xsd:string
83 ] . 85 ] .
......
1 -# Saved by TopBraid on Sun Sep 11 18:25:18 BST 2011
2 -# baseURI: null
3 -
4 -@prefix composite: <http://www.topbraid.org/2007/05/composite.owl#> .
5 -@prefix forms: <http://www.topbraid.org/2007/01/forms.owl#> .
6 -@prefix inference: <http://www.topbraid.org/2007/06/inference.owl#> .
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 visual: <http://topbraid.org/visual#> .
11 -@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
12 -
13 -[] rdf:type inference:Configuration ;
14 - composite:child
15 - [ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
16 - <http://spinrdf.org/spin#topSPINOptions>
17 - "singlePass" ;
18 - composite:index "0"^^xsd:int
19 - ] ;
20 - inference:completeMode
21 - "true"^^xsd:boolean .
This diff is collapsed. Click to expand it.
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
3 # imports: http://purl.org/dc/terms/ 3 # imports: http://purl.org/dc/terms/
4 # imports: http://www.reportinghub.no/ep/schema/1.0/activity 4 # imports: http://www.reportinghub.no/ep/schema/1.0/activity
5 # imports: http://www.reportinghub.no/ep/schema/1.0/core 5 # imports: http://www.reportinghub.no/ep/schema/1.0/core
6 -# imports: http://www.reportinghub.no/ep/schema/1.0/ddr
7 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment 6 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment
8 # imports: http://www.reportinghub.no/ep/schema/1.0/report 7 # imports: http://www.reportinghub.no/ep/schema/1.0/report
9 # imports: http://www.reportinghub.no/ep/schema/1.0/well 8 # imports: http://www.reportinghub.no/ep/schema/1.0/well
...@@ -20,5 +19,5 @@ ...@@ -20,5 +19,5 @@
20 19
21 <http://www.reportinghub.no/iso15926/bindEP-NativeOWL> 20 <http://www.reportinghub.no/iso15926/bindEP-NativeOWL>
22 rdf:type owl:Ontology ; 21 rdf:type owl:Ontology ;
23 - owl:imports <http://purl.org/dc/elements/1.1/> , <http://www.w3.org/2004/02/skos/core> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://purl.org/dc/terms/> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/iso15926/nativeOWL> , <http://www.reportinghub.no/ep/schema/1.0/equipment> ; 22 + owl:imports <http://purl.org/dc/elements/1.1/> , <http://www.w3.org/2004/02/skos/core> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://purl.org/dc/terms/> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/iso15926/nativeOWL> , <http://www.reportinghub.no/ep/schema/1.0/equipment> ;
24 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 23 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity 3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity
4 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose 4 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose
5 # imports: http://www.reportinghub.no/ep/schema/1.0/core 5 # imports: http://www.reportinghub.no/ep/schema/1.0/core
6 -# imports: http://www.reportinghub.no/ep/schema/1.0/ddr
7 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment 6 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment
8 # imports: http://www.reportinghub.no/ep/schema/1.0/facility 7 # imports: http://www.reportinghub.no/ep/schema/1.0/facility
9 # imports: http://www.reportinghub.no/ep/schema/1.0/organization 8 # imports: http://www.reportinghub.no/ep/schema/1.0/organization
...@@ -44,7 +43,7 @@ arg:template ...@@ -44,7 +43,7 @@ arg:template
44 43
45 <http://www.reportinghub.no/swp/ddr> 44 <http://www.reportinghub.no/swp/ddr>
46 rdf:type owl:Ontology ; 45 rdf:type owl:Ontology ;
47 - owl:imports <http://uispin.org/tui> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/spin/ddr-tables> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/spin/rh> ; 46 + owl:imports <http://uispin.org/tui> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/spin/ddr-tables> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/spin/rh> ;
48 owl:versionInfo "0.1.0"^^xsd:string . 47 owl:versionInfo "0.1.0"^^xsd:string .
49 48
50 ddrswp:DailyDrillingReportView 49 ddrswp:DailyDrillingReportView
...@@ -72,15 +71,15 @@ ddrswp:Table ...@@ -72,15 +71,15 @@ ddrswp:Table
72 rdfs:subClassOf ui:Element ; 71 rdfs:subClassOf ui:Element ;
73 spin:constraint 72 spin:constraint
74 [ rdf:type spl:Argument ; 73 [ rdf:type spl:Argument ;
74 + rdfs:comment "The SPIN Template to execute."^^xsd:string ;
75 + spl:predicate arg:template ;
76 + spl:valueType spin:Template
77 + ] ;
78 + spin:constraint
79 + [ rdf:type spl:Argument ;
75 rdfs:comment "The report that serves as root of the template."^^xsd:string ; 80 rdfs:comment "The report that serves as root of the template."^^xsd:string ;
76 spl:optional "true"^^xsd:boolean ; 81 spl:optional "true"^^xsd:boolean ;
77 spl:predicate arg:report ; 82 spl:predicate arg:report ;
78 spl:valueType <http://www.reportinghub.no/ep/schema/report#DailyDrillingReport> 83 spl:valueType <http://www.reportinghub.no/ep/schema/report#DailyDrillingReport>
79 ] ; 84 ] ;
80 - spin:constraint
81 - [ rdf:type spl:Argument ;
82 - rdfs:comment "The SPIN Template to execute."^^xsd:string ;
83 - spl:predicate arg:template ;
84 - spl:valueType spin:Template
85 - ] ;
86 ui:prototype <http://www.reportinghub.no/swp/DDRTable.uispin.html> . 85 ui:prototype <http://www.reportinghub.no/swp/DDRTable.uispin.html> .
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity 3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity
4 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose 4 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose
5 # imports: http://www.reportinghub.no/ep/schema/1.0/core 5 # imports: http://www.reportinghub.no/ep/schema/1.0/core
6 -# imports: http://www.reportinghub.no/ep/schema/1.0/ddr
7 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment 6 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment
8 # imports: http://www.reportinghub.no/ep/schema/1.0/facility 7 # imports: http://www.reportinghub.no/ep/schema/1.0/facility
9 # imports: http://www.reportinghub.no/ep/schema/1.0/organization 8 # imports: http://www.reportinghub.no/ep/schema/1.0/organization
...@@ -17,6 +16,7 @@ ...@@ -17,6 +16,7 @@
17 @prefix html: <http://uispin.org/html#> . 16 @prefix html: <http://uispin.org/html#> .
18 @prefix let: <http://uispin.org/let#> . 17 @prefix let: <http://uispin.org/let#> .
19 @prefix letrs: <http://uispin.org/letrs#> . 18 @prefix letrs: <http://uispin.org/letrs#> .
19 +@prefix nptswp: <http://www.reportinghub.no/swp/npt#> .
20 @prefix owl: <http://www.w3.org/2002/07/owl#> . 20 @prefix owl: <http://www.w3.org/2002/07/owl#> .
21 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . 21 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
22 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . 22 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
24 @prefix spin: <http://spinrdf.org/spin#> . 24 @prefix spin: <http://spinrdf.org/spin#> .
25 @prefix spl: <http://spinrdf.org/spl#> . 25 @prefix spl: <http://spinrdf.org/spl#> .
26 @prefix ui: <http://uispin.org/ui#> . 26 @prefix ui: <http://uispin.org/ui#> .
27 -@prefix nptswp: <http://www.reportinghub.no/swp/npt#> .
28 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . 27 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
29 28
30 arg:startDate 29 arg:startDate
...@@ -103,54 +102,54 @@ arg:wellBore ...@@ -103,54 +102,54 @@ arg:wellBore
103 102
104 <http://www.reportinghub.no/swp/npt> 103 <http://www.reportinghub.no/swp/npt>
105 rdf:type owl:Ontology ; 104 rdf:type owl:Ontology ;
106 - owl:imports <http://uispin.org/tui> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <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/organization> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/spin/drilling-tables> , <http://www.reportinghub.no/spin/rh> ; 105 + owl:imports <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/organization> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/spin/rh> , <http://uispin.org/tui> , <http://www.reportinghub.no/ep/spin/drilling-tables> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/well> ;
107 owl:versionInfo "0.1.0"^^xsd:string . 106 owl:versionInfo "0.1.0"^^xsd:string .
108 107
109 -nptswp:Table 108 +nptswp:NonProductiveTimeReportView
110 rdf:type ui:NodeClass ; 109 rdf:type ui:NodeClass ;
111 - rdfs:comment "An HTML table displaying the results of a given SPIN template for a given npt. The template should also provide rhspin:tableHeaders."^^xsd:string ; 110 + rdfs:label "Weekly drilling report view"^^xsd:string ;
112 - rdfs:label "Table"^^xsd:string ;
113 rdfs:subClassOf ui:Element ; 111 rdfs:subClassOf ui:Element ;
114 spin:constraint 112 spin:constraint
115 [ rdf:type spl:Argument ; 113 [ rdf:type spl:Argument ;
116 - rdfs:comment "The SPIN Template to execute."^^xsd:string ; 114 + rdfs:comment "The start date of the report to display."^^xsd:string ;
117 - spl:predicate arg:template ; 115 + spl:predicate arg:startDate ;
118 - spl:valueType spin:Template 116 + spl:valueType xsd:date
119 ] ; 117 ] ;
120 spin:constraint 118 spin:constraint
121 [ rdf:type spl:Argument ; 119 [ rdf:type spl:Argument ;
122 - rdfs:comment "The well bore of the report."^^xsd:string ; 120 + rdfs:comment "The well bore."^^xsd:string ;
123 spl:predicate arg:wellBore ; 121 spl:predicate arg:wellBore ;
124 spl:valueType ep-well:WellBore 122 spl:valueType ep-well:WellBore
125 ] ; 123 ] ;
124 + ui:headIncludes
125 + [ rdf:type html:Link ;
126 + html:href "http://spinrdf.org/rhlib/ddr.css"^^xsd:string ;
127 + html:rel "stylesheet"^^xsd:string ;
128 + html:type "text/css"^^xsd:string
129 + ] ;
130 + ui:prototype <http://www.reportinghub.no/swp/NonProductiveTimeReport.uispin.html> .
131 +
132 +nptswp:Table
133 + rdf:type ui:NodeClass ;
134 + rdfs:comment "An HTML table displaying the results of a given SPIN template for a given npt. The template should also provide rhspin:tableHeaders."^^xsd:string ;
135 + rdfs:label "Table"^^xsd:string ;
136 + rdfs:subClassOf ui:Element ;
126 spin:constraint 137 spin:constraint
127 [ rdf:type spl:Argument ; 138 [ rdf:type spl:Argument ;
128 rdfs:comment "The start date of the report."^^xsd:string ; 139 rdfs:comment "The start date of the report."^^xsd:string ;
129 spl:predicate arg:startDate ; 140 spl:predicate arg:startDate ;
130 spl:valueType xsd:date 141 spl:valueType xsd:date
131 ] ; 142 ] ;
132 - ui:prototype <http://www.reportinghub.no/swp/NPTTable.uispin.html> .
133 -
134 -nptswp:NonProductiveTimeReportView
135 - rdf:type ui:NodeClass ;
136 - rdfs:label "Weekly drilling report view"^^xsd:string ;
137 - rdfs:subClassOf ui:Element ;
138 spin:constraint 143 spin:constraint
139 [ rdf:type spl:Argument ; 144 [ rdf:type spl:Argument ;
140 - rdfs:comment "The well bore."^^xsd:string ; 145 + rdfs:comment "The well bore of the report."^^xsd:string ;
141 spl:predicate arg:wellBore ; 146 spl:predicate arg:wellBore ;
142 spl:valueType ep-well:WellBore 147 spl:valueType ep-well:WellBore
143 ] ; 148 ] ;
144 spin:constraint 149 spin:constraint
145 [ rdf:type spl:Argument ; 150 [ rdf:type spl:Argument ;
146 - rdfs:comment "The start date of the report to display."^^xsd:string ; 151 + rdfs:comment "The SPIN Template to execute."^^xsd:string ;
147 - spl:predicate arg:startDate ; 152 + spl:predicate arg:template ;
148 - spl:valueType xsd:date 153 + spl:valueType spin:Template
149 - ] ;
150 - ui:headIncludes
151 - [ rdf:type html:Link ;
152 - html:href "http://spinrdf.org/rhlib/ddr.css"^^xsd:string ;
153 - html:rel "stylesheet"^^xsd:string ;
154 - html:type "text/css"^^xsd:string
155 ] ; 154 ] ;
156 - ui:prototype <http://www.reportinghub.no/swp/NonProductiveTimeReport.uispin.html> . 155 + ui:prototype <http://www.reportinghub.no/swp/NPTTable.uispin.html> .
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity 3 # imports: http://www.reportinghub.no/ep/schema/1.0/activity
4 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose 4 # imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose
5 # imports: http://www.reportinghub.no/ep/schema/1.0/core 5 # imports: http://www.reportinghub.no/ep/schema/1.0/core
6 -# imports: http://www.reportinghub.no/ep/schema/1.0/ddr
7 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment 6 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment
8 # imports: http://www.reportinghub.no/ep/schema/1.0/facility 7 # imports: http://www.reportinghub.no/ep/schema/1.0/facility
9 # imports: http://www.reportinghub.no/ep/schema/1.0/organization 8 # imports: http://www.reportinghub.no/ep/schema/1.0/organization
...@@ -103,7 +102,7 @@ arg:wellBore ...@@ -103,7 +102,7 @@ arg:wellBore
103 102
104 <http://www.reportinghub.no/swp/wdr> 103 <http://www.reportinghub.no/swp/wdr>
105 rdf:type owl:Ontology ; 104 rdf:type owl:Ontology ;
106 - owl:imports <http://uispin.org/tui> , <http://www.reportinghub.no/ep/schema/1.0/activity> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/ddr> , <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/organization> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/well> , <http://www.reportinghub.no/ep/spin/drilling-tables> , <http://www.reportinghub.no/spin/rh> ; 105 + owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/spin/drilling-tables> , <http://uispin.org/tui> , <http://www.reportinghub.no/ep/schema/1.0/report> , <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/activity> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> , <http://www.reportinghub.no/ep/schema/1.0/core> ;
107 owl:versionInfo "0.1.0"^^xsd:string . 106 owl:versionInfo "0.1.0"^^xsd:string .
108 107
109 wdrswp:Table 108 wdrswp:Table
...@@ -113,9 +112,9 @@ wdrswp:Table ...@@ -113,9 +112,9 @@ wdrswp:Table
113 rdfs:subClassOf ui:Element ; 112 rdfs:subClassOf ui:Element ;
114 spin:constraint 113 spin:constraint
115 [ rdf:type spl:Argument ; 114 [ rdf:type spl:Argument ;
116 - rdfs:comment "The SPIN Template to execute."^^xsd:string ; 115 + rdfs:comment "The start date of the report."^^xsd:string ;
117 - spl:predicate arg:template ; 116 + spl:predicate arg:startDate ;
118 - spl:valueType spin:Template 117 + spl:valueType xsd:date
119 ] ; 118 ] ;
120 spin:constraint 119 spin:constraint
121 [ rdf:type spl:Argument ; 120 [ rdf:type spl:Argument ;
...@@ -125,9 +124,9 @@ wdrswp:Table ...@@ -125,9 +124,9 @@ wdrswp:Table
125 ] ; 124 ] ;
126 spin:constraint 125 spin:constraint
127 [ rdf:type spl:Argument ; 126 [ rdf:type spl:Argument ;
128 - rdfs:comment "The start date of the report."^^xsd:string ; 127 + rdfs:comment "The SPIN Template to execute."^^xsd:string ;
129 - spl:predicate arg:startDate ; 128 + spl:predicate arg:template ;
130 - spl:valueType xsd:date 129 + spl:valueType spin:Template
131 ] ; 130 ] ;
132 ui:prototype <http://www.reportinghub.no/swp/WDRTable.uispin.html> . 131 ui:prototype <http://www.reportinghub.no/swp/WDRTable.uispin.html> .
133 132
...@@ -137,16 +136,16 @@ wdrswp:WeeklyDrillingReportView ...@@ -137,16 +136,16 @@ wdrswp:WeeklyDrillingReportView
137 rdfs:subClassOf ui:Element ; 136 rdfs:subClassOf ui:Element ;
138 spin:constraint 137 spin:constraint
139 [ rdf:type spl:Argument ; 138 [ rdf:type spl:Argument ;
140 - rdfs:comment "The well bore."^^xsd:string ;
141 - spl:predicate arg:wellBore ;
142 - spl:valueType ep-well:WellBore
143 - ] ;
144 - spin:constraint
145 - [ rdf:type spl:Argument ;
146 rdfs:comment "The start date of the report to display."^^xsd:string ; 139 rdfs:comment "The start date of the report to display."^^xsd:string ;
147 spl:predicate arg:startDate ; 140 spl:predicate arg:startDate ;
148 spl:valueType xsd:date 141 spl:valueType xsd:date
149 ] ; 142 ] ;
143 + spin:constraint
144 + [ rdf:type spl:Argument ;
145 + rdfs:comment "The well bore."^^xsd:string ;
146 + spl:predicate arg:wellBore ;
147 + spl:valueType ep-well:WellBore
148 + ] ;
150 ui:headIncludes 149 ui:headIncludes
151 [ rdf:type html:Link ; 150 [ rdf:type html:Link ;
152 html:href "http://spinrdf.org/rhlib/ddr.css"^^xsd:string ; 151 html:href "http://spinrdf.org/rhlib/ddr.css"^^xsd:string ;
......