fly/flightgear
1
0
Fork 0
Code Activity

Fix Traffic Manager XML parser

Browse source
This commit is contained in:
fredb 2008-06-01 11:56:32 +00:00
parent 61dc8df110
commit af879b8310
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Traffic/TrafficMgr.cxx
View file

@ -231,12 +231,16 @@ void FGTrafficManager::startElement (const char * name, const XMLAttributes &at
path.append(attval);
readXML(path.str(), *this);
}
elementValueStack.push_back( "" );
// cout << " " << atts.getName(i) << '=' << atts.getValue(i) << endl;
}
void FGTrafficManager::endElement (const char * name) {
//cout << "End element " << name << endl;
string element(name);
string value = elementValueStack.back();
elementValueStack.pop_back();
if (element == string("model"))
mdl = value;
else if (element == string("livery"))
@ -326,7 +330,7 @@ void FGTrafficManager::endElement (const char * name) {
// flights.pop_back();
// }
}
for (FGScheduledFlightVecIterator flt = flights.begin(); flt != flights.end(); flt++)
for (FGScheduledFlightVecIterator flt = flights.begin(); flt != flights.end(); flt++)
{
delete (*flt);
}
@ -342,10 +346,7 @@ void FGTrafficManager::endElement (const char * name) {
void FGTrafficManager::data (const char * s, int len) {
string token = string(s,len);
//cout << "Character data " << string(s,len) << endl;
if ((token.find(" ") == string::npos && (token.find('\n')) == string::npos))
value += token;
else
value = string("");
elementValueStack.back() += token;
}
void FGTrafficManager::pi (const char * target, const char * data) {

2
src/Traffic/TrafficMgr.hxx
View file

@ -43,7 +43,7 @@ class FGTrafficManager : public SGSubsystem, public XMLVisitor
private:
ScheduleVector scheduledAircraft;
ScheduleVectorIterator currAircraft, currAircraftClosest;
string value;
vector<string> elementValueStack;
string mdl, livery, registration, callsign, fltrules,
port, timeString, departurePort, departureTime, arrivalPort, arrivalTime,