fly/terragear
1
0
Fork 0
Code Activity

genapts850: make sure we do not hang forever in a parse loop

Browse source 
when there are actually no airports to parse within the bounding box
This commit is contained in:
Christian Schmitt 2012-08-06 19:41:36 +02:00
parent abece63b5d
commit 4293c00b73
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Airports/GenAirports850/main.cxx
View file

@ -394,19 +394,21 @@ int main(int argc, char **argv)
position = scheduler->FindAirport( start_id ); position = scheduler->FindAirport( start_id );
// add remaining airports within boundary // add remaining airports within boundary
scheduler->AddAirports( position, min_lat, min_lon, max_lat, max_lon ); if ( scheduler->AddAirports( position, min_lat, min_lon, max_lat, max_lon ) )
{
// parse all the airports that were found // parse all the airports that were found
scheduler->Schedule( num_threads, summary_file ); scheduler->Schedule( num_threads, summary_file );
} }
}
else else
{ {
// find all airports within given boundary // find all airports within given boundary
scheduler->AddAirports( 0, min_lat, min_lon, max_lat, max_lon ); if ( scheduler->AddAirports( 0, min_lat, min_lon, max_lat, max_lon ) )
{
// and parser them // and parse them
scheduler->Schedule( num_threads, summary_file ); scheduler->Schedule( num_threads, summary_file );
} }
}
SG_LOG(SG_GENERAL, SG_INFO, "Done"); SG_LOG(SG_GENERAL, SG_INFO, "Done");
exit(0); exit(0);

11
src/Airports/GenAirports850/scheduler.cxx
View file

@ -590,7 +590,7 @@ void Scheduler::RetryAirport( AirportInfo* pai )
retryList.push_back( *pai ); retryList.push_back( *pai );
} }
void Scheduler::AddAirports( long start_pos, float min_lat, float min_lon, float max_lat, float max_lon ) bool Scheduler::AddAirports( long start_pos, float min_lat, float min_lon, float max_lat, float max_lon )
{ {
char line[2048]; char line[2048];
char* def; char* def;
@ -760,6 +760,15 @@ void Scheduler::AddAirports( long start_pos, float min_lat, float min_lon, float
} }
} }
} }
// did we add airports to the parse list?
if ( originalList.size() )
{
return true;
} else
{
return false;
}
} }
Scheduler::Scheduler(string& cmd, string& datafile, const string& root, const string_list& elev_src) Scheduler::Scheduler(string& cmd, string& datafile, const string& root, const string_list& elev_src)

2
src/Airports/GenAirports850/scheduler.hxx
View file

@ -176,7 +176,7 @@ public:
long FindAirport( string icao ); long FindAirport( string icao );
void AddAirport( string icao ); void AddAirport( string icao );
void AddAirports( long start_pos, float min_lat, float min_lon, float max_lat, float max_lon ); bool AddAirports( long start_pos, float min_lat, float min_lon, float max_lat, float max_lon );
void RetryAirport( AirportInfo* pInfo ); void RetryAirport( AirportInfo* pInfo );
void Schedule( int num_threads, string& summaryfile ); void Schedule( int num_threads, string& summaryfile );