knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#162,refactor][s]: backend is now string in 'normal' set of Dataset arguments.

Browse Source
This commit is contained in:
Rufus Pollock
2012-06-25 10:10:12 +01:00
parent 5216e23f45
commit 3d6ad46cc5
6 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/js/app.js
View File

@@ -192,7 +192,8 @@ var ExplorerApp = Backbone.View.extend({
}
type = 'elasticsearch';
}
var dataset = new recline.Model.Dataset(datasetInfo, type);
datasetInfo.backend = type;
var dataset = new recline.Model.Dataset(datasetInfo);
this.createExplorer(dataset);
},
@@ -203,13 +204,12 @@ var ExplorerApp = Backbone.View.extend({
$('.modal.js-load-dialog-file').modal('hide');
var $file = $form.find('input[type="file"]')[0];
var dataset = new recline.Model.Dataset({
file: $file.files[0],
separator : $form.find('input[name="separator"]').val(),
delimiter : $form.find('input[name="delimiter"]').val(),
encoding : $form.find('input[name="encoding"]').val()
},
'csv'
);
file: $file.files[0],
separator : $form.find('input[name="separator"]').val(),
delimiter : $form.find('input[name="delimiter"]').val(),
encoding : $form.find('input[name="encoding"]').val(),
backend: 'csv'
});
dataset.fetch().done(function() {
self.createExplorer(dataset)
});