Changeset 685 for trunk/src/imadoc2struct.m

Timestamp:

Sep 19, 2013, 10:37:44 AM (11 years ago)

Author:

sommeria

Message:

error message improved for reading xml files

File:

• trunk/src/imadoc2struct.m (modified) (1 diff)

trunk/src/imadoc2struct.m

@@ -35 +35 @@
 %% case of xml files
 if nargin ==1
-    [s,Heading]=xml2struct(ImaDoc);% convert the whole xml file in a structure s
+    [s,Heading,errormsg]=xml2struct(ImaDoc);% convert the whole xml file in a structure s
 elseif nargin ==2
-    [s,Heading]=xml2struct(ImaDoc,varargin{1});% convert the xml file in a structure s, keeping only the subtree defined in input
+    [s,Heading,errormsg]=xml2struct(ImaDoc,varargin{1});% convert the xml file in a structure s, keeping only the subtree defined in input
 else %TODO: deal with more than two subtrees?
-    [s,Heading]=xml2struct(ImaDoc,varargin{1},varargin{2});% convert the xml file in a structure s, keeping only the subtree defined in input
+    [s,Heading,errormsg]=xml2struct(ImaDoc,varargin{1},varargin{2});% convert the xml file in a structure s, keeping only the subtree defined in input
+end
+if ~isempty(errormsg)
+    errormsg=['imadoc2struct/xml2struct/' errormsg];
+    return
 end
 if ~strcmp(Heading,'ImaDoc')
-    errormsg='the input xml file is not ImaDoc';
+    errormsg='imadoc2struct/the input xml file is not ImaDoc';
     return
 end