Changeset 1191 for trunk/src/xml2struct.m

Timestamp:

Feb 6, 2026, 5:13:05 PM (2 weeks ago)

Author:

sommeria

Message:

bugs repaired

File:

• trunk/src/xml2struct.m (modified) (6 diffs)

trunk/src/xml2struct.m

@@ -39 +39 @@
 catch ME
     errormsg=ME.message;
-    if ~isempty(regexp(ME.message,'Undefined function','once'))||~isempty(regexp(ME.message,'Missing','once'))
+    if ~isempty(regexp(ME.message,'Undefined function'))||~isempty(regexp(ME.message,'Missing'))
         errormsg=[errormsg ': package xmltree not correctly installed, reload it from www.artefact.tk/software/matlab/xml'];
     end
@@ -52 +52 @@
     end
 end
-if nargin>1 % additional input vartiable(s) beyond filename, select specified subtrees
+if nargin>1
     for isub=1:nargin-1
         uid_sub=find(t,['/' RootTag '/' varargin{isub}]);
@@ -58 +58 @@
             s.(varargin{isub})=[];
         else
-            tsub=branch(t,uid_sub);
-            if ~isempty(get(tsub,1,'contents'))
-                ss=convert(tsub);
-                s.(varargin{isub})=convert_string(ss);
-            end
+        tsub=branch(t,uid_sub);
+        if ~isempty(get(tsub,1,'contents'))
+        ss=convert(tsub);
+        s.(varargin{isub})=convert_string(ss);
+        end
         end
     end
 else
     try
-        ss=convert(t);%transform the xmltree object into a Matlab structure.
-        s=convert_string(ss);% explore the sub-structures if needed
+    ss=convert(t);%transform the xmltree object into a Matlab structure.
+    s=convert_string(ss);
     catch ME
         errormsg=ME.message;
@@ -85 +85 @@
         end
     case 'char' 
-        % try to convert to number if the char does not correspond to a function (otherwise str2num calls this function as it uses 'eval')
-        if exist(ss,'builtin')||exist(ss,'file')% ss corresponds to the name of a builtin Matlab function or a file
-            out=ss; %reproduce the input string
-        else
-            out=str2num(ss);% convert to number or vector (str2num applied to a fct name executes this fct by 'eval', thus this possibility had to be ruled out above
-            if isempty(out)
+            out=str2double(strsplit(ss));% convert to number or vector (str2num applied to a fct name executes this fct by 'eval', thus this possibility had to be ruled out above
+            if isnan(out)
                 sep_ind=regexp(ss,'\s&\s');% check for separator ' & ' which indicates column separation in tables
                 if ~isempty(sep_ind)
@@ -102 +98 @@
                 end
             end
-         end
     case 'cell'
-        out={};%default
+        out=cell(numel(ss),1);%default
         check_numeric=zeros(size(ss));
         for ilist=1:numel(ss)
-            if ~strcmp(ss{ilist},'image') && ~isempty(str2num(ss{ilist}))
-                out{ilist,1}=str2num(ss{ilist});
+            if  ~isnan(str2double(strsplit(ss{ilist})))
+                out{ilist,1}=str2double(strsplit(ss{ilist}));
                 check_numeric(ilist)=1;
             else
@@ -129 +124 @@
 end
 
+