Merge pull request sccn#79 from sccn/pop_import_fix

Pop import fix
cll008 · Aug 18, 2021 · c51ea49 · c51ea49
2 parents 8918ff2 + 71816ef
commit c51ea49
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pop_importbids.m b/pop_importbids.m
@@ -21,6 +21,8 @@
 %  'eventtype'   - [string] BIDS event column to use for EEGLAB event types.
 %                  common choices are usually 'trial_type' or 'value'.
 %                  Default is 'value'.
+%  'bidstask'    - [string] value of a key task- allowing to analyze some
+%                  tasks only
 %
 % Outputs:
 %   STUDY   - EEGLAB STUDY structure
@@ -114,6 +116,10 @@
     }, 'pop_importbids');
 if isstr(opt), error(opt); end
 
+if ~exist('jsondecode.m','file')
+   addpath([fileparts(which('pop_importbids.m')) filesep 'JSONio']) 
+end
+
 % Options:
 % - copy folder
 % - use channel location and event
@@ -244,7 +250,7 @@
                             ind = strmatch( '.fif', cellfun(@(x)x(end-3:end), allFiles, 'uniformoutput', false) ); % FIF
                             if isempty(ind)
                                 ind = strmatch( '.gz', cellfun(@(x)x(end-2:end), allFiles, 'uniformoutput', false) ); % FIF
-                                if isempty(ind)
+                                if isempty(ind) && ~isempty(allFiles)
                                     fprintf(2, 'No EEG file found for subject %s\n', bids.participants{iSubject,1});
                                 end
                             end
@@ -566,7 +572,7 @@
     parent = fileparts(parent);
 end
 if isempty(outFile)
-    outFile = filterHiddenFile(folder, dir(fullfile(parent, fileName)));
+    outFile = filterHiddenFile(parent, dir(fullfile(parent, fileName)));
 end
 
 function fileList = filterHiddenFile(folder, fileList)