Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-24 05:45:59 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

replace ad-hoc code by ExtXml.exapnad_ac_xml

Browse Source
This commit is contained in:
Pascal Brisset
2009-08-24 22:23:16 +00:00
parent 98d10d5fb8
commit 9655a545a4
1 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/logalizer/sd2log.ml
+1 -22
View File
@@ -46,27 +46,6 @@ let run_command = fun com ->
let make_element = fun t a c -> Xml.Element (t,a,c)
(** Copied from server.ml *)
let expand_ac_xml = fun ac_conf ->
let prefix = fun s -> sprintf "%s/conf/%s" Env.paparazzi_home s in
let parse = fun a ->
let file = prefix (ExtXml.attrib ac_conf a) in
try
Xml.parse_file file
with
Xml.File_not_found _ ->
prerr_endline (sprintf "File not found: %s" file);
make_element "file_not_found" ["file",a] []
| Xml.Error e ->
let s = Xml.error e in
prerr_endline (sprintf "Parse error in %s: %s" file s);
make_element "cannot_parse" ["file",file;"error", s] [] in
let fp = parse "flight_plan" in
let af = parse "airframe" in
let rc = parse "radio" in
let children = Xml.children ac_conf@[fp; af; rc] in
make_element (Xml.tag ac_conf) (Xml.attribs ac_conf) children
let log_xml = fun ac_id ->
let select = fun x -> ExtXml.int_attrib x "ac_id" = ac_id in
let conf_ac =
@@ -76,7 +55,7 @@ let log_xml = fun ac_id ->
Not_found ->
failwith (sprintf "Error: A/C %d not found in conf.xml" ac_id)
in
let expanded_conf_ac = expand_ac_xml conf_ac in
let expanded_conf_ac = Env.expand_ac_xml ~raise_exception:false conf_ac in
let expanded_conf =
make_element (Xml.tag conf_xml) (Xml.attribs conf_xml) [expanded_conf_ac] in
make_element