Skip to content

Commit 8d0a706

Browse files
dachafradachafra
authored
Merge pull request #254 from dachafra/defaultGraph
adding rml:defaultGraph (solves #253)
2 parents 83becaf + f529764 commit 8d0a706

7 files changed

Lines changed: 116 additions & 40 deletions

File tree

‎ontology/documentation/ontology.jsonld‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,9 @@
598598
"http://www.w3.org/2000/01/rdf-schema#range" : [ {
599599
"@id" : "http://w3id.org/rml/DatatypeMap"
600600
} ]
601+
}, {
602+
"@id" : "http://w3id.org/rml/defaultGraph",
603+
"@type" : [ "http://www.w3.org/2002/07/owl#NamedIndividual" ]
601604
}, {
602605
"@id" : "http://w3id.org/rml/graph",
603606
"@type" : [ "http://www.w3.org/2002/07/owl#ObjectProperty" ],

‎ontology/documentation/ontology.nt‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
<http://w3id.org/rml/class> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> .
109109
<http://w3id.org/rml/class> <http://www.w3.org/2000/01/rdf-schema#domain> <http://w3id.org/rml/SubjectMap> .
110110
<http://w3id.org/rml/class> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2000/01/rdf-schema#Class> .
111-
<http://www.w3.org/2000/01/rdf-schema#Class> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
112111
<http://w3id.org/rml/class> <http://www.w3.org/2000/01/rdf-schema#comment> "The subject value generated for a logical source record will be asserted as an instance of this RDFS class."@en .
113112
<http://w3id.org/rml/class> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://w3id.org/rml/core/> .
114113
<http://w3id.org/rml/class> <http://www.w3.org/2000/01/rdf-schema#label> "class" .
@@ -513,5 +512,18 @@ _:genid7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/20
513512
<http://w3id.org/rml/UnsafeURI> <http://www.w3.org/2000/01/rdf-schema#label> "Unsafe URI" .
514513
#
515514
# http://www.w3.org/2000/01/rdf-schema#Class
515+
<http://www.w3.org/2000/01/rdf-schema#Class> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
516+
#
517+
#
518+
#
519+
# #################################################################
520+
# #
521+
# # Individuals
522+
# #
523+
# #################################################################
524+
#
525+
#
526+
# http://w3id.org/rml/defaultGraph
527+
<http://w3id.org/rml/defaultGraph> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#NamedIndividual> .
516528
#
517529
# Generated by the OWL API (version 5.1.18) https://github.com/owlcs/owlapi/

‎ontology/documentation/ontology.owl‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,25 @@
860860

861861

862862
<owl:Class rdf:about="http://www.w3.org/2000/01/rdf-schema#Class"/>
863+
864+
865+
866+
<!--
867+
///////////////////////////////////////////////////////////////////////////////////////
868+
//
869+
// Individuals
870+
//
871+
///////////////////////////////////////////////////////////////////////////////////////
872+
-->
873+
874+
875+
876+
877+
878+
<!-- http://w3id.org/rml/defaultGraph -->
879+
880+
881+
<owl:NamedIndividual rdf:about="http://w3id.org/rml/defaultGraph"/>
863882
</rdf:RDF>
864883

865884

‎ontology/documentation/ontology.ttl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,4 +552,12 @@
552552
rdfs:Class rdf:type owl:Class .
553553

554554

555+
#################################################################
556+
# Individuals
557+
#################################################################
558+
559+
### http://w3id.org/rml/defaultGraph
560+
<http://w3id.org/rml/defaultGraph> rdf:type owl:NamedIndividual .
561+
562+
555563
### Generated by the OWL API (version 5.1.18) https://github.com/owlcs/owlapi/

‎ontology/documentation/sections/crossref-en.html‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -957,8 +957,8 @@ <h3>graph<sup class="type-op" title="object property">op</sup>
957957
<dt>has domain</dt>
958958
<dd>
959959
<a href="#PredicateObjectMap" title="http://w3id.org/rml/PredicateObjectMap">Predicate Object Map</a>
960-
<sup class="type-c" title="class">c</sup>
961-
<span class="logic">or</span>
960+
<sup class="type-c" title="class">c</sup>
961+
<span class="logic">or</span>
962962
<a href="#SubjectMap" title="http://w3id.org/rml/SubjectMap">Subject Map</a>
963963
<sup class="type-c" title="class">c</sup>
964964
</dd>
@@ -986,8 +986,8 @@ <h3>graph map<sup class="type-op" title="object property">op</sup>
986986
<dt>has domain</dt>
987987
<dd>
988988
<a href="#PredicateObjectMap" title="http://w3id.org/rml/PredicateObjectMap">Predicate Object Map</a>
989-
<sup class="type-c" title="class">c</sup>
990-
<span class="logic">or</span>
989+
<sup class="type-c" title="class">c</sup>
990+
<span class="logic">or</span>
991991
<a href="#SubjectMap" title="http://w3id.org/rml/SubjectMap">Subject Map</a>
992992
<sup class="type-c" title="class">c</sup>
993993
</dd>
@@ -1429,20 +1429,20 @@ <h3>term type<sup class="type-op" title="object property">op</sup>
14291429
<dt>has range</dt>
14301430
<dd>
14311431
<a href="#BlankNode" title="http://w3id.org/rml/BlankNode">Blank Node</a>
1432-
<sup class="type-c" title="class">c</sup>
1433-
<span class="logic">or</span>
1432+
<sup class="type-c" title="class">c</sup>
1433+
<span class="logic">or</span>
14341434
<a href="#IRI" title="http://w3id.org/rml/IRI">IRI</a>
1435-
<sup class="type-c" title="class">c</sup>
1436-
<span class="logic">or</span>
1435+
<sup class="type-c" title="class">c</sup>
1436+
<span class="logic">or</span>
14371437
<a href="#Literal" title="http://w3id.org/rml/Literal">Literal</a>
1438-
<sup class="type-c" title="class">c</sup>
1439-
<span class="logic">or</span>
1438+
<sup class="type-c" title="class">c</sup>
1439+
<span class="logic">or</span>
14401440
<a href="#URI" title="http://w3id.org/rml/URI">URI</a>
1441-
<sup class="type-c" title="class">c</sup>
1442-
<span class="logic">or</span>
1441+
<sup class="type-c" title="class">c</sup>
1442+
<span class="logic">or</span>
14431443
<a href="#UnsafeIRI" title="http://w3id.org/rml/UnsafeIRI">Unsafe IRI</a>
1444-
<sup class="type-c" title="class">c</sup>
1445-
<span class="logic">or</span>
1444+
<sup class="type-c" title="class">c</sup>
1445+
<span class="logic">or</span>
14461446
<a href="#UnsafeURI" title="http://w3id.org/rml/UnsafeURI">Unsafe URI</a>
14471447
<sup class="type-c" title="class">c</sup>
14481448
</dd>
@@ -1657,11 +1657,23 @@ <h3>template<sup class="type-dp" title="data property">dp</sup>
16571657
</dl>
16581658
</div>
16591659
</div>
1660+
</div><div xmlns:widoco="https://w3id.org/widoco/vocab#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="namedindividuals">
1661+
<h3 id="namedindividuals" class="list">Named Individuals</h3>
1662+
<ul class="hlist">
1663+
<li><a href="#defaultGraph" title="http://w3id.org/rml/defaultGraph"> <span>default Graph</span> </a></li>
1664+
</ul>
1665+
<div class="entity" id="defaultGraph">
1666+
<h3>default Graph<sup class="type-ni" title="named individual">ni</sup> <span class="backlink"> back to <a href="#toc">ToC</a> or <a href="#namedindividuals">Named Individual ToC</a> </span></h3>
1667+
<p><strong>IRI:</strong> http://w3id.org/rml/defaultGraph</p>
1668+
<div class="comment">
1669+
<span class="markdown">Denotes a default graph</span>
1670+
</div>
1671+
</div>
16601672
</div><div id="legend">
16611673
<h2>Legend <span class="backlink"> back to <a href="#toc">ToC</a></span></h2>
16621674
<div class="entity">
16631675
<sup class="type-c" title="Classes">c</sup>: Classes <br/>
16641676
<sup class="type-op" title="Object Properties">op</sup>: Object Properties <br/>
16651677
<sup class="type-dp" title="Data Properties">dp</sup>: Data Properties <br/>
16661678
</div>
1667-
</div>
1679+
</div>

‎ontology/documentation/sections/overview-en.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,12 @@ <h4>Classes</h4>
161161
<li>
162162
<a href="#template" title="http://w3id.org/rml/template">template</a>
163163
</li>
164+
</ul><h4>Named Individuals</h4><ul xmlns:widoco="https://w3id.org/widoco/vocab#"
165+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
166+
class="hlist">
167+
<li>
168+
<a href="#defaultGraph" title="http://w3id.org/rml/defaultGraph">
169+
<span>default Graph</span>
170+
</a>
171+
</li>
164172
</ul>

‎ontology/rml-core.owl‎

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,6 @@ foaf:name rdf:type owl:AnnotationProperty .
134134
rdfs:comment "The subject value generated for a logical source record will be asserted as an instance of this RDFS class."@en ;
135135
rdfs:isDefinedBy <http://w3id.org/rml/core/> ;
136136
rdfs:label "class" .
137-
138-
139-
### http://w3id.org/rml/strategy
140-
:strategy rdf:type owl:ObjectProperty ;
141-
rdfs:range :Strategy ;
142-
rdfs:comment "A Strategy element to indicate how to perform an action (e.g. gather for collections and containers, join)."@en ;
143-
rdfs:isDefinedBy <http://w3id.org/rml/core/> ;
144-
rdfs:label "strategy" .
145137

146138

147139
### http://w3id.org/rml/datatype
@@ -186,14 +178,6 @@ foaf:name rdf:type owl:AnnotationProperty .
186178
rdfs:label "graph map" .
187179

188180

189-
### http://w3id.org/rml/iterator
190-
:iterator rdf:type owl:DatatypeProperty ;
191-
rdfs:domain :Iterable ;
192-
rdfs:isDefinedBy <http://w3id.org/rml/core/> ;
193-
rdfs:comment "An expression qualified according to the reference formulation that defines a sequence of logical iterations on the data source."@en ;
194-
rdfs:label "iterator" .
195-
196-
197181
### http://w3id.org/rml/joinCondition
198182
:joinCondition rdf:type owl:ObjectProperty ;
199183
rdfs:range :Join ;
@@ -289,6 +273,14 @@ foaf:name rdf:type owl:AnnotationProperty .
289273
rdfs:label "reference formulation" .
290274

291275

276+
### http://w3id.org/rml/strategy
277+
:strategy rdf:type owl:ObjectProperty ;
278+
rdfs:range :Strategy ;
279+
rdfs:comment "A Strategy element to indicate how to perform an action (e.g. gather for collections and containers, join)."@en ;
280+
rdfs:isDefinedBy <http://w3id.org/rml/core/> ;
281+
rdfs:label "strategy" .
282+
283+
292284
### http://w3id.org/rml/subject
293285
:subject rdf:type owl:ObjectProperty ;
294286
rdfs:domain :TriplesMap ;
@@ -297,13 +289,6 @@ foaf:name rdf:type owl:AnnotationProperty .
297289
rdfs:label "subject" .
298290

299291

300-
### http://w3id.org/rml/Strategy
301-
:Strategy rdf:type owl:Class ;
302-
rdfs:comment "Denotes a strategy to perform a action (e.g. gather for collections and containers, joins)."@en ;
303-
rdfs:isDefinedBy <http://w3id.org/rml/core/> ;
304-
rdfs:label "Strategy" .
305-
306-
307292
### http://w3id.org/rml/subjectMap
308293
:subjectMap rdf:type owl:ObjectProperty ;
309294
rdfs:domain :TriplesMap ;
@@ -343,6 +328,14 @@ foaf:name rdf:type owl:AnnotationProperty .
343328
rdfs:label "child" .
344329

345330

331+
### http://w3id.org/rml/iterator
332+
:iterator rdf:type owl:DatatypeProperty ;
333+
rdfs:domain :Iterable ;
334+
rdfs:comment "An expression qualified according to the reference formulation that defines a sequence of logical iterations on the data source."@en ;
335+
rdfs:isDefinedBy <http://w3id.org/rml/core/> ;
336+
rdfs:label "iterator" .
337+
338+
346339
### http://w3id.org/rml/language
347340
:language rdf:type owl:DatatypeProperty ;
348341
rdfs:domain :ObjectMap ;
@@ -464,6 +457,7 @@ foaf:name rdf:type owl:AnnotationProperty .
464457
rdfs:isDefinedBy <http://w3id.org/rml/core/> ;
465458
rdfs:label "Literal" .
466459

460+
467461
### http://w3id.org/rml/ObjectMap
468462
:ObjectMap rdf:type owl:Class ;
469463
rdfs:subClassOf :TermMap ;
@@ -509,6 +503,13 @@ foaf:name rdf:type owl:AnnotationProperty .
509503
rdfs:label "Reference Formulation" .
510504

511505

506+
### http://w3id.org/rml/Strategy
507+
:Strategy rdf:type owl:Class ;
508+
rdfs:comment "Denotes a strategy to perform a action (e.g. gather for collections and containers, joins)."@en ;
509+
rdfs:isDefinedBy <http://w3id.org/rml/core/> ;
510+
rdfs:label "Strategy" .
511+
512+
512513
### http://w3id.org/rml/SubjectMap
513514
:SubjectMap rdf:type owl:Class ;
514515
rdfs:subClassOf :TermMap ;
@@ -553,4 +554,17 @@ foaf:name rdf:type owl:AnnotationProperty .
553554
rdfs:label "Unsafe URI" .
554555

555556

556-
### Generated by the OWL API (version 4.5.29.2024-05-13T12:11:03Z) https://github.com/owlcs/owlapi
557+
### http://www.w3.org/2000/01/rdf-schema#Class
558+
rdfs:Class rdf:type owl:Class .
559+
560+
561+
#################################################################
562+
# Individuals
563+
#################################################################
564+
565+
### http://w3id.org/rml/core/defaultGraph
566+
:defaultGraph rdf:type owl:NamedIndividual ;
567+
rdfs:comment "Denotes a default graph" .
568+
569+
570+
### Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi

0 commit comments

Comments
 (0)