Make datasource capitalization consistent.

Author: RubenVerborgh

bin/generate-summary

@@ -77,11 +77,11 @@ function generate(datasourceName) {
   }
 }
 
-function fromDataSource(uri, dataSource, callback, end, chunksize) {
+function fromDataSource(uri, datasource, callback, end, chunksize) {
   var hrstart = process.hrtime();
 
   var capabilities = Object.create(null),
-    supportsQuery = dataSource.supportsQuery({
+    supportsQuery = datasource.supportsQuery({
       features: {
         limit: true,
         offset: true
@@ -92,7 +92,7 @@ function fromDataSource(uri, dataSource, callback, end, chunksize) {
     processSet(chunksize || 100000);
   } else {
     // Process dataset at once
-    dataSource.select({}, function (err) {
+    datasource.select({}, function (err) {
         console.error('Error occured', err);
       })
       .on('data', extractSummary)
@@ -104,7 +104,7 @@ function fromDataSource(uri, dataSource, callback, end, chunksize) {
     offset = offset || 0;
     var count = 0;
 
-    var stream = dataSource.select({
+    var stream = datasource.select({
         limit: limit,
         offset: offset
       }, function (err) {

lib/controllers/TimegateController.js

@@ -27,7 +27,7 @@ function TimegateController(options) {
       timemap: sortTimemap(_.map(_.pick(options.datasources, mementos.versions),
         function (datasource, key) {
           return _.assign(datasource.memento, {
-            dataSource: key,
+            datasource: key,
             interval: (datasource.memento.interval || [0, 0]).map(toDate),
           });
         }))
@@ -52,7 +52,7 @@ TimegateController.prototype._handleRequest = function (request, response, next)
         memento = this._getClosestMemento(timemapDetails.timemap, acceptDatetime);
     if (memento) {
       // Determine the URL of the memento
-      var mementoUrl = _.assign(request.parsedUrl, { pathname: memento.dataSource });
+      var mementoUrl = _.assign(request.parsedUrl, { pathname: memento.datasource });
       mementoUrl = url.format(mementoUrl);
 
       // Determine the URL of the original resource
@@ -78,17 +78,17 @@ TimegateController.prototype._handleRequest = function (request, response, next)
 };
 
 /*
-   * @param timemap: [{"dataSource": "data source name", "interval": [start, end]}, ...]
+   * @param timemap: [{"datasource": "data source name", "interval": [start, end]}, ...]
                    the start, end values can either be Date objects, or ISO 8601 string.
    * @param accept_datetime: the requested datetime value as Date object, or ISO 8601 string.
    * @param sorted: bool. If not sorted, the timemap will be sorted using the start time in the interval.
 
    * eg:
     var timemap = [
-      {"dataSource": "dbpedia_2012", "interval": ["2011-10-20T12:22:24Z", new Date("2012-10-19T12:22:24Z")]},
-      {"dataSource": "dbpedia_2015", "interval": ["2014-10-20T12:22:24Z", ""]},
-      {"dataSource": "dbpedia_2013", "interval": [new Date("2012-10-20T12:22:24Z"), new Date("2013-10-19T12:22:24Z")]},
-      {"dataSource": "dbpedia_2014", "interval": ["2013-10-20T12:22:24Z", "2014-10-19T12:22:24Z"]}
+      {"datasource": "dbpedia_2012", "interval": ["2011-10-20T12:22:24Z", new Date("2012-10-19T12:22:24Z")]},
+      {"datasource": "dbpedia_2015", "interval": ["2014-10-20T12:22:24Z", ""]},
+      {"datasource": "dbpedia_2013", "interval": [new Date("2012-10-20T12:22:24Z"), new Date("2013-10-19T12:22:24Z")]},
+      {"datasource": "dbpedia_2014", "interval": ["2013-10-20T12:22:24Z", "2014-10-19T12:22:24Z"]}
     ];
     get_closest_memento(timemap, "2011-10-20T12:22:24Z", false);
 */
@@ -127,7 +127,7 @@ TimegateController.prototype._getClosestMemento = function (timemap, acceptDatet
 
     // check if the accept datetime falls within any intervals defined in the data sources.
     for (var i = 0, memento; memento = timemap[i]; i++) {
-        var dataSource = memento.dataSource,
+        var datasource = memento.datasource,
             startTime = memento.interval[0].getTime(),
             endTime   = memento.interval[1].getTime();