summaryrefslogtreecommitdiffstats
path: root/scilab/modules/helptools
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-12 17:27:01 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-12 17:27:18 +0200
commit987adfbfe4b4a660e482a5b3dabee892345de576 (patch)
tree4707f4a1a00fe74293d99a4dbb362f3ed073fc65 /scilab/modules/helptools
parentaa7562c863b369ba7f9546da2cbc065ec2a50ab2 (diff)
parent0f206042ddf884df9024a406aa119a3f3f541703 (diff)
downloadscilab-987adfbfe4b4a660e482a5b3dabee892345de576.zip
scilab-987adfbfe4b4a660e482a5b3dabee892345de576.tar.gz
Merge commit 'origin/5.2'
Change-Id: I9d768c3f95431ce879e34afc211147f99c6c8ef1
Diffstat (limited to 'scilab/modules/helptools')
-rw-r--r--scilab/modules/helptools/macros/xmltoformat.sci12
1 files changed, 7 insertions, 5 deletions
diff --git a/scilab/modules/helptools/macros/xmltoformat.sci b/scilab/modules/helptools/macros/xmltoformat.sci
index ca9290d..8521261 100644
--- a/scilab/modules/helptools/macros/xmltoformat.sci
+++ b/scilab/modules/helptools/macros/xmltoformat.sci
@@ -1,6 +1,6 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2008 INRIA - Pierre MARECHAL <pierre.marechal@inria.fr> 2// Copyright (C) 2008 INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
3// Copyright (C) 2008-2009 DIGITEO - Pierre MARECHAL <pierre.marechal@scilab.org> 3// Copyright (C) 2008-2010 DIGITEO - Pierre MARECHAL <pierre.marechal@scilab.org>
4// Copyright (C) 2009 DIGITEO - Vincent COUVERT <vincent.couvert@scilab.org> 4// Copyright (C) 2009 DIGITEO - Vincent COUVERT <vincent.couvert@scilab.org>
5// 5//
6// This file must be used under the terms of the CeCILL. 6// This file must be used under the terms of the CeCILL.
@@ -1077,12 +1077,14 @@ function xmlfiles = x2f_get_xml_files(directory)
1077 // ========================================================================= 1077 // =========================================================================
1078 1078
1079 if xmlfiles <> [] then 1079 if xmlfiles <> [] then
1080 xmlfiles = "a" + getmd5(xmlpaths,"string"); 1080 xmlmd5 = "a" + getmd5(xmlpaths,"string");
1081 else
1082 xmlmd5 = [];
1081 end 1083 end
1082 1084
1083 // Build the final matrix 1085 // Build the final matrix
1084 // ========================================================================= 1086 // =========================================================================
1085 xmlfiles = [ xmlfiles xmlpaths lmt ]; 1087 xmlfiles = [ xmlmd5 xmlpaths lmt xmlfiles];
1086 1088
1087endfunction 1089endfunction
1088 1090
@@ -1669,8 +1671,8 @@ function tree_out = x2f_merge_trees( tree_in_1 , tree_in_2 )
1669 1671
1670 xmllist_out = xmllist_2; 1672 xmllist_out = xmllist_2;
1671 1673
1672 for i=1:size(xmllist_1(:,1),"*") 1674 for i=1:size(xmllist_1(:,4),"*")
1673 if find(xmllist_2(:,1) == xmllist_1(i,1)) == [] then 1675 if find(xmllist_2(:,4) == xmllist_1(i,4)) == [] then
1674 xmllist_out = [ xmllist_out ; xmllist_1(i,:) ]; 1676 xmllist_out = [ xmllist_out ; xmllist_1(i,:) ];
1675 tree_out("xml_number") = tree_out("xml_number") + 1; 1677 tree_out("xml_number") = tree_out("xml_number") + 1;
1676 end 1678 end