fly/fgdata
1
0
Fork 0
Code Activity

Nasal: use ‘quiet’ flag when loading jetways.xml

Browse source 
Avoid console spam from probing for jetways files every ten seconds
This commit is contained in:
Automatic Release Builder 2020-10-08 09:24:43 +01:00
parent 126a849368
commit 85b5c817b0
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Nasal/io.nas
View file

@ -34,6 +34,11 @@ var is_regular_file = func(path) {
else return 0; else return 0;
}; };
var exists = func(path) {
var tmp = stat(path);
return tmp != nil;
};
# <path> the path that should be searched for subdirectories # <path> the path that should be searched for subdirectories
# returns a vector of subdirectory names # returns a vector of subdirectory names
var subdirectories = func(path) { var subdirectories = func(path) {
@ -132,7 +137,7 @@ var load_nasal = func(file, module = nil) {
# are returned as a separate props.Node tree. Returns the data as a # are returned as a separate props.Node tree. Returns the data as a
# props.Node on success or nil on error. # props.Node on success or nil on error.
# #
# Usage: io.read_properties(<filename> [, <props.Node or property-path>]); # Usage: io.read_properties(<filename> [, <props.Node or property-path>, <quiet>]);
# #
# Examples: # Examples:
# #
@ -142,7 +147,7 @@ var load_nasal = func(file, module = nil) {
# var data = io.read_properties("/tmp/foo.xml", "/sim/model"); # var data = io.read_properties("/tmp/foo.xml", "/sim/model");
# var data = io.read_properties("/tmp/foo.xml"); # var data = io.read_properties("/tmp/foo.xml");
# #
var read_properties = func(path, target = nil) { var read_properties = func(path, target = nil, quiet = 0) {
var args = props.Node.new({ filename: path }); var args = props.Node.new({ filename: path });
if (target == nil) { if (target == nil) {
var ret = args.getNode("data", 1); var ret = args.getNode("data", 1);
@ -153,6 +158,11 @@ var read_properties = func(path, target = nil) {
args.getNode("targetnode", 1).setValue(target); args.getNode("targetnode", 1).setValue(target);
var ret = props.globals.getNode(target, 1); var ret = props.globals.getNode(target, 1);
} }
# set the quiet flag if requested
if (quiet)
args.getNode("quiet", 1).setValue(1);
return fgcommand("loadxml", args) ? ret : nil; return fgcommand("loadxml", args) ? ret : nil;
} }
@ -170,7 +180,7 @@ var read_properties = func(path, target = nil) {
# #
# var data = io.read_properties("KSFO", "rwyuse"); # var data = io.read_properties("KSFO", "rwyuse");
# #
var read_airport_properties = func(icao, fname, target = nil) { var read_airport_properties = func(icao, fname, target = nil, quiet = 0) {
var args = props.Node.new({ filename: fname, icao:icao }); var args = props.Node.new({ filename: fname, icao:icao });
if (target == nil) { if (target == nil) {
var ret = args.getNode("data", 1); var ret = args.getNode("data", 1);
@ -181,6 +191,11 @@ var read_airport_properties = func(icao, fname, target = nil) {
args.getNode("targetnode", 1).setValue(target); args.getNode("targetnode", 1).setValue(target);
var ret = props.globals.getNode(target, 1); var ret = props.globals.getNode(target, 1);
} }
# set the quiet flag if requested
if (quiet)
args.getNode("quiet", 1).setValue(1);
return fgcommand("loadxml", args) ? ret : nil; return fgcommand("loadxml", args) ? ret : nil;
} }

11
Nasal/jetways/jetways.nas
View file

@ -712,12 +712,17 @@ var toggle_jetway_from_model = func(model)
var load_airport_jetways = func(airport) var load_airport_jetways = func(airport)
{ {
if (isin(loaded_airports, airport)) return; if (isin(loaded_airports, airport)) return;
var tree = io.read_airport_properties(airport, "jetways"); var tree = io.read_airport_properties(airport, "jetways", nil, 1);
if (tree == nil) if (tree == nil)
{ {
tree = io.read_properties(root ~ "/AI/Airports/" ~ airport ~ "/jetways.xml"); var aiPath = root ~ "/AI/Airports/" ~ airport ~ "/jetways.xml";
if (tree == nil) return; if (io.exists(aiPath)) {
tree = io.read_properties(aiPath, nil, 1);
}
if (tree == nil) return;
} }
append(loaded_airports, airport); append(loaded_airports, airport);
print_debug("Loading jetways for airport " ~ airport); print_debug("Loading jetways for airport " ~ airport);
var nodes = tree.getChildren("jetway"); var nodes = tree.getChildren("jetway");