Skip to content

Commit a4019f4

Browse files
author
nicola
committed
merge
2 parents b2dad60 + 18c58b7 commit a4019f4

2 files changed

Lines changed: 10 additions & 20 deletions

File tree

‎lib/ldp.js‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ LDP.prototype.listContainer = function (filename, uri, containerData, callback)
206206
metadataGraph = $rdf.graph();
207207
}
208208

209-
// Add File, Container or BasicContainer
209+
// Add Container or BasicContainer types
210210
if (stats.isDirectory()) {
211211
resourceGraph.add(
212212
metadataGraph.sym(fileSubject),
@@ -217,17 +217,12 @@ LDP.prototype.listContainer = function (filename, uri, containerData, callback)
217217
metadataGraph.sym(fileSubject),
218218
ns.rdf('type'),
219219
ns.ldp('Container'));
220-
221-
resourceGraph.add(
222-
metadataGraph.sym(fileSubject),
223-
ns.rdf('type'),
224-
ns.stat('Directory'));
225-
} else {
226-
resourceGraph.add(
227-
metadataGraph.sym(fileSubject),
228-
ns.rdf('type'),
229-
ns.stat('File'));
230220
}
221+
// Add generic LDP type
222+
resourceGraph.add(
223+
metadataGraph.sym(fileSubject),
224+
ns.rdf('type'),
225+
ns.ldp('Resource'));
231226

232227
// Add type from metadataGraph
233228
var typeStatements = metadataGraph
@@ -287,11 +282,6 @@ LDP.prototype.listContainer = function (filename, uri, containerData, callback)
287282
resourceGraph.sym(''),
288283
ns.rdf('type'),
289284
ns.ldp('Container'));
290-
291-
resourceGraph.add(
292-
resourceGraph.sym(''),
293-
ns.rdf('type'),
294-
ns.stat('Directory'));
295285
}
296286
next();
297287
});

‎test/ldp.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ describe('LDP', function () {
9090
'<> a <http://www.w3.org/ns/ldp#MagicType> ;' +
9191
' dcterms:title "This is a magic type" ;' +
9292
' o:limit 500000.00 .', 'sampleContainer/magicType.ttl');
93-
93+
9494
ldp.listContainer(__dirname + '/resources/sampleContainer/', 'https://server.tld', '', function (err, data) {
9595
var graph = $rdf.graph();
9696
$rdf.parse(
@@ -110,7 +110,7 @@ describe('LDP', function () {
110110

111111
assert.equal(statements.length, 2);
112112
assert.isAbove(statements.indexOf('http://www.w3.org/ns/ldp#MagicType'), -1);
113-
assert.isAbove(statements.indexOf('http://www.w3.org/ns/posix/stat#File'), -1);
113+
assert.isAbove(statements.indexOf('http://www.w3.org/ns/ldp#Resource'), -1);
114114

115115
rm('sampleContainer/magicType.ttl');
116116
done();
@@ -153,11 +153,11 @@ describe('LDP', function () {
153153
assert.equal(containerStatements.length, 1);
154154

155155
basicContainerStatements.forEach(function(statement) {
156-
assert.equal(statement.uri, ns.stat('File').uri);
156+
assert.equal(statement.uri, ns.ldp('Resource').uri);
157157
});
158158

159159
containerStatements.forEach(function(statement) {
160-
assert.equal(statement.uri, ns.stat('File').uri);
160+
assert.equal(statement.uri, ns.ldp('Resource').uri);
161161
});
162162

163163
rm('sampleContainer/containerFile.ttl');

0 commit comments

Comments
 (0)