Changeset 771 for trunk/src/get_file_type.m

Timestamp:

May 3, 2014, 5:20:29 PM (10 years ago)

Author:

sommeria

Message:

 

File:

• trunk/src/get_file_type.m (modified) (4 diffs)

trunk/src/get_file_type.m

@@ -17 +17 @@
 % fileinput: name, including path, of the file to analyse
 function [FileType,FileInfo,VideoObject]=get_file_type(fileinput)
-
-FileInfo=[];
+%%%% TODO: suppress the output argument FileType, contained in FileInfo %%%%
+FileInfo=[];% will remain empty in the absence of input file
 VideoObject=[];
 if exist(fileinput,'file')
+    FileInfo.FileName=fileinput;
+    FileInfo.FileType='txt'; %default
     FileType='txt';%default, text file
 else
@@ -30 +32 @@
 switch FileExt
     case '.fig'
+        FileInfo.FileType='figure';
         FileType='figure';
     case '.xml'
+        FileInfo.FileType='xml';
         FileType='xml';
     case '.xls'
+        FileInfo.FileType='xls';
         FileType='xls';
     otherwise
@@ -51 +56 @@
                             FileInfo.NumberOfFrames=1;
                         end
+                        FileInfo.FileName=FileInfo.Filename; %correct the info given by imfinfo
+                        FileInfo.FileType=FileType;
                     end
                 else
                     error_nc=0;
                     try
-                        [Data,tild,tild,errormsg]=nc2struct(fileinput,'ListGlobalAttribute','absolut_time_T0','Conventions',...
-                            'CivStage','patch2','fix2','civ2','patch','fix','hart');
+                      %  [Data,tild,tild,errormsg]=nc2struct(fileinput,'ListGlobalAttribute','absolut_time_T0','Conventions',...
+                       %     'CivStage','patch2','fix2','civ2','patch','fix','hart');
+                       [Data,tild,tild,errormsg]=nc2struct(fileinput,[]);
                         if ~isempty(errormsg)
                             error_nc=1;
                         else
-                            if ~isempty(Data.absolut_time_T0') && ~isempty(Data.hart)
+                            if isfield(Data,'absolut_time_T0') && isfield(Data,'hart') && ~isempty(Data.absolut_time_T0) && ~isempty(Data.hart)
+                                FileInfo.FileType='civx';
                                 FileType='civx'; % test for civx velocity fields
-                                if isequal(Data.patch2,1)
+                                if isfield(Data,'patch2') && isequal(Data.patch2,1)
                                     FileInfo.CivStage=6;
-                                elseif isequal(Data.fix2,1)
+                                elseif isfield(Data,'fix2') && isequal(Data.fix2,1)
                                     FileInfo.CivStage=5;
-                                elseif  isequal(Data.civ2,1)
+                                elseif  isfield(Data,'civ2')&& isequal(Data.civ2,1)
                                     FileInfo.CivStage=4;
-                                elseif isequal(Data.patch,1)
+                                elseif isfield(Data,'patch')&&isequal(Data.patch,1)
                                     FileInfo.CivStage=3;
-                                elseif isequal(Data.fix,1)
+                                elseif isfield(Data,'fix')&&isequal(Data.fix,1)
                                     FileInfo.CivStage=2;
                                 else
                                     FileInfo.CivStage=1;
                                 end
-                            elseif strcmp(Data.Conventions,'uvmat/civdata')
+                            elseif isfield(Data,'Conventions') && strcmp(Data.Conventions,'uvmat/civdata')
+                                FileInfo.FileType='civdata'; % test for civx velocity fields
                                 FileType='civdata'; % test for civx velocity fields
                                 FileInfo.CivStage=Data.CivStage;
                             else
+                                FileInfo.FileType='netcdf';
                                 FileType='netcdf';
+                                FileInfo.ListVarName=Data.ListVarName;
                             end
                         end
@@ -96 +108 @@
                                 FileType='mmreader';
                             end
+                            FileInfo.FileName=fileinput;
+                            FileInfo.FileType=FileType;
                             FileInfo.BitDepth=FileInfo.BitsPerPixel/3;
                         end