Upgraded to handle new default.apt.gz file.
This commit is contained in:
parent
7ec0025615
commit
fe0c17625b
3 changed files with 16 additions and 10 deletions
|
@ -1,11 +1,15 @@
|
|||
// dump out a gdbm version of the simple airport file
|
||||
|
||||
#include <simgear/debug/logstream.hxx>
|
||||
|
||||
#include "simple.hxx"
|
||||
|
||||
int main( int argc, char **argv ) {
|
||||
FGAirportsUtil airports;
|
||||
FGAirport a;
|
||||
|
||||
sglog().setLogLevels( SG_ALL, SG_INFO );
|
||||
|
||||
if ( argc == 3 ) {
|
||||
airports.load( argv[1] );
|
||||
airports.dump_mk4( argv[2] );
|
||||
|
|
|
@ -232,8 +232,8 @@ int FGRunwaysUtil::load( const string& file ) {
|
|||
}
|
||||
|
||||
// skip first line of file
|
||||
char tmp[256];
|
||||
in.getline( tmp, 256 );
|
||||
char tmp[2048];
|
||||
in.getline( tmp, 2048 );
|
||||
|
||||
// read in each line of the file
|
||||
|
||||
|
|
|
@ -121,12 +121,13 @@ int FGAirportsUtil::load( const string& file ) {
|
|||
if ( !in.is_open() ) {
|
||||
SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << file );
|
||||
exit(-1);
|
||||
} else {
|
||||
SG_LOG( SG_GENERAL, SG_ALERT, "opened: " << file );
|
||||
}
|
||||
|
||||
// skip first line of file
|
||||
char tmp[256];
|
||||
in.getline( tmp, 256 );
|
||||
|
||||
char tmp[2048];
|
||||
in.getline( tmp, 2048 );
|
||||
|
||||
// read in each line of the file
|
||||
|
||||
|
@ -137,6 +138,7 @@ int FGAirportsUtil::load( const string& file ) {
|
|||
while ( in.get(c) && c != '\0' ) {
|
||||
if ( c == 'A' ) {
|
||||
in >> a;
|
||||
SG_LOG( SG_GENERAL, SG_INFO, a.id );
|
||||
in >> skipeol;
|
||||
airports.insert(a);
|
||||
} else if ( c == 'R' ) {
|
||||
|
@ -150,15 +152,15 @@ int FGAirportsUtil::load( const string& file ) {
|
|||
#else
|
||||
|
||||
in >> ::skipws;
|
||||
string token;
|
||||
while ( ! in.eof() ) {
|
||||
char c = 0;
|
||||
in.get(c);
|
||||
if ( c == 'A' ) {
|
||||
in >> token;
|
||||
if ( token == "A" ) {
|
||||
in >> a;
|
||||
cout << "in <- " << a.id << endl;
|
||||
SG_LOG( SG_GENERAL, SG_INFO, "in <- " << a.id );
|
||||
in >> skipeol;
|
||||
airports.insert(a);
|
||||
} else if ( c == 'R' ) {
|
||||
} else if ( token == "R" ) {
|
||||
in >> skipeol;
|
||||
} else {
|
||||
in >> skipeol;
|
||||
|
|
Loading…
Add table
Reference in a new issue