Changeset 151 for prdatasets/pr_getdata.m

Timestamp:

01/11/20 00:14:42 (5 years ago)

Author:

bduin

Message:

 

File:

• prdatasets/pr_getdata.m (modified) (2 diffs)

prdatasets/pr_getdata.m

@@ -11 +11 @@
 %
 % A mat-file returns a structure with fields pointing to stored variables.
-% If available, the dataset DSET stored in FIELD (default 1) is returned in
-% OUT. In case of a datafile DFILE, it is created, if necessary, with given
+% If available, the dataset DSET stored in FIELD is returned in OUT. If
+% FIELD is not set all fields are returned in a cell array.
+%
+% In case of a datafile DFILE, it is created, if necessary, with given
 % TYPE and returned in OUT. In case the download was successful but no
 % dataset or datfile could be created (e.g. because of empty TYPE) OUT is
@@ -127 +129 @@
 if exist([dsetmat],'file') == 2
   try
-    s = prload(dsetmat);
+    out = file2dset(dsetmat);
   catch ME
-    out = 'error';
-    return
-  end
-  if isstruct(s)
-    if isempty(field)
-      f = fieldnames(s);
-      out = getfield(s,f{1});
+    s = load(dsetmat);
+    if isstruct(s)
+      if isempty(field)
+        s = struct2cell(s);
+        out = s{1};
+      else
+        out = getfield(s,field);
+      end
     else
-      out = getfield(s,field);
+      out = s;
     end
-  else
-    out = s;
   end
 elseif exist(dset,'dir') == 7