//
// $Id$
-
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-// #include <sys/types.h> // for gdbm open flags
-// #include <sys/stat.h> // for gdbm open flags
-
-// #ifdef HAVE_GDBM
-// # include <gdbm.h>
-// #else
-// # include <simgear/gdbm/gdbm.h>
-// #endif
-
#include <simgear/compiler.h>
#include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgstream.hxx>
-
-#include <Main/options.hxx>
+#include <simgear/misc/sgstream.hxx>
#include STL_STRING
#include STL_FUNCTIONAL
#include "simple.hxx"
-FG_USING_NAMESPACE(std);
+SG_USING_NAMESPACE(std);
+
+#ifndef _MSC_VER
+# define NDEBUG // she don't work without it.
+#endif
+#include <mk4.h>
+#include <mk4str.h>
+#ifndef _MSC_VER
+# undef NDEBUG
+#endif
+
+#ifdef SG_HAVE_STD_INCLUDES
+# include <istream>
+#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
+# include <iostream.h>
+#elif defined( __BORLANDC__ ) || defined (__APPLE__)
+# include <iostream>
+#else
+# include <istream.h>
+#endif
+#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
+SG_USING_STD(istream);
+#endif
+
+
+inline istream&
+operator >> ( istream& in, FGAirport& a )
+{
+ return in >> a.id >> a.latitude >> a.longitude >> a.elevation;
+}
+
FGAirports::FGAirports( const string& file ) {
// open the specified database readonly
storage = new c4_Storage( file.c_str(), false );
if ( !storage->Strategy().IsValid() ) {
- FG_LOG( FG_GENERAL, FG_ALERT, "Cannot open file: " << file );
+ SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << file );
exit(-1);
}
return false;
}
- c4_RowRef r = vAirport->GetAt(idx);
-
+ c4_RowRef r = vAirport->GetAt(idx);
+ a->id = (const char *) pID(r); /// NHV fix wrong case crash
a->longitude = (double) pLon(r);
- a->latitude = (double) pLat(r);
+ a->latitude = (double) pLat(r);
a->elevation = (double) pElev(r);
return true;
// Destructor
FGAirports::~FGAirports( void ) {
- // gdbm_close( dbf );
+ delete storage;
}
airports.erase( airports.begin(), airports.end() );
- fg_gzifstream in( file );
+ sg_gzifstream in( file );
if ( !in.is_open() ) {
- FG_LOG( FG_GENERAL, FG_ALERT, "Cannot open file: " << file );
+ SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << file );
exit(-1);
+ } else {
+ SG_LOG( SG_GENERAL, SG_ALERT, "opened: " << file );
}
- /*
- // We can use the STL copy algorithm because the input
- // file doesn't contain and comments or blank lines.
- copy( istream_iterator<FGAirport,ptrdiff_t>(in.stream()),
- istream_iterator<FGAirport,ptrdiff_t>(),
- inserter( airports, airports.begin() ) );
- */
+ // skip first line of file
+ char tmp[2048];
+ in.getline( tmp, 2048 );
// read in each line of the file
#ifdef __MWERKS__
- in >> skipcomment;
+ in >> ::skipws;
char c = 0;
while ( in.get(c) && c != '\0' ) {
- in.putback(c);
- in >> a;
- airports.insert(a);
- in >> skipcomment;
+ if ( c == 'A' ) {
+ in >> a;
+ SG_LOG( SG_GENERAL, SG_INFO, a.id );
+ in >> skipeol;
+ airports.insert(a);
+ } else if ( c == 'R' ) {
+ in >> skipeol;
+ } else {
+ in >> skipeol;
+ }
+ in >> ::skipws;
}
#else
- in >> skipcomment;
+ in >> ::skipws;
+ string token;
while ( ! in.eof() ) {
- in >> a;
- airports.insert(a);
- in >> skipcomment;
+ in >> token;
+ if ( token == "A" ) {
+ in >> a;
+ SG_LOG( SG_GENERAL, SG_INFO, "in <- " << a.id );
+ in >> skipeol;
+ airports.insert(a);
+ } else if ( token == "R" ) {
+ in >> skipeol;
+ } else {
+ in >> skipeol;
+ }
+ in >> ::skipws;
}
#endif
c4_Row row;
- iterator current = airports.begin();
+ const_iterator current = airports.begin();
const_iterator end = airports.end();
while ( current != end ) {
// add each airport record
+ cout << "out -> " << current->id << endl;
pID (row) = current->id.c_str();
pLon (row) = current->longitude;
pLat (row) = current->latitude;