Skip to content

Commit cecbb82

Browse files
author
deiu
committed
Fixed the basename function (for dirs)
1 parent cba9ff5 commit cecbb82

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

lib/header.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ function linksHandler(req, res, next) {
5959
ldp.root, ldp.suffixMeta,
6060
ldp.suffixAcl);
6161

62-
addLink(res, utils.uriRelative(aclLink), 'acl');
63-
addLink(res, utils.uriRelative(metaLink), 'describedBy');
62+
addLink(res, utils.basename(aclLink), 'acl');
63+
addLink(res, utils.basename(metaLink), 'describedBy');
6464

6565

6666
addLinks(res, fileMetadata);

lib/utils.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ function uriBase(req) {
4242
return uriAbs(req) + (req.baseUrl || '');
4343
}
4444

45-
function uriRelative(uri) {
46-
var relative = path.basename(uri);
47-
return relative;
45+
function basename(fullpath) {
46+
var bname = (fullpath.lastIndexOf('/') === fullpath.length - 1)?'':path.basename(fullpath);
47+
return bname;
4848
}
4949

5050
function getResourceLink(filename, uri, base, suffix, otherSuffix) {
@@ -81,7 +81,7 @@ exports.uriToFilename = uriToFilename;
8181
exports.uriToRelativeFilename = uriToRelativeFilename;
8282
exports.filenameToBaseUri = filenameToBaseUri;
8383
exports.uriAbs = uriAbs;
84-
exports.uriRelative = uriRelative;
84+
exports.basename = basename;
8585
exports.uriBase = uriBase;
8686
exports.getResourceLink = getResourceLink;
8787
exports.formatDateTime = formatDateTime;

0 commit comments

Comments
 (0)