Showing
4 changed files
with
47 additions
and
47 deletions
... | @@ -34,7 +34,7 @@ ddr:Obj_drillReport | ... | @@ -34,7 +34,7 @@ ddr:Obj_drillReport |
34 | ] [ sp:object spin:_this ; | 34 | ] [ sp:object spin:_this ; |
35 | sp:predicate spin:violationRoot ; | 35 | sp:predicate spin:violationRoot ; |
36 | sp:subject _:b1 | 36 | sp:subject _:b1 |
37 | - ] [ sp:object ddr:nameWellbore ; | 37 | + ] [ sp:object ddr:nameWell ; |
38 | sp:predicate spin:violationPath ; | 38 | sp:predicate spin:violationPath ; |
39 | sp:subject _:b1 | 39 | sp:subject _:b1 |
40 | ] [ sp:object | 40 | ] [ sp:object |
... | @@ -44,33 +44,35 @@ ddr:Obj_drillReport | ... | @@ -44,33 +44,35 @@ ddr:Obj_drillReport |
44 | sp:subject _:b1 | 44 | sp:subject _:b1 |
45 | ]) ; | 45 | ]) ; |
46 | sp:where ([ sp:object | 46 | sp:where ([ sp:object |
47 | - [ sp:varName "wellBoreName"^^xsd:string | 47 | + [ sp:varName "wellName"^^xsd:string |
48 | ] ; | 48 | ] ; |
49 | - sp:predicate <http://www.reportinghub.no/ep/spin/lib#nameWellbore> ; | 49 | + sp:predicate <http://www.reportinghub.no/ep/spin/lib#nameWell> ; |
50 | sp:subject spin:_this | 50 | sp:subject spin:_this |
51 | ] [ rdf:type sp:Bind ; | 51 | ] [ rdf:type sp:Bind ; |
52 | sp:expression | 52 | sp:expression |
53 | - [ rdf:type rhspin:wellBoreByName ; | 53 | + [ rdf:type rhspin:wellByName ; |
54 | - arg:wellBoreName | 54 | + arg:wellName |
55 | - [ sp:varName "wellBoreName"^^xsd:string | 55 | + [ sp:varName "wellName"^^xsd:string |
56 | ] | 56 | ] |
57 | ] ; | 57 | ] ; |
58 | sp:variable | 58 | sp:variable |
59 | - [ sp:varName "wellBore"^^xsd:string | 59 | + [ sp:varName "well"^^xsd:string |
60 | ] | 60 | ] |
61 | ] [ rdf:type sp:Filter ; | 61 | ] [ rdf:type sp:Filter ; |
62 | sp:expression | 62 | sp:expression |
63 | [ rdf:type sp:not ; | 63 | [ rdf:type sp:not ; |
64 | - sp:arg1 [ rdf:type sp:bound ; | 64 | + sp:arg1 [ rdf:type rhspin:npdTripleExists ; |
65 | - sp:arg1 [ sp:varName "wellBore"^^xsd:string | 65 | + sp:arg1 [ sp:varName "well"^^xsd:string |
66 | - ] | 66 | + ] ; |
67 | + sp:arg2 rdf:type ; | ||
68 | + sp:arg3 <http://www.reportinghub.no/ep/schema/well#Well> | ||
67 | ] | 69 | ] |
68 | ] | 70 | ] |
69 | ] [ rdf:type sp:Bind ; | 71 | ] [ rdf:type sp:Bind ; |
70 | sp:expression | 72 | sp:expression |
71 | [ rdf:type fn:concat ; | 73 | [ rdf:type fn:concat ; |
72 | - sp:arg1 "Unregistered well bore name " ; | 74 | + sp:arg1 "Unregistered well name " ; |
73 | - sp:arg2 [ sp:varName "wellBoreName"^^xsd:string | 75 | + sp:arg2 [ sp:varName "wellName"^^xsd:string |
74 | ] | 76 | ] |
75 | ] ; | 77 | ] ; |
76 | sp:variable | 78 | sp:variable |
... | @@ -79,26 +81,6 @@ ddr:Obj_drillReport | ... | @@ -79,26 +81,6 @@ ddr:Obj_drillReport |
79 | ]) | 81 | ]) |
80 | ] ; | 82 | ] ; |
81 | spin:constraint | 83 | spin:constraint |
82 | - [ rdf:type sp:Ask ; | ||
83 | - rdfs:comment "DDRs can only be submitted if a user is logged in"^^xsd:string ; | ||
84 | - sp:where ([ rdf:type sp:Bind ; | ||
85 | - sp:expression | ||
86 | - [ rdf:type rhspin:companyName | ||
87 | - ] ; | ||
88 | - sp:variable | ||
89 | - [ sp:varName "companyName"^^xsd:string | ||
90 | - ] | ||
91 | - ] [ rdf:type sp:Filter ; | ||
92 | - sp:expression | ||
93 | - [ rdf:type sp:not ; | ||
94 | - sp:arg1 [ rdf:type sp:bound ; | ||
95 | - sp:arg1 [ sp:varName "companyName"^^xsd:string | ||
96 | - ] | ||
97 | - ] | ||
98 | - ] | ||
99 | - ]) | ||
100 | - ] ; | ||
101 | - spin:constraint | ||
102 | [ rdf:type sp:Construct ; | 84 | [ rdf:type sp:Construct ; |
103 | sp:templates ([ sp:object spin:ConstraintViolation ; | 85 | sp:templates ([ sp:object spin:ConstraintViolation ; |
104 | sp:predicate rdf:type ; | 86 | sp:predicate rdf:type ; |
... | @@ -106,7 +88,7 @@ ddr:Obj_drillReport | ... | @@ -106,7 +88,7 @@ ddr:Obj_drillReport |
106 | ] [ sp:object spin:_this ; | 88 | ] [ sp:object spin:_this ; |
107 | sp:predicate spin:violationRoot ; | 89 | sp:predicate spin:violationRoot ; |
108 | sp:subject _:b2 | 90 | sp:subject _:b2 |
109 | - ] [ sp:object ddr:nameWell ; | 91 | + ] [ sp:object ddr:nameWellbore ; |
110 | sp:predicate spin:violationPath ; | 92 | sp:predicate spin:violationPath ; |
111 | sp:subject _:b2 | 93 | sp:subject _:b2 |
112 | ] [ sp:object | 94 | ] [ sp:object |
... | @@ -116,39 +98,57 @@ ddr:Obj_drillReport | ... | @@ -116,39 +98,57 @@ ddr:Obj_drillReport |
116 | sp:subject _:b2 | 98 | sp:subject _:b2 |
117 | ]) ; | 99 | ]) ; |
118 | sp:where ([ sp:object | 100 | sp:where ([ sp:object |
119 | - [ sp:varName "wellName"^^xsd:string | 101 | + [ sp:varName "wellBoreName"^^xsd:string |
120 | ] ; | 102 | ] ; |
121 | - sp:predicate ddr:nameWell ; | 103 | + sp:predicate <http://www.reportinghub.no/ep/spin/lib#nameWellbore> ; |
122 | sp:subject spin:_this | 104 | sp:subject spin:_this |
123 | ] [ rdf:type sp:Bind ; | 105 | ] [ rdf:type sp:Bind ; |
124 | sp:expression | 106 | sp:expression |
125 | - [ rdf:type rhspin:wellByName ; | 107 | + [ rdf:type rhspin:wellBoreByName ; |
126 | - arg:wellName | 108 | + arg:wellBoreName |
127 | - [ sp:varName "wellName"^^xsd:string | 109 | + [ sp:varName "wellBoreName"^^xsd:string |
128 | ] | 110 | ] |
129 | ] ; | 111 | ] ; |
130 | sp:variable | 112 | sp:variable |
131 | - [ sp:varName "well"^^xsd:string | 113 | + [ sp:varName "wellBore"^^xsd:string |
132 | ] | 114 | ] |
133 | ] [ rdf:type sp:Filter ; | 115 | ] [ rdf:type sp:Filter ; |
134 | sp:expression | 116 | sp:expression |
135 | [ rdf:type sp:not ; | 117 | [ rdf:type sp:not ; |
136 | - sp:arg1 [ rdf:type rhspin:npdTripleExists ; | 118 | + sp:arg1 [ rdf:type sp:bound ; |
137 | - sp:arg1 [ sp:varName "well"^^xsd:string | 119 | + sp:arg1 [ sp:varName "wellBore"^^xsd:string |
138 | - ] ; | 120 | + ] |
139 | - sp:arg2 rdf:type ; | ||
140 | - sp:arg3 <http://www.reportinghub.no/ep/schema/well#Well> | ||
141 | ] | 121 | ] |
142 | ] | 122 | ] |
143 | ] [ rdf:type sp:Bind ; | 123 | ] [ rdf:type sp:Bind ; |
144 | sp:expression | 124 | sp:expression |
145 | [ rdf:type fn:concat ; | 125 | [ rdf:type fn:concat ; |
146 | - sp:arg1 "Unregistered well name " ; | 126 | + sp:arg1 "Unregistered well bore name " ; |
147 | - sp:arg2 [ sp:varName "wellName"^^xsd:string | 127 | + sp:arg2 [ sp:varName "wellBoreName"^^xsd:string |
148 | ] | 128 | ] |
149 | ] ; | 129 | ] ; |
150 | sp:variable | 130 | sp:variable |
151 | [ sp:varName "message"^^xsd:string | 131 | [ sp:varName "message"^^xsd:string |
152 | ] | 132 | ] |
153 | ]) | 133 | ]) |
134 | + ] ; | ||
135 | + spin:constraint | ||
136 | + [ rdf:type sp:Ask ; | ||
137 | + rdfs:comment "DDRs can only be submitted if a user is logged in"^^xsd:string ; | ||
138 | + sp:where ([ rdf:type sp:Bind ; | ||
139 | + sp:expression | ||
140 | + [ rdf:type rhspin:companyName | ||
141 | + ] ; | ||
142 | + sp:variable | ||
143 | + [ sp:varName "companyName"^^xsd:string | ||
144 | + ] | ||
145 | + ] [ rdf:type sp:Filter ; | ||
146 | + sp:expression | ||
147 | + [ rdf:type sp:not ; | ||
148 | + sp:arg1 [ rdf:type sp:bound ; | ||
149 | + sp:arg1 [ sp:varName "companyName"^^xsd:string | ||
150 | + ] | ||
151 | + ] | ||
152 | + ] | ||
153 | + ]) | ||
154 | ] . | 154 | ] . | ... | ... |
This diff could not be displayed because it is too large.
This diff is collapsed. Click to expand it.
... | @@ -416,7 +416,7 @@ Classify a DailyDrillingReport"""^^xsd:string ; | ... | @@ -416,7 +416,7 @@ Classify a DailyDrillingReport"""^^xsd:string ; |
416 | ] [ sp:object | 416 | ] [ sp:object |
417 | [ sp:varName "nameWell"^^xsd:string | 417 | [ sp:varName "nameWell"^^xsd:string |
418 | ] ; | 418 | ] ; |
419 | - sp:predicate ddr:nameWell ; | 419 | + sp:predicate ep-spin-lib:nameWell ; |
420 | sp:subject spin:_this | 420 | sp:subject spin:_this |
421 | ] [ sp:object | 421 | ] [ sp:object |
422 | [ sp:varName "dTimStart"^^xsd:string | 422 | [ sp:varName "dTimStart"^^xsd:string | ... | ... |
-
Please register or login to post a comment