David Leal

Changes boolean tests to expect xsd:boolean arguments

1 +# Saved by TopBraid on Sun Oct 02 17:49:40 BST 2011
1 # baseURI: http://www.reportinghub.no/ep/spin/1.1/lib 2 # baseURI: http://www.reportinghub.no/ep/spin/1.1/lib
2 -# imports: http://spinrdf.org/spin 3 +# imports: http://www.reportinghub.no/ep/schema/1.0/report
3 -# imports: http://www.reportinghub.no/ep/schema/1.0/activity 4 +# imports: http://www.witsml.org/schemas/1series
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/well
7 +# imports: http://www.reportinghub.no/ep/schema/1.0/activity-purpose
6 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment 8 # imports: http://www.reportinghub.no/ep/schema/1.0/equipment
7 # imports: http://www.reportinghub.no/ep/schema/1.0/facility 9 # imports: http://www.reportinghub.no/ep/schema/1.0/facility
8 -# imports: http://www.reportinghub.no/ep/schema/1.0/report 10 +# imports: http://www.reportinghub.no/ep/schema/1.0/activity
9 -# imports: http://www.reportinghub.no/ep/schema/1.0/well
10 # imports: http://www.reportinghub.no/ep/schema/drilling-equipment-type 11 # imports: http://www.reportinghub.no/ep/schema/drilling-equipment-type
12 +# imports: http://spinrdf.org/spin
11 # imports: http://www.reportinghub.no/spin/rh 13 # imports: http://www.reportinghub.no/spin/rh
12 -# imports: http://www.witsml.org/schemas/1series
13 14
14 @prefix activity-purpose: <http://www.reportinghub.no/ep/schema/1.0/activity-purpose#> . 15 @prefix activity-purpose: <http://www.reportinghub.no/ep/schema/1.0/activity-purpose#> .
15 @prefix ddr: <http://www.witsml.org/schemas/1series#> . 16 @prefix ddr: <http://www.witsml.org/schemas/1series#> .
...@@ -28,7 +29,7 @@ ...@@ -28,7 +29,7 @@
28 29
29 <http://www.reportinghub.no/ep/spin/1.1/lib> 30 <http://www.reportinghub.no/ep/spin/1.1/lib>
30 rdf:type owl:Ontology ; 31 rdf:type owl:Ontology ;
31 - owl:imports <http://spinrdf.org/spin> , <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/equipment> , <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/well> , <http://www.reportinghub.no/ep/schema/drilling-equipment-type> , <http://www.reportinghub.no/spin/rh> , <http://www.witsml.org/schemas/1series> ; 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/facility> , <http://www.reportinghub.no/ep/schema/1.0/activity-purpose> ;
32 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 33 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
33 34
34 ep-spin-lib:Function 35 ep-spin-lib:Function
...@@ -2019,7 +2020,7 @@ ep-spin-lib:selectFixedOrMoveableRigType ...@@ -2019,7 +2020,7 @@ ep-spin-lib:selectFixedOrMoveableRigType
2019 [ rdf:type sp:if ; 2020 [ rdf:type sp:if ;
2020 sp:arg1 [ rdf:type sp:eq ; 2021 sp:arg1 [ rdf:type sp:eq ;
2021 sp:arg1 spin:_arg1 ; 2022 sp:arg1 spin:_arg1 ;
2022 - sp:arg2 "true"^^ddr:LogicalBooleanDatatype 2023 + sp:arg2 "true"^^xsd:boolean
2023 ] ; 2024 ] ;
2024 sp:arg2 <http://www.reportinghub.no/ep/schema/facility#FixedRig> ; 2025 sp:arg2 <http://www.reportinghub.no/ep/schema/facility#FixedRig> ;
2025 sp:arg3 <http://www.reportinghub.no/ep/schema/facility#MoveableRig> 2026 sp:arg3 <http://www.reportinghub.no/ep/schema/facility#MoveableRig>
...@@ -2992,7 +2993,7 @@ ep-spin-lib:selectWellBoreHphtType ...@@ -2992,7 +2993,7 @@ ep-spin-lib:selectWellBoreHphtType
2992 [ rdf:type sp:if ; 2993 [ rdf:type sp:if ;
2993 sp:arg1 [ rdf:type sp:eq ; 2994 sp:arg1 [ rdf:type sp:eq ;
2994 sp:arg1 spin:_arg1 ; 2995 sp:arg1 spin:_arg1 ;
2995 - sp:arg2 "true"^^ddr:LogicalBooleanDatatype 2996 + sp:arg2 "true"^^xsd:boolean
2996 ] ; 2997 ] ;
2997 sp:arg2 <http://www.reportinghub.no/ep/schema/well#HphtWellBore> ; 2998 sp:arg2 <http://www.reportinghub.no/ep/schema/well#HphtWellBore> ;
2998 sp:arg3 <http://www.reportinghub.no/ep/schema/well#NotHphtWellBore> 2999 sp:arg3 <http://www.reportinghub.no/ep/schema/well#NotHphtWellBore>
...@@ -3013,7 +3014,7 @@ ep-spin-lib:selectWellBoreTightnessType ...@@ -3013,7 +3014,7 @@ ep-spin-lib:selectWellBoreTightnessType
3013 [ rdf:type sp:if ; 3014 [ rdf:type sp:if ;
3014 sp:arg1 [ rdf:type sp:eq ; 3015 sp:arg1 [ rdf:type sp:eq ;
3015 sp:arg1 spin:_arg1 ; 3016 sp:arg1 spin:_arg1 ;
3016 - sp:arg2 "true"^^ddr:LogicalBooleanDatatype 3017 + sp:arg2 "true"^^xsd:boolean
3017 ] ; 3018 ] ;
3018 sp:arg2 <http://www.reportinghub.no/ep/schema/well#TightWellBore> ; 3019 sp:arg2 <http://www.reportinghub.no/ep/schema/well#TightWellBore> ;
3019 sp:arg3 <http://www.reportinghub.no/ep/schema/well#LeakyWellBore> 3020 sp:arg3 <http://www.reportinghub.no/ep/schema/well#LeakyWellBore>
...@@ -3034,7 +3035,7 @@ ep-spin-lib:selectWellCementJobBottomPlugType ...@@ -3034,7 +3035,7 @@ ep-spin-lib:selectWellCementJobBottomPlugType
3034 [ rdf:type sp:if ; 3035 [ rdf:type sp:if ;
3035 sp:arg1 [ rdf:type sp:eq ; 3036 sp:arg1 [ rdf:type sp:eq ;
3036 sp:arg1 spin:_arg1 ; 3037 sp:arg1 spin:_arg1 ;
3037 - sp:arg2 "true"^^ddr:LogicalBooleanDatatype 3038 + sp:arg2 "true"^^xsd:boolean
3038 ] ; 3039 ] ;
3039 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithBottomPlug> ; 3040 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithBottomPlug> ;
3040 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutBottomPlug> 3041 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutBottomPlug>
...@@ -3055,7 +3056,7 @@ ep-spin-lib:selectWellCementJobCasingReciprocationType ...@@ -3055,7 +3056,7 @@ ep-spin-lib:selectWellCementJobCasingReciprocationType
3055 [ rdf:type sp:if ; 3056 [ rdf:type sp:if ;
3056 sp:arg1 [ rdf:type sp:eq ; 3057 sp:arg1 [ rdf:type sp:eq ;
3057 sp:arg1 spin:_arg1 ; 3058 sp:arg1 spin:_arg1 ;
3058 - sp:arg2 "true"^^ddr:LogicalBooleanDatatype 3059 + sp:arg2 "true"^^xsd:boolean
3059 ] ; 3060 ] ;
3060 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithCasingReciprocation> ; 3061 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithCasingReciprocation> ;
3061 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutCasingReciprocation> 3062 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutCasingReciprocation>
...@@ -3076,7 +3077,7 @@ ep-spin-lib:selectWellCementJobCasingRotationType ...@@ -3076,7 +3077,7 @@ ep-spin-lib:selectWellCementJobCasingRotationType
3076 [ rdf:type sp:if ; 3077 [ rdf:type sp:if ;
3077 sp:arg1 [ rdf:type sp:eq ; 3078 sp:arg1 [ rdf:type sp:eq ;
3078 sp:arg1 spin:_arg1 ; 3079 sp:arg1 spin:_arg1 ;
3079 - sp:arg2 "true"^^ddr:LogicalBooleanDatatype 3080 + sp:arg2 "true"^^xsd:boolean
3080 ] ; 3081 ] ;
3081 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithCasingRotation> ; 3082 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithCasingRotation> ;
3082 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutCasingRotation> 3083 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutCasingRotation>
...@@ -3097,7 +3098,7 @@ ep-spin-lib:selectWellCementJobFloatHoldingType ...@@ -3097,7 +3098,7 @@ ep-spin-lib:selectWellCementJobFloatHoldingType
3097 [ rdf:type sp:if ; 3098 [ rdf:type sp:if ;
3098 sp:arg1 [ rdf:type sp:eq ; 3099 sp:arg1 [ rdf:type sp:eq ;
3099 sp:arg1 spin:_arg1 ; 3100 sp:arg1 spin:_arg1 ;
3100 - sp:arg2 "true"^^ddr:LogicalBooleanDatatype 3101 + sp:arg2 "true"^^xsd:boolean
3101 ] ; 3102 ] ;
3102 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithFloatHolding> ; 3103 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithFloatHolding> ;
3103 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutFloatHolding> 3104 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutFloatHolding>
...@@ -3118,7 +3119,7 @@ ep-spin-lib:selectWellCementJobPlugBumpingType ...@@ -3118,7 +3119,7 @@ ep-spin-lib:selectWellCementJobPlugBumpingType
3118 [ rdf:type sp:if ; 3119 [ rdf:type sp:if ;
3119 sp:arg1 [ rdf:type sp:eq ; 3120 sp:arg1 [ rdf:type sp:eq ;
3120 sp:arg1 spin:_arg1 ; 3121 sp:arg1 spin:_arg1 ;
3121 - sp:arg2 "true"^^ddr:LogicalBooleanDatatype 3122 + sp:arg2 "true"^^xsd:boolean
3122 ] ; 3123 ] ;
3123 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithPlugBumping> ; 3124 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithPlugBumping> ;
3124 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutPlugBumping> 3125 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutPlugBumping>
...@@ -3139,7 +3140,7 @@ ep-spin-lib:selectWellCementJobTopPlugType ...@@ -3139,7 +3140,7 @@ ep-spin-lib:selectWellCementJobTopPlugType
3139 [ rdf:type sp:if ; 3140 [ rdf:type sp:if ;
3140 sp:arg1 [ rdf:type sp:eq ; 3141 sp:arg1 [ rdf:type sp:eq ;
3141 sp:arg1 spin:_arg1 ; 3142 sp:arg1 spin:_arg1 ;
3142 - sp:arg2 "true"^^ddr:LogicalBooleanDatatype 3143 + sp:arg2 "true"^^xsd:boolean
3143 ] ; 3144 ] ;
3144 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithTopPlug> ; 3145 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithTopPlug> ;
3145 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutTopPlug> 3146 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WellCementJobWithoutTopPlug>
...@@ -3328,7 +3329,7 @@ ep-spin-lib:selectWirelineFormationTestGoodnessOfSealType ...@@ -3328,7 +3329,7 @@ ep-spin-lib:selectWirelineFormationTestGoodnessOfSealType
3328 [ rdf:type sp:if ; 3329 [ rdf:type sp:if ;
3329 sp:arg1 [ rdf:type sp:eq ; 3330 sp:arg1 [ rdf:type sp:eq ;
3330 sp:arg1 spin:_arg1 ; 3331 sp:arg1 spin:_arg1 ;
3331 - sp:arg2 "true"^^ddr:LogicalBooleanDatatype 3332 + sp:arg2 "true"^^xsd:boolean
3332 ] ; 3333 ] ;
3333 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WirelineFormationTestWithGoodSeal> ; 3334 sp:arg2 <http://www.reportinghub.no/ep/schema/activity#WirelineFormationTestWithGoodSeal> ;
3334 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WirelineFormationTestWithoutGoodSeal> 3335 sp:arg3 <http://www.reportinghub.no/ep/schema/activity#WirelineFormationTestWithoutGoodSeal>
...@@ -3377,6 +3378,9 @@ ddr:TTUC_Enumeration_1 ...@@ -3377,6 +3378,9 @@ ddr:TTUC_Enumeration_1
3377 rdfs:label "Enumeration"^^xsd:string ; 3378 rdfs:label "Enumeration"^^xsd:string ;
3378 dtype:value ddr:TTUC_degC . 3379 dtype:value ddr:TTUC_degC .
3379 3380
3381 +_:b83
3382 + sp:varName "wellCementJobTopPlugType"^^xsd:string .
3383 +
3380 _:b89 3384 _:b89
3381 sp:varName "yieldPointScale"^^xsd:string . 3385 sp:varName "yieldPointScale"^^xsd:string .
3382 3386
...@@ -3395,9 +3399,6 @@ _:b85 ...@@ -3395,9 +3399,6 @@ _:b85
3395 _:b84 3399 _:b84
3396 sp:varName "wellCementJobType"^^xsd:string . 3400 sp:varName "wellCementJobType"^^xsd:string .
3397 3401
3398 -_:b83
3399 - sp:varName "wellCementJobTopPlugType"^^xsd:string .
3400 -
3401 _:b82 3402 _:b82
3402 sp:varName "wellCementJobPlugBumpingType"^^xsd:string . 3403 sp:varName "wellCementJobPlugBumpingType"^^xsd:string .
3403 3404
......
1 +# Saved by TopBraid on Sun Oct 02 17:49:40 BST 2011
1 # baseURI: null 2 # baseURI: null
2 3
3 @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 Sep 18 11:11:55 BST 2011 1 +# Saved by TopBraid on Sun Oct 02 20:21:25 BST 2011
2 # baseURI: http://www.reportinghub.no/test/ddr/TEST_ddr-xml-ingest 2 # baseURI: http://www.reportinghub.no/test/ddr/TEST_ddr-xml-ingest
3 # imports: http://spinrdf.org/spin 3 # imports: http://spinrdf.org/spin
4 # imports: http://www.reportinghub.no/ep/transform/1.1/ddr/collector 4 # imports: http://www.reportinghub.no/ep/transform/1.1/ddr/collector
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
15 15
16 <http://www.reportinghub.no/test/ddr/TEST_ddr-xml-ingest> 16 <http://www.reportinghub.no/test/ddr/TEST_ddr-xml-ingest>
17 rdf:type owl:Ontology ; 17 rdf:type owl:Ontology ;
18 - owl:imports <http://www.reportinghub.no/ep/transform/1.1/ddr/collector> , <http://spinrdf.org/spin> ; 18 + owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/transform/1.1/ddr/collector> ;
19 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 19 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......
1 -# Saved by TopBraid on Sun Sep 18 11:11:55 BST 2011 1 +# Saved by TopBraid on Sun Oct 02 20:21:25 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#> .
...@@ -13,5 +13,7 @@ ...@@ -13,5 +13,7 @@
13 [] rdf:type inference:Configuration ; 13 [] rdf:type inference:Configuration ;
14 composite:child 14 composite:child
15 [ rdf:type <http://spinrdf.org/spin#TopSPIN> ; 15 [ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
16 + <http://spinrdf.org/spin#topSPINOptions>
17 + "singlePass" ;
16 composite:index "0"^^xsd:int 18 composite:index "0"^^xsd:int
17 ] . 19 ] .
......