Attempting to fix conflicts, and to set ttl files to binary

Holger Knublauch
Commit 1f90ffbca10c01feca5b2d6d04565db88d1ec942 1f90ffbc 2 parents 13e0046c 7916dd27
Showing 8 changed files with 81 additions and 36 deletions
www.reportinghub.no/ep/schema/1.1/SCHEMA_EP-ACTIVITY-(v1.1).ttl
www.reportinghub.no/ep/schema/1.1/SCHEMA_EP-VV-(v1.1).ttl
www.reportinghub.no/ep/spin/SPIN_EPIM-lib-(v1.1).ttl
www.reportinghub.no/ep/spin/SPIN_EPIM-lib-(v1.1).ttl.tbc
www.reportinghub.no/ep/transform/TRANSFORM_ddr-drillReport-(v1.1.1).ttl
www.reportinghub.no/ep/transform/TRANSFORM_ddr-drillReport-(v1.1.1).ttl.tbc
www.reportinghub.no/ep/transform/TRANSFORM_ddr-normalization-(v1.1.1).ttl.tbc
www.reportinghub.no/examples/xml/G3 T2 020110.xml
--- a/www.reportinghub.no/ep/schema/1.1/SCHEMA_EP-ACTIVITY-(v1.1).ttl
View file @1f90ffb
+++ b/www.reportinghub.no/ep/schema/1.1/SCHEMA_EP-ACTIVITY-(v1.1).ttl
View file @1f90ffb
-# Saved by TopBraid on Wed Jul 27 19:44:43 PDT 2011
+# Saved by TopBraid on Tue Aug 02 12:39:11 BST 2011
 # baseURI: http://www.reportinghub.no/ep/schema/1.1/activity
 # imports: http://www.linkedmodel.org/1.2/schema/vaem
 # imports: http://www.reportinghub.no/ep/schema/1.1/well
@@ -76,6 +76,11 @@ ep-activity:DailyDrillingActivity
               [ rdf:type owl:Restriction ;
                 owl:allValuesFrom ep-activity:DrillingActivity ;
                 owl:onProperty ep-activity:hasSubActivity
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom <http://www.reportinghub.no/ep/schema/well#WellBore> ;
+                owl:onProperty ep-activity:onWellBore
               ] .
 ep-activity:DailyDrillingReport
@@ -103,6 +108,10 @@ ep-activity:DrillingActivity
       rdfs:label "Drilling activity"^^xsd:string ;
       rdfs:subClassOf ep-activity:OffshoreWellActivity .
+ep-activity:FinalDailyDrillingReport
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-activity:DailyDrillingReport .
+
 ep-activity:MonthlyDrillingActivity
       rdf:type owl:Class ;
       rdfs:label "Weekly drilling activity"^^xsd:string ;
@@ -123,6 +132,10 @@ ep-activity:MonthlyProductionActivity
                 owl:onProperty ep-activity:hasSubActivity
               ] .
+ep-activity:NormalDailyDrillingReport
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-activity:DailyDrillingReport .
+
 ep-activity:OffshoreActivity
       rdf:type owl:Class ;
       rdfs:label "Offshore activity"^^xsd:string ;
@@ -153,6 +166,10 @@ ep-activity:OffshoreWellActivity
                 owl:onProperty ep-activity:onWell
               ] .
+ep-activity:PreliminaryDailyDrillingReport
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-activity:DailyDrillingReport .
+
 ep-activity:ProductionActivity
       rdf:type owl:Class ;
       rdfs:label "Production activity"^^xsd:string ;
@@ -188,6 +205,11 @@ ep-activity:WeeklyProductionActivity
                 owl:onProperty ep-activity:hasSubActivity
               ] .
+ep-activity:createdAt
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "created at"^^xsd:string ;
+      rdfs:range <http://www.linkedmodel.org/schema/vaem#dateUnion> .
+
 ep-activity:finishedAt
       rdf:type owl:DatatypeProperty ;
       rdfs:label "finished at"^^xsd:string ;
@@ -205,6 +227,10 @@ ep-activity:onWell
       rdf:type owl:ObjectProperty ;
       rdfs:label "on well"^^xsd:string .
+ep-activity:onWellBore
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdfs:label "on WellBore"^^xsd:string .
+
 ep-activity:reportOn
       rdf:type owl:ObjectProperty ;
       rdfs:label "report on"^^xsd:string .
--- a/www.reportinghub.no/ep/schema/1.1/SCHEMA_EP-VV-(v1.1).ttl
View file @1f90ffb
+++ b/www.reportinghub.no/ep/schema/1.1/SCHEMA_EP-VV-(v1.1).ttl
View file @1f90ffb
@@ -19,7 +19,7 @@
 <http://www.reportinghub.no/1.1/schema/epvv>
       rdf:type owl:Ontology ;
       owl:imports <http://www.reportinghub.no/1.1/schema/epa> , <http://www.linkedmodel.org/1.0/schema/dtype> , <http://www.linkedmodel.org/1.2/schema/vaem> , <http://spinrdf.org/spin> ;
-      owl:versionInfo "TBD"^^xsd:string .
+      owl:versionInfo "TBD by RH"^^xsd:string .
 epvv:Discrepancy
       rdf:type owl:Class ;
--- a/www.reportinghub.no/ep/spin/SPIN_EPIM-lib-(v1.1).ttl
View file @1f90ffb
+++ b/www.reportinghub.no/ep/spin/SPIN_EPIM-lib-(v1.1).ttl
View file @1f90ffb
--- a/www.reportinghub.no/ep/spin/SPIN_EPIM-lib-(v1.1).ttl.tbc
View file @1f90ffb
+++ b/www.reportinghub.no/ep/spin/SPIN_EPIM-lib-(v1.1).ttl.tbc
View file @1f90ffb
-# baseURI: null
+# Saved by TopBraid on Wed Aug 03 06:33:37 BST 2011
-
+# baseURI: null
-@prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .
+
-@prefix forms:   <http://www.topbraid.org/2007/01/forms.owl#> .
+@prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .
-@prefix inference:  <http://www.topbraid.org/2007/06/inference.owl#> .
+@prefix forms:   <http://www.topbraid.org/2007/01/forms.owl#> .
-@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix inference:  <http://www.topbraid.org/2007/06/inference.owl#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
-@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix visual:  <http://topbraid.org/visual#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+@prefix visual:  <http://topbraid.org/visual#> .
-
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-[]    rdf:type inference:Configuration ;
+
-      composite:child
+[]    rdf:type inference:Configuration ;
-              [ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
+      composite:child
-                composite:index "0"^^xsd:int
+              [ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
-              ] .
+                composite:index "0"^^xsd:int
+              ] .
--- a/www.reportinghub.no/ep/transform/TRANSFORM_ddr-drillReport-(v1.1.1).ttl 0 → 100644
View file @1f90ffb
+++ b/www.reportinghub.no/ep/transform/TRANSFORM_ddr-drillReport-(v1.1.1).ttl 0 → 100644
View file @1f90ffb
--- a/www.reportinghub.no/ep/transform/TRANSFORM_ddr-drillReport-(v1.1.1).ttl.tbc 0 → 100644
View file @1f90ffb
+++ b/www.reportinghub.no/ep/transform/TRANSFORM_ddr-drillReport-(v1.1.1).ttl.tbc 0 → 100644
View file @1f90ffb
+# Saved by TopBraid on Wed Aug 03 12:31:51 BST 2011
+# baseURI: null
+
+@prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .
+@prefix forms:   <http://www.topbraid.org/2007/01/forms.owl#> .
+@prefix inference:  <http://www.topbraid.org/2007/06/inference.owl#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix visual:  <http://topbraid.org/visual#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+[]    rdf:type inference:Configuration ;
+      composite:child
+              [ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
+                <http://spinrdf.org/spin#topSPINOptions>
+                        "singlePass" ;
+                composite:index "0"^^xsd:int
+              ] .
--- a/www.reportinghub.no/ep/transform/TRANSFORM_ddr-normalization-(v1.1.1).ttl.tbc
View file @1f90ffb
+++ b/www.reportinghub.no/ep/transform/TRANSFORM_ddr-normalization-(v1.1.1).ttl.tbc
View file @1f90ffb
-# baseURI: null
+# Saved by TopBraid on Wed Aug 03 07:44:47 BST 2011
-
+# baseURI: null
-@prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .
+
-@prefix forms:   <http://www.topbraid.org/2007/01/forms.owl#> .
+@prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .
-@prefix inference:  <http://www.topbraid.org/2007/06/inference.owl#> .
+@prefix forms:   <http://www.topbraid.org/2007/01/forms.owl#> .
-@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix inference:  <http://www.topbraid.org/2007/06/inference.owl#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
-@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix visual:  <http://topbraid.org/visual#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+@prefix visual:  <http://topbraid.org/visual#> .
-
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-[]    rdf:type inference:Configuration ;
+
-      composite:child
+[]    rdf:type inference:Configuration ;
-              [ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
+      composite:child
-                <http://spinrdf.org/spin#topSPINOptions>
+              [ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
-                        "singlePass" ;
+                composite:index "0"^^xsd:int
-                composite:index "0"^^xsd:int
+              ] .
-              ] .
--- a/www.reportinghub.no/examples/xml/G3 T2 020110.xml 0 → 100644
View file @1f90ffb
+++ b/www.reportinghub.no/examples/xml/G3 T2 020110.xml 0 → 100644
View file @1f90ffb