@@ -7,6 +7,7 @@ var fs = require('fs');
77var $rdf = require ( 'rdflib' ) ;
88var async = require ( 'async' ) ;
99var fs = require ( 'fs' ) ;
10+ var url = require ( 'url' ) ;
1011var mkdirp = require ( 'fs-extra' ) . mkdirp ;
1112var uuid = require ( 'node-uuid' ) ;
1213var debug = require ( './debug' ) ;
@@ -116,6 +117,10 @@ LDP.prototype.readContainerMeta = function (directory, callback) {
116117} ;
117118
118119LDP . prototype . listContainer = function ( filename , uri , containerData , contentType , callback ) {
120+ var ldp = this
121+ var host = url . parse ( uri ) . hostname
122+ var root = ! ldp . idp ? ldp . root : ldp . root + host + '/' ;
123+
119124 function addStats ( resourceGraph , baseUri , stats ) {
120125 resourceGraph . add (
121126 resourceGraph . sym ( baseUri ) ,
@@ -191,7 +196,7 @@ LDP.prototype.listContainer = function (filename, uri, containerData, contentTyp
191196 }
192197
193198 var fileSubject = file + ( stats . isDirectory ( ) ? '/' : '' ) ;
194- var fileBaseUri = utils . filenameToBaseUri ( fileSubject , uri , ldp . root ) ;
199+ var fileBaseUri = utils . filenameToBaseUri ( fileSubject , uri , root ) ;
195200
196201 // Add fileStats to resource Graph
197202 addStats ( resourceGraph , fileSubject , stats ) ;
@@ -259,8 +264,7 @@ LDP.prototype.listContainer = function (filename, uri, containerData, contentTyp
259264 } ) ;
260265 }
261266
262- var ldp = this ;
263- var baseUri = utils . filenameToBaseUri ( filename , uri , ldp . root ) ;
267+ var baseUri = utils . filenameToBaseUri ( filename , uri , root ) ;
264268 var resourceGraph = $rdf . graph ( ) ;
265269
266270 try {
@@ -325,9 +329,10 @@ LDP.prototype.listContainer = function (filename, uri, containerData, contentTyp
325329 } ) ;
326330} ;
327331
328- LDP . prototype . put = function ( resourcePath , contents , callback ) {
332+ LDP . prototype . put = function ( host , resourcePath , contents , callback ) {
329333 var ldp = this ;
330- var filePath = utils . uriToFilename ( resourcePath , ldp . root ) ;
334+ var root = ! ldp . idp ? ldp . root : ldp . root + host + '/' ;
335+ var filePath = utils . uriToFilename ( resourcePath , root , host ) ;
331336
332337 // PUT requests not supported on containers. Use POST instead
333338 if ( filePath [ filePath . length - 1 ] === '/' ) {
@@ -359,9 +364,14 @@ LDP.prototype.put = function (resourcePath, contents, callback) {
359364 } ) ;
360365} ;
361366
362- LDP . prototype . get = function ( reqPath , baseUri , includeBody , contentType , callback ) {
367+ LDP . prototype . exists = function ( host , reqPath , callback ) {
368+ this . get ( host , reqPath , undefined , false , undefined , callback )
369+ }
370+
371+ LDP . prototype . get = function ( host , reqPath , baseUri , includeBody , contentType , callback ) {
363372 var ldp = this ;
364- var filename = utils . uriToFilename ( reqPath , ldp . root ) ;
373+ var root = ! ldp . idp ? ldp . root : ldp . root + host + '/' ;
374+ var filename = utils . uriToFilename ( reqPath , root ) ;
365375 ldp . stat ( filename , function ( err , stats ) {
366376 // File does not exist
367377 if ( err ) {
@@ -414,9 +424,10 @@ LDP.prototype.get = function (reqPath, baseUri, includeBody, contentType, callba
414424 } ) ;
415425} ;
416426
417- LDP . prototype . delete = function ( resourcePath , callback ) {
427+ LDP . prototype . delete = function ( host , resourcePath , callback ) {
418428 var ldp = this ;
419- var filename = utils . uriToFilename ( resourcePath , ldp . root ) ;
429+ var root = ! ldp . idp ? ldp . root : ldp . root + host + '/' ;
430+ var filename = utils . uriToFilename ( resourcePath , root ) ;
420431 ldp . stat ( filename , function ( err , stats ) {
421432 if ( err ) {
422433 return callback ( new HttpError ( {
@@ -501,9 +512,10 @@ LDP.prototype.releaseResourceUri = function (uri) {
501512 delete this . usedURIs [ uri ] ;
502513} ;
503514
504- LDP . prototype . createNewResource = function ( uri , resourcePath , resourceGraph , callback ) {
515+ LDP . prototype . createNewResource = function ( host , uri , resourcePath , resourceGraph , callback ) {
505516 var ldp = this ;
506- var resourceURI = path . relative ( ldp . root , resourcePath ) ;
517+ var root = ! ldp . idp ? ldp . root : ldp . root + host + '/' ;
518+ var resourceURI = path . relative ( root , resourcePath ) ;
507519 var rawResource = $rdf . serialize (
508520 undefined ,
509521 resourceGraph ,
0 commit comments