Skip to content

Commit

Permalink
figaro export bug fix in xml generation
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24812 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Olena Rogovchenko committed Feb 26, 2015
1 parent a561f6c commit fe1b3b8
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions Compiler/Script/Figaro.mo
Expand Up @@ -546,22 +546,21 @@ protected
list<String> sl;
algorithm
xml := "<REQUESTS>\n ";
xml := xml + "\n\n<LOAD_BDC_FI>\n <FILE>";
xml := xml + inDatabase;
xml := xml + "\n\n<LOAD_BDC_FI>\n <FILE_FI>";
xml := xml + inDatabase + "</FILE_FI>\n";

// In case a dbc file exists
sl := stringListStringChar(inDatabase);
newName := truncateExtension(sl);
if System.regularFileExists(newName + ".bdc") then
xml := xml + "</FILE>\n<FILE> " + newName + ".bdc";
xml := xml + "<FILE> " + newName + ".bdc</FILE>\n";
end if;

xml := xml + "</FILE>\n</LOAD_BDC_FI>\n";
xml := xml + "</LOAD_BDC_FI>\n";
xml := xml + "\n\n<LOAD_BDF_FI>\n <FILE>";
xml := xml + inBdfFile;
xml := xml + "</FILE>\n</LOAD_BDF_FI>\n";
xml := xml + "<RUN_TREATMENT>\n";


// In case the fault tree will be needed.
if inMode == "figaro0" then
Expand All @@ -578,7 +577,7 @@ algorithm

xml := xml + "\n <RESOLVE_CONST>VRAI</RESOLVE_CONST>\n <RESOLVE_ATTR>FAUX</RESOLVE_ATTR>\n <INST_RULE>VRAI</INST_RULE>\n";
xml := xml + "</RUN_TREATMENT>\n</REQUESTS>";
outXml := xml;
outXml := xml;
end makeXml;

protected function truncateExtension
Expand Down

0 comments on commit fe1b3b8

Please sign in to comment.