Changeset 472 for trunk/src/xml2struct.m

Timestamp:

Jun 25, 2012, 12:12:24 AM (12 years ago)

Author:

sommeria

Message:

many bugs repaired. series set to work in mode background

File:

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

trunk/src/xml2struct.m

@@ -9 +9 @@
 % filename: name of the xml file
 
-function s=xml2struct(filename)
+function [s,Heading]=xml2struct(filename)
 t=xmltree(filename);
+Heading=get(t,1,'name');
 ss=convert(t);
 s=convert_string(ss);
@@ -40 +41 @@
     case 'cell'
         out=[];%default
-        for ilist=1:numel(ss)
-            if ~isempty(str2num(ss{ilist}))
-            out(ilist,:)=str2num(ss{ilist});
+        if isequal(cellfun(@isnumeric,ss),ones(size(ss)))% if the all the cell content is  numeric
+            out=cell2mat(ss);
+        else
+            for ilist=1:numel(ss)
+                sep_ind=regexp(ss{ilist},'\s&\s');% check for separator ' & ' which indicates column separation in tables
+                if ~isempty(sep_ind)
+                    sep_ind=[-2 sep_ind length(ss{ilist})+1];
+                    for icolumn=1:length(sep_ind)-1
+                        out{ilist,icolumn}=ss{ilist}(sep_ind(icolumn)+3:sep_ind(icolumn+1)-1);
+                    end
+                else
+                    out{ilist,1}=ss{ilist}; %reproduce the input string
+                end
             end
         end
+%         for ilist=1:numel(ss)
+%             if ~isempty(str2num(ss{ilist}))
+%             out(ilist,:)=str2num(ss{ilist});% convert to numeric
+%             end
+%         end
     otherwise
         out=ss;