Changeset 685 for trunk/src

Timestamp:

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

Author:

sommeria

Message:

error message improved for reading xml files

Location:

trunk/src

Files:

• imadoc2struct.m (modified) (1 diff)
• xml2struct.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

trunk/src/xml2struct.m

@@ -10 +10 @@
 % varargin: optional list of strings to restrict the reading to a selection of subtrees, for instance 'GeometryCalib' (save time) 
 
-function [s,Heading]=xml2struct(filename,varargin)
+function [s,Heading,errormsg]=xml2struct(filename,varargin)
+s=[];
+Heading='';
+errormsg='';
+try
 t=xmltree(filename);
+catch ME
+    errormsg=ME.message;
+    if regexp(ME.message,'xml_findstr')
+        errormsg=[errormsg ': xmltree not correctly installed, download from www.artefact.tk/software/matlab/xml'];
+    end
+    return
+end
 iline=0;
-Heading='';
+
 while isempty(Heading)
     iline=iline+1;