From f30c7d62731ced308437d2803bd50c0b28f7138f Mon Sep 17 00:00:00 2001
From: Rufus Pollock <rufus.pollock@okfn.org>
Date: Sun, 24 Jun 2012 15:04:01 +0100
Subject: [PATCH] [#162,app,multiview][s]: minor refactoring to bring up to
 date with new model/backend setup.

---
 app/js/app.js         | 18 +++++++++---------
 src/view.multiview.js |  5 ++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/js/app.js b/app/js/app.js
index bdce90d1..082a7cf7 100755
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -202,17 +202,17 @@ var ExplorerApp = Backbone.View.extend({
     var $form = $(e.target);
     $('.modal.js-load-dialog-file').modal('hide');
     var $file = $form.find('input[type="file"]')[0];
-    var file = $file.files[0];
-    var options = {
-      separator : $form.find('input[name="separator"]').val(),
-      delimiter : $form.find('input[name="delimiter"]').val(),
-      encoding : $form.find('input[name="encoding"]').val()
-    };
-    recline.Backend.CSV.load(file, function(dataset) {
-        self.createExplorer(dataset)
+    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()
       },
-      options
+      'csv'
     );
+    dataset.fetch().done(function() {
+      self.createExplorer(dataset)
+    });
   },
 
   _getSettings: function() {
diff --git a/src/view.multiview.js b/src/view.multiview.js
index f6f669e4..477d7013 100644
--- a/src/view.multiview.js
+++ b/src/view.multiview.js
@@ -182,10 +182,9 @@ my.MultiView = Backbone.View.extend({
 
     // retrieve basic data like fields etc
     // note this.model and dataset returned are the same
+    // TODO: set query state ...?
+    this.model.queryState.set(self.state.get('query'), {silent: true});
     this.model.fetch()
-      .done(function(dataset) {
-        self.model.query(self.state.get('query'));
-      })
       .fail(function(error) {
         self.notify({message: error.message, category: 'error', persist: true});
       });