Changeset 821 for trunk/src/@xmltree/xmltree.m

Timestamp:

Oct 8, 2014, 9:10:00 PM (10 years ago)

Author:

sommeria

Message:

xmltree_updated

File:

• trunk/src/@xmltree/xmltree.m (modified) (3 diffs)

trunk/src/@xmltree/xmltree.m

@@ -3 +3 @@
 % FORMAT tree = xmltree(varargin)
 % 
-% filename - XML filename
+% varargin - XML filename or XML string
 % tree     - XMLTree Object
 %
-%     tree = xmltree;            % creates a minimal XML tree: <tag/>
-%     tree = xmltree(filename);  % creates a tree from an XML file
+%     tree = xmltree;             % creates a minimal XML tree: '<tag/>'
+%     tree = xmltree('foo.xml');  % creates a tree from XML file 'foo.xml'
+%     tree = xmltree('<tag>content</tag>') % creates a tree from string
 %_______________________________________________________________________
 %
@@ -32 +33 @@
                         tree = varargin{1};
                 elseif ischar(varargin{1})
-                        tree.tree = xml_parser(varargin{1});
-                        tree.filename = varargin{1};
+                        % Input argument is an XML string
+                        if (exist(varargin{1}) ~= 2 & ...
+                                ~isempty(xml_findstr(varargin{1},'<',1,1)))
+                                tree.tree = xml_parser(varargin{1});
+                                tree.filename = '';
+                        % Input argument is an XML filename
+                        else
+                                fid = fopen(varargin{1},'rt');
+                                if (fid == -1) 
+                                        error(['[XMLTree] Cannot open ' varargin{1}]);
+                                end
+                                xmlstr = fscanf(fid,'%c');
+                                fclose(fid);
+                                tree.tree = xml_parser(xmlstr);
+                                tree.filename = varargin{1};
+                        end
                         tree = class(tree,'xmltree');
                 else 
@@ -39 +54 @@
                 end
         otherwise
-                error('[XMLTree] Bad number of arguments');
+                error('[XMLTree] Too many input arguments');
 end