summaryrefslogtreecommitdiffstats
path: root/scilab/modules/helptools
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-12 16:50:59 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-12 17:24:44 +0200
commit0f206042ddf884df9024a406aa119a3f3f541703 (patch)
tree99c66fd1a4c42fa2ef08fa6e81ed92e89052771a /scilab/modules/helptools
parentcf385ba2676be2de15d5a2741bed580d65324600 (diff)
downloadscilab-0f206042ddf884df9024a406aa119a3f3f541703.zip
scilab-0f206042ddf884df9024a406aa119a3f3f541703.tar.gz
xmltojar: When building the online help with a default language, each entry that existed in the both languages was duplicated
Change-Id: I7623b983d74efd5d519955e454e83586d403d497
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 98560e3..01f725e 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.
@@ -1069,12 +1069,14 @@ function xmlfiles = x2f_get_xml_files(directory)
1069 // ========================================================================= 1069 // =========================================================================
1070 1070
1071 if xmlfiles <> [] then 1071 if xmlfiles <> [] then
1072 xmlfiles = "a" + getmd5(xmlpaths,"string"); 1072 xmlmd5 = "a" + getmd5(xmlpaths,"string");
1073 else
1074 xmlmd5 = [];
1073 end 1075 end
1074 1076
1075 // Build the final matrix 1077 // Build the final matrix
1076 // ========================================================================= 1078 // =========================================================================
1077 xmlfiles = [ xmlfiles xmlpaths lmt ]; 1079 xmlfiles = [ xmlmd5 xmlpaths lmt xmlfiles];
1078 1080
1079endfunction 1081endfunction
1080 1082
@@ -1661,8 +1663,8 @@ function tree_out = x2f_merge_trees( tree_in_1 , tree_in_2 )
1661 1663
1662 xmllist_out = xmllist_2; 1664 xmllist_out = xmllist_2;
1663 1665
1664 for i=1:size(xmllist_1(:,1),"*") 1666 for i=1:size(xmllist_1(:,4),"*")
1665 if find(xmllist_2(:,1) == xmllist_1(i,1)) == [] then 1667 if find(xmllist_2(:,4) == xmllist_1(i,4)) == [] then
1666 xmllist_out = [ xmllist_out ; xmllist_1(i,:) ]; 1668 xmllist_out = [ xmllist_out ; xmllist_1(i,:) ];
1667 tree_out("xml_number") = tree_out("xml_number") + 1; 1669 tree_out("xml_number") = tree_out("xml_number") + 1;
1668 end 1670 end