gdal-libdap.patch

   1 --- gdal-1.7.2/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp.orig  2010-04-24 01:21:25.000000000 +0200
   2 +++ gdal-1.7.2/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp       2010-10-11 07:45:03.847736015 +0200
   3 @@ -150,7 +150,7 @@ int OGRDODSDataSource::Open( const char
   4
   5      try
   6      {
   7 -        poConnection = new AISConnect( oBaseURL );
   8 +        poConnection = new Connect( oBaseURL );
   9          version = poConnection->request_version();
  10      }
  11      catch (Error &e)
  12 --- gdal-1.7.2/ogr/ogrsf_frmts/dods/ogr_dods.h.orig     2010-04-24 01:21:25.000000000 +0200
  13 +++ gdal-1.7.2/ogr/ogrsf_frmts/dods/ogr_dods.h  2010-10-11 07:45:35.795741882 +0200
  14 @@ -61,7 +61,7 @@
  15  #include <Sequence.h>
  16  #include <Grid.h>
  17
  18 -#include <AISConnect.h>
  19 +#include <Connect.h>
  20  #include <DDS.h>
  21  #include <DAS.h>
  22  #include <BaseTypeFactory.h>
  23 @@ -122,7 +122,7 @@ class OGRDODSLayer : public OGRLayer
  24      virtual int         ProvideDataDDS();
  25      int                 bDataLoaded;
  26
  27 -    AISConnect         *poConnection;
  28 +    Connect            *poConnection;
  29      DataDDS            *poDataDDS;
  30
  31      BaseType           *poTargetVar;
  32 @@ -300,7 +300,7 @@ class OGRDODSDataSource : public OGRData
  33      void                AddLayer( OGRDODSLayer * );
  34
  35    public: // Just intended for read access by layer classes.
  36 -    AISConnect         *poConnection;
  37 +    Connect            *poConnection;
  38
  39      DAS                 oDAS;
  40      DDS                 *poDDS;
  41 --- gdal-1.7.2/ogr/ogrsf_frmts/dods/ogrdodslayer.cpp.orig       2010-04-24 01:21:25.000000000 +0200
  42 +++ gdal-1.7.2/ogr/ogrsf_frmts/dods/ogrdodslayer.cpp    2010-10-11 07:45:57.947740205 +0200
  43 @@ -213,7 +213,7 @@ int OGRDODSLayer::ProvideDataDDS()
  44      bDataLoaded = TRUE;
  45      try
  46      {
  47 -        poConnection = new AISConnect( poDS->oBaseURL );
  48 +        poConnection = new Connect( poDS->oBaseURL );
  49          CPLDebug( "DODS", "request_data(%s,%s)",
  50                    poDS->oBaseURL.c_str(),
  51                    (poDS->oProjection + poDS->oConstraints).c_str() );
  52 --- gdal-1.7.2/frmts/dods/dodsdataset2.cpp.orig 2010-04-24 01:21:55.000000000 +0200
  53 +++ gdal-1.7.2/frmts/dods/dodsdataset2.cpp      2010-10-11 07:24:26.275734339 +0200
  54 @@ -50,7 +50,7 @@
  55  #include <Sequence.h>
  56  #include <Grid.h>
  57
  58 -#include <AISConnect.h>
  59 +#include <Connect.h>
  60  #include <DDS.h>
  61  #include <DAS.h>
  62  #include <BaseTypeFactory.h>
  63 @@ -203,7 +203,7 @@ static int GetDimension( string oCE, con
  64  class DODSDataset : public GDALDataset
  65  {
  66  private:
  67 -    AISConnect *poConnect;     //< Virtual connection to the data source
  68 +    Connect *poConnect;        //< Virtual connection to the data source
  69
  70      string oURL;               //< data source URL
  71      double adfGeoTransform[6];
  72 @@ -214,7 +214,7 @@ private:
  73      DDS   *poDDS;
  74      BaseTypeFactory *poBaseTypeFactory;
  75
  76 -    AISConnect *connect_to_server() throw(Error);
  77 +    Connect *connect_to_server() throw(Error);
  78
  79      static string      SubConstraint( string raw_constraint,
  80                                        string x_constraint,
  81 @@ -242,7 +242,7 @@ public:
  82      static GDALDataset *Open(GDALOpenInfo *);
  83
  84      /// Return the connection object
  85 -    AISConnect *GetConnect() { return poConnect; }
  86 +    Connect *GetConnect() { return poConnect; }
  87
  88      /// Return the data source URL
  89      string GetUrl() { return oURL; }
  90 @@ -339,7 +339,7 @@ DODSDataset::~DODSDataset()
  91  /*                         connect_to_server()                          */
  92  /************************************************************************/
  93
  94 -AISConnect *
  95 +Connect *
  96  DODSDataset::connect_to_server() throw(Error)
  97  {
  98      // does the string start with 'http?'
  99 @@ -375,7 +375,7 @@ DODSDataset::connect_to_server() throw(E
 100  /* -------------------------------------------------------------------- */
 101  /*      Connect, and fetch version information.                         */
 102  /* -------------------------------------------------------------------- */
 103 -    AISConnect *poConnection = new AISConnect(oURL);
 104 +    Connect *poConnection = new Connect(oURL);
 105      string version = poConnection->request_version();
 106      /*    if (version.empty() || version.find("/3.") == string::npos)
 107      {