gdal-dods.patch

   1 --- gdal-1.3.0/configure.in.orig        2005-09-03 13:07:50.228591000 +0200
   2 +++ gdal-1.3.0/configure.in     2005-09-03 15:46:35.931464216 +0200
   3 @@ -1396,9 +1396,11 @@
   4      if test -x $DODS_BIN/opendap-config ; then
   5        dnl OPeNDAP 3.4 and earlier lack opendap-config, but use it if avail.
   6        LIBS="$LIBS `$DODS_BIN/opendap-config --libs`"
   7 +      DODS_INC="`$DODS_BIN/opendap-config --cflags`"
   8      elif test -x $DODS_BIN/dap-config ; then
   9        dnl OPeNDAP 3.4 and earlier lack opendap-config, but use it if avail.
  10        LIBS="$LIBS `$DODS_BIN/dap-config --libs`"
  11 +      DODS_INC="`$DODS_BIN/dap-config --cflags`"
  12      else
  13        dnl Otherwise try to put things together in a more primitive way.
  14        LIBS="$LIBS -L$DODS_LIB -ldap++ -lpthread -lrx"
  15
  16 --- gdal-1.6.1/frmts/dods/dodsdataset2.cpp.org  2009-07-15 12:54:31.160838902 +0200
  17 +++ gdal-1.6.1/frmts/dods/dodsdataset2.cpp      2009-07-15 12:58:38.080454628 +0200
  18 @@ -693,15 +693,15 @@
  19  /* -------------------------------------------------------------------- */
  20  /*      Try and fetch the corresponding DAS subtree if it exists.       */
  21  /* -------------------------------------------------------------------- */
  22 -    AttrTable *poFileInfo = oDAS.find_container( "GLOBAL" );
  23 +    AttrTable *poFileInfo = oDAS.container()->find_container( "GLOBAL" );
  24
  25      if( poFileInfo == NULL )
  26      {
  27 -        poFileInfo = oDAS.find_container( "NC_GLOBAL" );
  28 +        poFileInfo = oDAS.container()->find_container( "NC_GLOBAL" );
  29
  30         if( poFileInfo == NULL )
  31         {
  32 -           poFileInfo = oDAS.find_container( "HDF_GLOBAL" );
  33 +           poFileInfo = oDAS.container()->find_container( "HDF_GLOBAL" );
  34
  35             if( poFileInfo == NULL )
  36             {
  37 @@ -1275,7 +1275,7 @@
  38  /* -------------------------------------------------------------------- */
  39  /*      Try and fetch the corresponding DAS subtree if it exists.       */
  40  /* -------------------------------------------------------------------- */
  41 -    AttrTable *poBandInfo = poDODS->GetDAS().find_container( oVarName );
  42 +    AttrTable *poBandInfo = poDODS->GetDAS().container()->find_container( oVarName );
  43
  44      if( poBandInfo == NULL )
  45      {
  46 --- gdal-1.6.1/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp~      2009-07-15 13:13:25.060367275 +0200
  47 +++ gdal-1.6.1/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp       2009-07-15 13:13:49.337227887 +0200
  48 @@ -196,9 +196,9 @@
  49      for( dv_i = oDAS.container()->attr_begin(); dv_i != oDAS.container()->attr_end(); dv_i++ )
  50      {
  51          if( EQUALN(oDAS.get_name(dv_i).c_str(),"ogr_layer_info",14)
  52 -            && oDAS.is_container( dv_i ) )
  53 +            && oDAS.container()->is_container( dv_i ) )
  54          {
  55 -            AttrTable *poAttr = oDAS.get_attr_table( dv_i );
  56 +            AttrTable *poAttr = oDAS.container()->get_attr_table( dv_i );
  57              string target_container = poAttr->get_attr( "target_container" );
  58              BaseType *poVar = poDDS->var( target_container.c_str() );
  59
  60 --- gdal-1.6.1/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp~      2009-07-15 13:14:32.077112316 +0200
  61 +++ gdal-1.6.1/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp       2009-07-15 13:34:25.010626056 +0200
  62 @@ -193,7 +193,7 @@
  63  /* -------------------------------------------------------------------- */
  64      AttrTable::Attr_iter dv_i;
  65
  66 -    for( dv_i = oDAS.attr_begin(); dv_i != oDAS.attr_end(); dv_i++ )
  67 +    for( dv_i = oDAS.container()->attr_begin(); dv_i != oDAS.container()->attr_end(); dv_i++ )
  68      {
  69          if( EQUALN(oDAS.get_name(dv_i).c_str(),"ogr_layer_info",14)
  70              && oDAS.container()->is_container( dv_i ) )