Skip to content

Commit 4f3377f

Browse files
committed
Use new paging property names.
This change breaks compatibility with existing clients. It follows a breaking change in the Hydra Core Vocabulary (HydraCG/Specifications@225aa51) that renames the paging properties from hydra:nextPage to hydra:next.
1 parent cccc24f commit 4f3377f

17 files changed

+51
-51
lines changed

lib/views/triplepatternfragments/TriplePatternFragmentsRdfView.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ TriplePatternFragmentsRdfView.prototype._generateRdf = function (settings, data,
6565

6666
// Page metadata
6767
metadata(fragment.pageUrl, hydra + 'itemsPerPage', '"' + query.limit + '"^^' + xsd + 'integer');
68-
metadata(fragment.pageUrl, hydra + 'firstPage', fragment.firstPageUrl);
68+
metadata(fragment.pageUrl, hydra + 'first', fragment.firstPageUrl);
6969
if (query.offset)
70-
metadata(fragment.pageUrl, hydra + 'previousPage', fragment.previousPageUrl);
70+
metadata(fragment.pageUrl, hydra + 'previous', fragment.previousPageUrl);
7171
if (totalCount >= query.limit + (query.offset || 0))
72-
metadata(fragment.pageUrl, hydra + 'nextPage', fragment.nextPageUrl);
72+
metadata(fragment.pageUrl, hydra + 'next', fragment.nextPageUrl);
7373

7474
// End if both the metadata and the data have been written
7575
metadataDone = true;

lib/views/triplepatternfragments/fragment.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ <h3>Matches in <%= datasource.title %> for <em class="pattern"><%= query.pattern
105105
-%>
106106
<ul class="links">
107107
<% if (hasPrev) { -%>
108-
<li><a href="<%= fragment.firstPageUrl %>" rel="first" property="hydra:firstPage">first</a></li>
109-
<li><a href="<%= fragment.previousPageUrl %>" rel="prev" property="hydra:previousPage">previous</a></li>
108+
<li><a href="<%= fragment.firstPageUrl %>" rel="first" property="hydra:first">first</a></li>
109+
<li><a href="<%= fragment.previousPageUrl %>" rel="prev" property="hydra:previous">previous</a></li>
110110
<% } -%>
111111
<% if (hasNext) { -%>
112-
<li><a href="<%= fragment.nextPageUrl %>" rel="next" property="hydra:nextPage">next</a></li>
112+
<li><a href="<%= fragment.nextPageUrl %>" rel="next" property="hydra:next">next</a></li>
113113
<% } -%>
114114
</ul>
115115
<%

test/assets/basic-fragment-metadata-last.jsonld

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@
9292
"@value": "Linked Data Fragment of My data"
9393
},
9494
"void:triples": 1234,
95-
"hydra:firstPage": {
95+
"hydra:first": {
9696
"@id": "http://ex.org/data?fragment&page=1"
9797
},
9898
"hydra:itemsPerPage": 100,
99-
"hydra:nextPage": {
99+
"hydra:next": {
100100
"@id": "http://ex.org/data?fragment&page=4"
101101
},
102-
"hydra:previousPage": {
102+
"hydra:previous": {
103103
"@id": "http://ex.org/data?fragment&page=2"
104104
},
105105
"hydra:totalItems": 1234

test/assets/basic-fragment-metadata-last.nq

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ _:object <http://www.w3.org/ns/hydra/core#property> <http://www.w3.org/1999/02/2
2828
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#totalItems> "1234"^^<http://www.w3.org/2001/XMLSchema#integer> <http://ex.org/data?fragment#metadata>.
2929
<http://ex.org/data?fragment&page=3> <http://rdfs.org/ns/void#triples> "1234"^^<http://www.w3.org/2001/XMLSchema#integer> <http://ex.org/data?fragment#metadata>.
3030
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#itemsPerPage> "100"^^<http://www.w3.org/2001/XMLSchema#integer> <http://ex.org/data?fragment#metadata>.
31-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#firstPage> <http://ex.org/data?fragment&page=1> <http://ex.org/data?fragment#metadata>.
32-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#previousPage> <http://ex.org/data?fragment&page=2> <http://ex.org/data?fragment#metadata>.
33-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#nextPage> <http://ex.org/data?fragment&page=4> <http://ex.org/data?fragment#metadata>.
31+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#first> <http://ex.org/data?fragment&page=1> <http://ex.org/data?fragment#metadata>.
32+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#previous> <http://ex.org/data?fragment&page=2> <http://ex.org/data?fragment#metadata>.
33+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#next> <http://ex.org/data?fragment&page=4> <http://ex.org/data?fragment#metadata>.

test/assets/basic-fragment-metadata-last.nt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ _:object <http://www.w3.org/ns/hydra/core#property> <http://www.w3.org/1999/02/2
2727
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#totalItems> "1234"^^<http://www.w3.org/2001/XMLSchema#integer>.
2828
<http://ex.org/data?fragment&page=3> <http://rdfs.org/ns/void#triples> "1234"^^<http://www.w3.org/2001/XMLSchema#integer>.
2929
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#itemsPerPage> "100"^^<http://www.w3.org/2001/XMLSchema#integer>.
30-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#firstPage> <http://ex.org/data?fragment&page=1>.
31-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#previousPage> <http://ex.org/data?fragment&page=2>.
32-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#nextPage> <http://ex.org/data?fragment&page=4>.
30+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#first> <http://ex.org/data?fragment&page=1>.
31+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#previous> <http://ex.org/data?fragment&page=2>.
32+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#next> <http://ex.org/data?fragment&page=4>.

test/assets/basic-fragment-metadata-last.trig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ _:object hydra:variable "object";
3232
hydra:totalItems "1234"^^xsd:integer;
3333
void:triples "1234"^^xsd:integer;
3434
hydra:itemsPerPage "100"^^xsd:integer;
35-
hydra:firstPage <http://ex.org/data?fragment&page=1>;
36-
hydra:previousPage <http://ex.org/data?fragment&page=2>;
37-
hydra:nextPage <http://ex.org/data?fragment&page=4>
35+
hydra:first <http://ex.org/data?fragment&page=1>;
36+
hydra:previous <http://ex.org/data?fragment&page=2>;
37+
hydra:next <http://ex.org/data?fragment&page=4>
3838
}

test/assets/basic-fragment-metadata-last.ttl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ _:object hydra:variable "object";
2828
hydra:totalItems "1234"^^xsd:integer;
2929
void:triples "1234"^^xsd:integer;
3030
hydra:itemsPerPage "100"^^xsd:integer;
31-
hydra:firstPage <http://ex.org/data?fragment&page=1>;
32-
hydra:previousPage <http://ex.org/data?fragment&page=2>;
33-
hydra:nextPage <http://ex.org/data?fragment&page=4>.
31+
hydra:first <http://ex.org/data?fragment&page=1>;
32+
hydra:previous <http://ex.org/data?fragment&page=2>;
33+
hydra:next <http://ex.org/data?fragment&page=4>.

test/assets/basic-fragment.jsonld

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@
9292
"@value": "Linked Data Fragment of My data"
9393
},
9494
"void:triples": 1234,
95-
"hydra:firstPage": {
95+
"hydra:first": {
9696
"@id": "http://ex.org/data?fragment&page=1"
9797
},
9898
"hydra:itemsPerPage": 100,
99-
"hydra:nextPage": {
99+
"hydra:next": {
100100
"@id": "http://ex.org/data?fragment&page=4"
101101
},
102-
"hydra:previousPage": {
102+
"hydra:previous": {
103103
"@id": "http://ex.org/data?fragment&page=2"
104104
},
105105
"hydra:totalItems": 1234

test/assets/basic-fragment.nq

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ _:object <http://www.w3.org/ns/hydra/core#property> <http://www.w3.org/1999/02/2
2525
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#totalItems> "1234"^^<http://www.w3.org/2001/XMLSchema#integer> <http://ex.org/data?fragment#metadata>.
2626
<http://ex.org/data?fragment&page=3> <http://rdfs.org/ns/void#triples> "1234"^^<http://www.w3.org/2001/XMLSchema#integer> <http://ex.org/data?fragment#metadata>.
2727
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#itemsPerPage> "100"^^<http://www.w3.org/2001/XMLSchema#integer> <http://ex.org/data?fragment#metadata>.
28-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#firstPage> <http://ex.org/data?fragment&page=1> <http://ex.org/data?fragment#metadata>.
29-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#previousPage> <http://ex.org/data?fragment&page=2> <http://ex.org/data?fragment#metadata>.
30-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#nextPage> <http://ex.org/data?fragment&page=4> <http://ex.org/data?fragment#metadata>.
28+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#first> <http://ex.org/data?fragment&page=1> <http://ex.org/data?fragment#metadata>.
29+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#previous> <http://ex.org/data?fragment&page=2> <http://ex.org/data?fragment#metadata>.
30+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#next> <http://ex.org/data?fragment&page=4> <http://ex.org/data?fragment#metadata>.
3131
<a> <b> <c>.
3232
<a> <d> <e>.
3333
<f> <g> <h>.

test/assets/basic-fragment.nt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ _:object <http://www.w3.org/ns/hydra/core#property> <http://www.w3.org/1999/02/2
2424
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#totalItems> "1234"^^<http://www.w3.org/2001/XMLSchema#integer>.
2525
<http://ex.org/data?fragment&page=3> <http://rdfs.org/ns/void#triples> "1234"^^<http://www.w3.org/2001/XMLSchema#integer>.
2626
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#itemsPerPage> "100"^^<http://www.w3.org/2001/XMLSchema#integer>.
27-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#firstPage> <http://ex.org/data?fragment&page=1>.
28-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#previousPage> <http://ex.org/data?fragment&page=2>.
29-
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#nextPage> <http://ex.org/data?fragment&page=4>.
27+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#first> <http://ex.org/data?fragment&page=1>.
28+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#previous> <http://ex.org/data?fragment&page=2>.
29+
<http://ex.org/data?fragment&page=3> <http://www.w3.org/ns/hydra/core#next> <http://ex.org/data?fragment&page=4>.
3030
<a> <b> <c>.
3131
<a> <d> <e>.
3232
<f> <g> <h>.

0 commit comments

Comments
 (0)