[06/10] climate git commit: Fixing some bugs found from testing

[go...@apache.org]

Fixing some bugs found from testing


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/198de483
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/198de483
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/198de483

Branch: refs/heads/master
Commit: 198de48332c84586dafcaf033fa27a8eb8818ebe
Parents: 4add58b
Author: Alex Goodman <ag...@users.noreply.github.com>
Authored: Mon Jul 25 16:13:48 2016 -0700
Committer: Alex Goodman <ag...@users.noreply.github.com>
Committed: Mon Jul 25 16:13:48 2016 -0700

----------------------------------------------------------------------
 ocw/dataset_loader.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/198de483/ocw/dataset_loader.py
----------------------------------------------------------------------
diff --git a/ocw/dataset_loader.py b/ocw/dataset_loader.py
index 2eb9ef0..be43c05 100644
--- a/ocw/dataset_loader.py
+++ b/ocw/dataset_loader.py
@@ -92,18 +92,18 @@ class DatasetLoader:
         loader function.
         '''
         # Reference dataset config
-        self.set_reference(reference)
+        self.set_reference(**reference)
 
         # Target dataset(s) config
         self.set_targets(targets)
 
         # Default loaders
         self._source_loaders = {
-                    'local':local.load,
-                    'local_split':local.load_dataset_from_multiple_netcdf_files
+                    'local':local.load_file,
+                    'local_split':local.load_dataset_from_multiple_netcdf_files,
                     'local_multiple':local.load_multiple_files,
                     'esgf':esgf.load_dataset,
-                    'rcmed':parameter_dataset,
+                    'rcmed':rcmed.parameter_dataset,
                     'dap':dap.load
                     }
 
@@ -118,7 +118,7 @@ class DatasetLoader:
         return an OCW Dataset object.
         :type loader_func: :class:`callable`
         '''
-        self._source_loader[source_name] = loader_func
+        self._source_loaders[source_name] = loader_func
 
     def add_target(self, **kwargs):
         '''
@@ -152,7 +152,7 @@ class DatasetLoader:
         '''
         # This check allows for the user to enter targets as one block or
         # as a list of separate blocks in their config files
-        if not instanceof(targets, list):
+        if not isinstance(targets, list):
             targets = [targets]
         self._target_config = []
         self.add_targets(targets)
@@ -178,15 +178,15 @@ class DatasetLoader:
         self.target_datasets = []
 
         # Load the target datasets
-        for loader_params in self._target_config
+        for loader_params in self._target_config:
             output = self._load(**loader_params)
 
-                # Need to account for the fact that some loaders return lists
-                # of OCW Dataset objects instead of just one
-                if isinstance(target_dataset, list):
-                    self.target_datasets.extend(output)
-                else:
-                    self.target_datasets.append(output)
+            # Need to account for the fact that some loaders return lists
+            # of OCW Dataset objects instead of just one
+            if isinstance(output, list):
+                self.target_datasets.extend(output)
+            else:
+                self.target_datasets.append(output)
 
     def _load(self, **kwargs):
         '''