Fixed wrong original URL composition

Author: Miel Vander Sande

lib/controllers/MementoControllerExtension.js

@@ -12,13 +12,15 @@ function MementoControllerExtension(settings) {
 
   var timegates = settings.timegates || {}, timegateMap = {};
   this._timegateBaseUrl = timegates.baseURL || '/timegate/';
-  this._baseUrl = settings.baseURL || '/';
   this._timegateMap = timegateMap;
   _.forIn(timegates.mementos || {}, function (setting, key) {
     setting.versions.forEach(function (entry) {
-      timegateMap[entry] = { memento: key, original: setting.originalBaseURL };
+      timegateMap[entry] = { memento: key,
+        original: setting.originalBaseURL || ((settings.baseURL || '/') + key)
+      };
     });
   });
+  console.log(this._timegateMap);
 }
 
 // Add Memento Link headers
@@ -31,8 +33,7 @@ MementoControllerExtension.prototype._handleRequest = function (request, respons
   if (memento && memento.interval && memento.interval.length === 2) {
     var timegatePath = this._timegateBaseUrl + this._timegateMap[datasource].memento,
         timegateUrl = url.format(_.defaults({ pathname: timegatePath }, request.parsedUrl)),
-        originalUrl = (this._timegateMap[datasource].original ?
-                      this._timegateMap[datasource].original : this._baseUrl + datasource) + requestQuery,
+        originalUrl = this._timegateMap[datasource].original + requestQuery,
         datetime = new Date(memento.interval[0]).toUTCString();
 
     response.setHeader('Link', '<' + originalUrl + '>;rel=original, <' + timegateUrl + '>;rel=timegate');