refactor

+bids/+internal/get_metadata.m

@@ -1,6 +1,6 @@
 function meta = get_metadata(metafile)
   %
-  % Read a BIDS's file metadata according to the inheritance principle
+  % Read a BIDS's file metadata according to the inheritance principle.
   %
   % USAGE::
   %
@@ -11,21 +11,20 @@
   %
   % :returns: - :meta: metadata structure
   %
+
   % .. todo
   %
   %    add explanation on how the inheritance principle is implemented.
   %
-  %
 
   % (C) Copyright 2011-2018 Guillaume Flandin, Wellcome Centre for Human Neuroimaging
-  %
-
   % (C) Copyright 2018 BIDS-MATLAB developers
 
   meta = struct();
   metafile = cellstr(metafile);
 
   for i = 1:numel(metafile)
+    % assumes files are read from root level files to deeper files
     if bids.internal.ends_with(metafile{i}, '.json')
       meta = update_metadata(meta, bids.util.jsondecode(metafile{i}), metafile{i});
     else
@@ -35,7 +34,12 @@
   end
 
   if isempty(meta)
-    warning('No metadata for %s', metafile);
+    bids.internal.error_handling( ...
+                                 mfilename(), ...
+                                 'NoMetadata', ...
+                                 sprintf('No metadata for:%s', ...
+                                         bids.internal.create_unordered_list(metafile)), ...
+                                 true, true);
   end
 
 end
@@ -47,8 +51,14 @@
   if isempty(struct_two)
     return
   elseif ~isstruct(struct_two)
-    error('Metadata file contents were neither struct nor empty. File: %s', file);
+    bids.internal.error_handling( ...
+                                 mfilename(), ...
+                                 'WrongInputType', ...
+                                 sprintf('Input was neither struct nor empty for file:\n%s', ...
+                                         file), ...
+                                 false);
   end
+
   fn = fieldnames(struct_two);
   for i = 1:numel(fn)
     if ~isfield(struct_one, fn{i})