Merge pull request #1206 from chrisfilo/fix/spm_dicom

fixed support for different folder structures in dicom importer

Author: chrisgorgo

nipype/interfaces/spm/utils.py

@@ -450,5 +450,14 @@ def _list_outputs(self):
         from glob import glob
         outputs = self._outputs().get()
         od = os.path.abspath(self.inputs.output_dir)
-        outputs['out_files'] = glob(os.path.join(od, '*'))
+        
+        ext = self.inputs.format
+        if self.inputs.output_dir_struct == "flat":
+            outputs['out_files'] = glob(os.path.join(od, '*.%s'%ext))
+        elif self.inputs.output_dir_struct == 'series':
+            outputs['out_files'] = glob(os.path.join(od, os.path.join('*','*.%s'%ext)))
+        elif self.inputs.output_dir_struct in ['patid', 'date_time', 'patname']:
+            outputs['out_files'] = glob(os.path.join(od, os.path.join('*','*','*.%s'%ext)))
+        elif self.inputs.output_dir_struct == 'patid_date':
+            outputs['out_files'] = glob(os.path.join(od, os.path.join('*','*','*','*.%s'%ext)))
         return outputs