commit b3b30634d3f8f46282dfb5bdcc7a3b0b1ea025d1
Author: Jakub Bogusz <[email protected]>
Date: Sun Mar 9 03:39:31 2014 +0100
- new
opendap-cdf_handler-bes.patch | 619 +++++++++++++++++++++++++++++++++++++
opendap-cdf_handler-includes.patch | 30 ++
opendap-cdf_handler-libdap.patch | 251 +++++++++++++++
opendap-cdf_handler.spec | 81 +++++
4 files changed, 981 insertions(+)
---
diff --git a/opendap-cdf_handler.spec b/opendap-cdf_handler.spec
new file mode 100644
index 0000000..ec444aa
--- /dev/null
+++ b/opendap-cdf_handler.spec
@@ -0,0 +1,81 @@
+Summary: CDF 3 data handler for the OPeNDAP data server
+Summary(pl.UTF-8): Moduł obsługujący dane CDF 3 dla serwera danych OPeNDAP
+Name: opendap-cdf_handler
+Version: 1.0.3
+Release: 1
+License: LGPL v2.1+
+Group: Daemons
+Source0: http://www.opendap.org/pub/source/cdf_handler-%{version}.tar.gz
+# Source0-md5: 79060adceda4e72265e1899f80926639
+Patch0: %{name}-libdap.patch
+Patch1: %{name}-includes.patch
+Patch2: %{name}-bes.patch
+URL: http://opendap.org/
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake
+BuildRequires: bes-devel >= 3.6.0
+BuildRequires: cdflib-devel >= 3.1
+BuildRequires: libdap-devel >= 3.8.0
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:1.5
+BuildRequires: pkgconfig
+Requires: bes >= 3.6.0
+Requires: cdflib >= 3.1
+Requires: libdap >= 3.8.0
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This is the CDF data handler for OPeNDAP data server. It reads
+cdf31-dist files and returns DAP responses that are compatible with
+DAP2 and the dap-server software.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera moduł obsługi danych CDF dla serwera danych
+OPeNDAP. Odczytuje pliki cdf31-dist i zwraca odpowiedzi DAP zgodne z
+DAP2 oraz oprogramowaniem dap-server.
+
+%prep
+%setup -q -n cdf_handler-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%build
+# rebuild autotools for -as-needed to work
+%{__libtoolize}
+%{__aclocal} -I conf
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+ --disable-static \
+ --with-cdf-include=%{_includedir} \
+ --with-cdf-libdir=%{_libdir}
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/bes/*.la
+# API not exported
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.{la,so}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc COPYRIGHT ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/bes-cdf-data.sh
+%attr(755,root,root) %{_bindir}/dap_cdf_handler
+%attr(755,root,root) %{_libdir}/libcdf_handler.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcdf_handler.so.1
+%attr(755,root,root) %{_libdir}/bes/libcdf_module.so
+%dir %{_datadir}/hyrax/data/cdf
+%{_datadir}/hyrax/data/cdf/*.cdf
diff --git a/opendap-cdf_handler-bes.patch b/opendap-cdf_handler-bes.patch
new file mode 100644
index 0000000..2e3df00
--- /dev/null
+++ b/opendap-cdf_handler-bes.patch
@@ -0,0 +1,619 @@
+--- cdf_handler-1.0.3/CDFRequestHandler.cc.orig 2008-02-14
21:20:33.000000000 +0100
++++ cdf_handler-1.0.3/CDFRequestHandler.cc 2014-03-08 20:05:22.774787947
+0100
+@@ -44,18 +44,19 @@
+
+ #include "CDFRequestHandler.h"
+ #include "CDFTypeFactory.h"
+-#include "BESResponseHandler.h"
+-#include "BESResponseNames.h"
+-#include "BESDataNames.h"
++#include <BESResponseHandler.h>
++#include <BESResponseNames.h>
++#include <BESDapNames.h>
++#include <BESDataNames.h>
+ #include "CDFreadAttributes.h"
+-#include "BESDASResponse.h"
++#include <BESDASResponse.h>
+ #include "CDFreadDescriptors.h"
+-#include "BESDDSResponse.h"
+-#include "BESDataDDSResponse.h"
+-#include "BESConstraintFuncs.h"
+-#include "BESVersionInfo.h"
+-#include "TheBESKeys.h"
+-#include "BESInternalError.h"
++#include <BESDDSResponse.h>
++#include <BESDataDDSResponse.h>
++#include <BESConstraintFuncs.h>
++#include <BESVersionInfo.h>
++#include <TheBESKeys.h>
++#include <BESInternalError.h>
+ #include "config_cdf.h"
+
+ CDFRequestHandler::CDFRequestHandler( const string &name )
+@@ -174,7 +175,7 @@
+ CDFRequestHandler::cdf_build_version( BESDataHandlerInterface &dhi )
+ {
+ BESVersionInfo *info = dynamic_cast<BESVersionInfo
*>(dhi.response_handler->get_response_object() ) ;
+- info->addHandlerVersion( PACKAGE_NAME, PACKAGE_VERSION ) ;
++ info->add_module( PACKAGE_NAME, PACKAGE_VERSION ) ;
+ return true ;
+ }
+
+--- cdf_handler-1.0.3/CDFModule.cc.orig 2007-07-31 20:33:14.000000000
+0200
++++ cdf_handler-1.0.3/CDFModule.cc 2014-03-08 20:20:59.241415314 +0100
+@@ -48,41 +48,41 @@
+ void
+ CDFModule::initialize( const string &modname )
+ {
+- BESDEBUG( "cdf", "Initializing CDF module " << modname << endl )
++ BESDEBUG( "cdf", "Initializing CDF module " << modname << endl ) ;
+
+- BESDEBUG( "cdf", " adding " << modname << " request handler" << endl )
++ BESDEBUG( "cdf", " adding " << modname << " request handler" << endl )
;
+ BESRequestHandler *handler = new CDFRequestHandler( modname ) ;
+ BESRequestHandlerList::TheList()->add_handler( modname, handler ) ;
+
+- BESDEBUG( "cdf", " adding " << CDF_CATALOG << " catalog" << endl )
++ BESDEBUG( "cdf", " adding " << CDF_CATALOG << " catalog" << endl ) ;
+ BESCatalogList::TheCatalogList()->add_catalog( new BESCatalogDirectory(
CDF_CATALOG) ) ;
+
+- BESDEBUG( "cdf", " adding catalog container storage " << CDF_CATALOG
<< endl )
++ BESDEBUG( "cdf", " adding catalog container storage " << CDF_CATALOG
<< endl ) ;
+ BESContainerStorageCatalog *csc = new BESContainerStorageCatalog(
CDF_CATALOG ) ;
+ BESContainerStorageList::TheList()->add_persistence( csc ) ;
+
+- BESDEBUG( "cdf", " adding cdf debug context" << endl )
++ BESDEBUG( "cdf", " adding cdf debug context" << endl ) ;
+ BESDebug::Register( "cdf" ) ;
+
+- BESDEBUG( "cdf", "Done Initializing CDF module " << modname << endl )
++ BESDEBUG( "cdf", "Done Initializing CDF module " << modname << endl ) ;
+ }
+
+ void
+ CDFModule::terminate( const string &modname )
+ {
+- BESDEBUG( "cdf", "Cleaning CDF module " << modname << endl )
++ BESDEBUG( "cdf", "Cleaning CDF module " << modname << endl ) ;
+
+- BESDEBUG( "cdf", " removing CDF Handler" << modname << endl )
++ BESDEBUG( "cdf", " removing CDF Handler" << modname << endl ) ;
+ BESRequestHandler *rh = BESRequestHandlerList::TheList()->remove_handler(
modname ) ;
+ if( rh ) delete rh ;
+
+- BESDEBUG( "cdf", " removing catalog container storage" << CDF_CATALOG
<< endl )
+- BESContainerStorageList::TheList()->del_persistence( CDF_CATALOG ) ;
++ BESDEBUG( "cdf", " removing catalog container storage" << CDF_CATALOG
<< endl ) ;
++ BESContainerStorageList::TheList()->deref_persistence( CDF_CATALOG ) ;
+
+- BESDEBUG( "cdf", " removing " << CDF_CATALOG << " catalog" << endl )
+- BESCatalogList::TheCatalogList()->del_catalog( CDF_CATALOG ) ;
++ BESDEBUG( "cdf", " removing " << CDF_CATALOG << " catalog" << endl ) ;
++ BESCatalogList::TheCatalogList()->deref_catalog( CDF_CATALOG ) ;
+
+- BESDEBUG( "cdf", "Done Cleaning CDF module " << modname << endl )
++ BESDEBUG( "cdf", "Done Cleaning CDF module " << modname << endl ) ;
+ }
+
+ /** @brief dumps information about this object
+--- cdf_handler-1.0.3/CDFArray.cc.orig 2007-07-31 20:33:14.000000000 +0200
++++ cdf_handler-1.0.3/CDFArray.cc 2014-03-08 20:22:28.398078241 +0100
+@@ -106,7 +106,7 @@
+ /*************************************************************************
+ * Open the CDF.
+ *************************************************************************/
+- BESDEBUG( "cdf", "CDFArray: " << name() << ": Opening " << dataset <<
endl )
++ BESDEBUG( "cdf", "CDFArray: " << name() << ": Opening " << dataset <<
endl ) ;
+ status = CDFopen ( dataset.c_str(), &id ) ;
+ if ( status != CDF_OK )
+ {
+@@ -173,21 +173,21 @@
+
+ if( BESISDEBUG( "cdf" ) )
+ {
+- BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl )
+- BESDEBUG( "cdf", " numDims = " << numDims << endl )
++ BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl ) ;
++ BESDEBUG( "cdf", " numDims = " << numDims << endl ) ;
+ for( unsigned int i_numDims = 0; i_numDims < numDims; i_numDims++ )
+ {
+- BESDEBUG( "cdf", " dimSizes[" << i_numDims << "] = " <<
dimSizes[i_numDims] << endl )
+- if( dimVarys[i_numDims] == VARY )
+- BESDEBUG( "cdf", " dimVarys[" << i_numDims << "] = VARY" <<
endl )
+- else
+- BESDEBUG( "cdf", " dimVarys[" << i_numDims << "] = NOVARY"
<< endl )
+- }
+- BESDEBUG( "cdf", " maxRec = " << maxRec << endl )
+- BESDEBUG( "cdf", " numRecs = " << numRecs << endl )
+- if( recVary == VARY ) BESDEBUG( "cdf", " recVary = VARY" << endl )
+- else BESDEBUG( "cdf", " recVary = VARY" << endl )
+- BESDEBUG( "cdf", " numElems = " << numElems << endl )
++ BESDEBUG( "cdf", " dimSizes[" << i_numDims << "] = " <<
dimSizes[i_numDims] << endl ) ;
++ if( dimVarys[i_numDims] == VARY ) {
++ BESDEBUG( "cdf", " dimVarys[" << i_numDims << "] = VARY" <<
endl ) ;
++ } else
++ BESDEBUG( "cdf", " dimVarys[" << i_numDims << "] = NOVARY"
<< endl ) ;
++ }
++ BESDEBUG( "cdf", " maxRec = " << maxRec << endl ) ;
++ BESDEBUG( "cdf", " numRecs = " << numRecs << endl ) ;
++ if( recVary == VARY ) { BESDEBUG( "cdf", " recVary = VARY" << endl ) ;
}
++ else BESDEBUG( "cdf", " recVary = VARY" << endl ) ;
++ BESDEBUG( "cdf", " numElems = " << numElems << endl ) ;
+ }
+ if( numRecs == 0 )
+ {
+@@ -208,7 +208,7 @@
+ }
+ }
+ }
+- BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
++ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl ) ;
+
+ unsigned long relements = 1 ;
+ for( anindex = 0; anindex < numDims; anindex++ )
+@@ -221,19 +221,19 @@
+ {
+ counts[anindex] = 1 ;
+ }
+- BESDEBUG( "cdf", " counts[" << anindex << "] = " << counts[anindex] <<
endl )
++ BESDEBUG( "cdf", " counts[" << anindex << "] = " << counts[anindex] <<
endl ) ;
+ relements = relements * counts[anindex] ;
+ }
+- BESDEBUG( "cdf", " relements = " << relements << endl )
++ BESDEBUG( "cdf", " relements = " << relements << endl ) ;
+
+ // telements is the total number of elements to read
+ unsigned long telements = relements * numRecs ;
+- BESDEBUG( "cdf", " telements = " << telements << endl )
++ BESDEBUG( "cdf", " telements = " << telements << endl ) ;
+
+ // rsize is the record size given the number of elements per record and
+ // the size of each element
+ unsigned long rsize = relements * varTypeSize ;
+- BESDEBUG( "cdf", " rsize = " << rsize << endl )
++ BESDEBUG( "cdf", " rsize = " << rsize << endl ) ;
+
+ // allocate the buffer that will read each of the records
+ cdf_buf = malloc( rsize+1 ) ;
+--- cdf_handler-1.0.3/CDFByte.cc.orig 2014-03-08 18:51:20.584974368 +0100
++++ cdf_handler-1.0.3/CDFByte.cc 2014-03-08 20:23:04.531410057 +0100
+@@ -110,7 +110,7 @@
+ /*************************************************************************
+ * Open the CDF.
+ *************************************************************************/
+- BESDEBUG( "cdf", "CDFByte: " << name() << ": Opening " << dataset << endl
)
++ BESDEBUG( "cdf", "CDFByte: " << name() << ": Opening " << dataset << endl
) ;
+ status = CDFopen ( dataset.c_str(), &id ) ;
+ if ( status != CDF_OK )
+ {
+@@ -177,12 +177,12 @@
+
+ if( BESISDEBUG( "cdf" ) )
+ {
+- BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl )
+- BESDEBUG( "cdf", " numDims = " << numDims << endl )
+- BESDEBUG( "cdf", " maxRec = " << maxRec << endl )
+- BESDEBUG( "cdf", " numRecs = " << numRecs << endl )
+- BESDEBUG( "cdf", " recVary = " << recVary << endl )
+- BESDEBUG( "cdf", " numElems = " << numElems << endl )
++ BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl ) ;
++ BESDEBUG( "cdf", " numDims = " << numDims << endl ) ;
++ BESDEBUG( "cdf", " maxRec = " << maxRec << endl ) ;
++ BESDEBUG( "cdf", " numRecs = " << numRecs << endl ) ;
++ BESDEBUG( "cdf", " recVary = " << recVary << endl ) ;
++ BESDEBUG( "cdf", " numElems = " << numElems << endl ) ;
+ }
+
+ if( varType != CDF_BYTE )
+@@ -211,7 +211,7 @@
+ return false ;
+ }
+ }
+- BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
++ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl ) ;
+
+ cdf_buf = malloc( varTypeSize ) ;
+ arrbuf = (void *)&d_buf ;
+@@ -246,7 +246,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " d_buf = " << (int)d_buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << (int)d_buf << endl ) ;
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFFloat32.cc.orig 2014-03-08 18:55:23.834964161
+0100
++++ cdf_handler-1.0.3/CDFFloat32.cc 2014-03-08 20:23:39.871408572 +0100
+@@ -110,7 +110,7 @@
+ /*************************************************************************
+ * Open the CDF.
+ *************************************************************************/
+- BESDEBUG( "cdf", "CDFFloat32: " << name() << ": Opening " << dataset <<
endl )
++ BESDEBUG( "cdf", "CDFFloat32: " << name() << ": Opening " << dataset <<
endl ) ;
+ status = CDFopen ( dataset.c_str(), &id ) ;
+ if ( status != CDF_OK )
+ {
+@@ -176,12 +176,12 @@
+ }
+ if( BESISDEBUG( "cdf" ) )
+ {
+- BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl )
+- BESDEBUG( "cdf", " numDims = " << numDims << endl )
+- BESDEBUG( "cdf", " maxRec = " << maxRec << endl )
+- BESDEBUG( "cdf", " numRecs = " << numRecs << endl )
+- BESDEBUG( "cdf", " recVary = " << recVary << endl )
+- BESDEBUG( "cdf", " numElems = " << numElems << endl )
++ BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl ) ;
++ BESDEBUG( "cdf", " numDims = " << numDims << endl ) ;
++ BESDEBUG( "cdf", " maxRec = " << maxRec << endl ) ;
++ BESDEBUG( "cdf", " numRecs = " << numRecs << endl ) ;
++ BESDEBUG( "cdf", " recVary = " << recVary << endl ) ;
++ BESDEBUG( "cdf", " numElems = " << numElems << endl ) ;
+ }
+
+ if( varType != CDF_REAL4 && varType != CDF_FLOAT )
+@@ -211,7 +211,7 @@
+ return false ;
+ }
+ }
+- BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
++ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl ) ;
+
+ cdf_buf = malloc( varTypeSize ) ;
+ arrbuf = (void *)&d_buf ;
+@@ -246,7 +246,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl ) ;
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFFloat64.cc.orig 2014-03-08 18:56:55.804960301
+0100
++++ cdf_handler-1.0.3/CDFFloat64.cc 2014-03-08 20:24:08.501407371 +0100
+@@ -109,7 +109,7 @@
+ /*************************************************************************
+ * Open the CDF.
+ *************************************************************************/
+- BESDEBUG( "cdf", "CDFFloat64: " << name() << ": Opening " << dataset <<
endl )
++ BESDEBUG( "cdf", "CDFFloat64: " << name() << ": Opening " << dataset <<
endl ) ;
+ status = CDFopen ( dataset.c_str(), &id ) ;
+ if ( status != CDF_OK )
+ {
+@@ -174,12 +174,12 @@
+ }
+ if( BESISDEBUG( "cdf" ) )
+ {
+- BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl )
+- BESDEBUG( "cdf", " numDims = " << numDims << endl )
+- BESDEBUG( "cdf", " maxRec = " << maxRec << endl )
+- BESDEBUG( "cdf", " numRecs = " << numRecs << endl )
+- BESDEBUG( "cdf", " recVary = " << recVary << endl )
+- BESDEBUG( "cdf", " numElems = " << numElems << endl )
++ BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl ) ;
++ BESDEBUG( "cdf", " numDims = " << numDims << endl ) ;
++ BESDEBUG( "cdf", " maxRec = " << maxRec << endl ) ;
++ BESDEBUG( "cdf", " numRecs = " << numRecs << endl ) ;
++ BESDEBUG( "cdf", " recVary = " << recVary << endl ) ;
++ BESDEBUG( "cdf", " numElems = " << numElems << endl ) ;
+ }
+
+ if( varType != CDF_REAL8 && varType != CDF_DOUBLE && varType != CDF_EPOCH
)
+@@ -209,7 +209,7 @@
+ return false ;
+ }
+ }
+- BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
++ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl ) ;
+
+ cdf_buf = malloc( varTypeSize ) ;
+ arrbuf = (void *)&d_buf ;
+@@ -244,7 +244,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl ) ;
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFInt16.cc.orig 2014-03-08 18:57:35.551625300 +0100
++++ cdf_handler-1.0.3/CDFInt16.cc 2014-03-08 20:24:38.768072768 +0100
+@@ -108,7 +108,7 @@
+ /*************************************************************************
+ * Open the CDF.
+ *************************************************************************/
+- BESDEBUG( "cdf", "CDFInt16: " << name() << ": Opening " << dataset <<
endl )
++ BESDEBUG( "cdf", "CDFInt16: " << name() << ": Opening " << dataset <<
endl ) ;
+ status = CDFopen ( dataset.c_str(), &id ) ;
+ if ( status != CDF_OK )
+ {
+@@ -175,12 +175,12 @@
+
+ if( BESISDEBUG( "cdf" ) )
+ {
+- BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl )
+- BESDEBUG( "cdf", " numDims = " << numDims << endl )
+- BESDEBUG( "cdf", " maxRec = " << maxRec << endl )
+- BESDEBUG( "cdf", " numRecs = " << numRecs << endl )
+- BESDEBUG( "cdf", " recVary = " << recVary << endl )
+- BESDEBUG( "cdf", " numElems = " << numElems << endl )
++ BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl ) ;
++ BESDEBUG( "cdf", " numDims = " << numDims << endl ) ;
++ BESDEBUG( "cdf", " maxRec = " << maxRec << endl ) ;
++ BESDEBUG( "cdf", " numRecs = " << numRecs << endl ) ;
++ BESDEBUG( "cdf", " recVary = " << recVary << endl ) ;
++ BESDEBUG( "cdf", " numElems = " << numElems << endl ) ;
+ }
+
+ if( varType != CDF_INT2 && varType != CDF_INT1 )
+@@ -210,7 +210,7 @@
+ return false ;
+ }
+ }
+- BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
++ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl ) ;
+
+ cdf_buf = malloc( varTypeSize ) ;
+ arrbuf = (void *)&d_buf ;
+@@ -245,7 +245,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl ) ;
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFInt32.cc.orig 2014-03-08 18:58:48.084955588 +0100
++++ cdf_handler-1.0.3/CDFInt32.cc 2014-03-08 20:25:43.451403387 +0100
+@@ -108,7 +108,7 @@
+ /*************************************************************************
+ * Open the CDF.
+ *************************************************************************/
+- BESDEBUG( "cdf", "CDFInt32: " << name() << ": Opening " << dataset <<
endl )
++ BESDEBUG( "cdf", "CDFInt32: " << name() << ": Opening " << dataset <<
endl ) ;
+ status = CDFopen ( dataset.c_str(), &id ) ;
+ if ( status != CDF_OK )
+ {
+@@ -175,12 +175,12 @@
+
+ if( BESISDEBUG( "cdf" ) )
+ {
+- BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl )
+- BESDEBUG( "cdf", " numDims = " << numDims << endl )
+- BESDEBUG( "cdf", " maxRec = " << maxRec << endl )
+- BESDEBUG( "cdf", " numRecs = " << numRecs << endl )
+- BESDEBUG( "cdf", " recVary = " << recVary << endl )
+- BESDEBUG( "cdf", " numElems = " << numElems << endl )
++ BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl ) ;
++ BESDEBUG( "cdf", " numDims = " << numDims << endl ) ;
++ BESDEBUG( "cdf", " maxRec = " << maxRec << endl ) ;
++ BESDEBUG( "cdf", " numRecs = " << numRecs << endl ) ;
++ BESDEBUG( "cdf", " recVary = " << recVary << endl ) ;
++ BESDEBUG( "cdf", " numElems = " << numElems << endl ) ;
+ }
+
+ if( varType != CDF_INT4 )
+@@ -209,7 +209,7 @@
+ return false ;
+ }
+ }
+- BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
++ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl ) ;
+
+ cdf_buf = malloc( varTypeSize ) ;
+ arrbuf = (void *)&d_buf ;
+@@ -244,7 +244,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl ) ;
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFStr.cc.orig 2014-03-08 18:59:18.498287646 +0100
++++ cdf_handler-1.0.3/CDFStr.cc 2014-03-08 20:31:17.824722687 +0100
+@@ -109,7 +109,7 @@
+ /*************************************************************************
+ * Open the CDF.
+ *************************************************************************/
+- BESDEBUG( "cdf", "CDFStr: " << name() << ": Opening " << dataset << endl )
++ BESDEBUG( "cdf", "CDFStr: " << name() << ": Opening " << dataset << endl
) ;
+ status = CDFopen ( dataset.c_str(), &id ) ;
+ if ( status != CDF_OK )
+ {
+@@ -175,12 +175,12 @@
+ }
+ if( BESISDEBUG( "cdf" ) )
+ {
+- BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl )
+- BESDEBUG( "cdf", " numDims = " << numDims << endl )
+- BESDEBUG( "cdf", " maxRec = " << maxRec << endl )
+- BESDEBUG( "cdf", " numRecs = " << numRecs << endl )
+- BESDEBUG( "cdf", " recVary = " << recVary << endl )
+- BESDEBUG( "cdf", " numElems = " << numElems << endl )
++ BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl ) ;
++ BESDEBUG( "cdf", " numDims = " << numDims << endl ) ;
++ BESDEBUG( "cdf", " maxRec = " << maxRec << endl ) ;
++ BESDEBUG( "cdf", " numRecs = " << numRecs << endl ) ;
++ BESDEBUG( "cdf", " recVary = " << recVary << endl ) ;
++ BESDEBUG( "cdf", " numElems = " << numElems << endl ) ;
+ }
+
+ if( varType != CDF_CHAR && varType != CDF_UCHAR )
+@@ -210,7 +210,7 @@
+ return false ;
+ }
+ }
+- BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
++ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl ) ;
+
+ cdf_buf = malloc( varTypeSize ) ;
+ arrbuf = (void *)&d_buf ;
+@@ -246,7 +246,7 @@
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+
+- BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl ) ;
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFUInt16.cc.orig 2014-03-08 19:02:21.088279984
+0100
++++ cdf_handler-1.0.3/CDFUInt16.cc 2014-03-08 20:31:56.774721055 +0100
+@@ -110,7 +110,7 @@
+ /*************************************************************************
+ * Open the CDF.
+ *************************************************************************/
+- BESDEBUG( "cdf", "CDFUInt16: " << name() << ": Opening " << dataset <<
endl )
++ BESDEBUG( "cdf", "CDFUInt16: " << name() << ": Opening " << dataset <<
endl ) ;
+ status = CDFopen ( dataset.c_str(), &id ) ;
+ if ( status != CDF_OK )
+ {
+@@ -177,12 +177,12 @@
+
+ if( BESISDEBUG( "cdf" ) )
+ {
+- BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl )
+- BESDEBUG( "cdf", " numDims = " << numDims << endl )
+- BESDEBUG( "cdf", " maxRec = " << maxRec << endl )
+- BESDEBUG( "cdf", " numRecs = " << numRecs << endl )
+- BESDEBUG( "cdf", " recVary = " << recVary << endl )
+- BESDEBUG( "cdf", " numElems = " << numElems << endl )
++ BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl ) ;
++ BESDEBUG( "cdf", " numDims = " << numDims << endl ) ;
++ BESDEBUG( "cdf", " maxRec = " << maxRec << endl ) ;
++ BESDEBUG( "cdf", " numRecs = " << numRecs << endl ) ;
++ BESDEBUG( "cdf", " recVary = " << recVary << endl ) ;
++ BESDEBUG( "cdf", " numElems = " << numElems << endl ) ;
+ }
+
+ if( varType != CDF_UINT2 && varType != CDF_UINT1)
+@@ -212,7 +212,7 @@
+ return false ;
+ }
+ }
+- BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
++ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl ) ;
+
+ cdf_buf = malloc( varTypeSize ) ;
+ arrbuf = (void *)&d_buf ;
+@@ -247,7 +247,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl ) ;
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFUInt32.cc.orig 2014-03-08 19:10:26.564926277
+0100
++++ cdf_handler-1.0.3/CDFUInt32.cc 2014-03-08 20:32:47.081385609 +0100
+@@ -110,7 +110,7 @@
+ /*************************************************************************
+ * Open the CDF.
+ *************************************************************************/
+- BESDEBUG( "cdf", "CDFUInt32: " << name() << ": Opening " << dataset <<
endl )
++ BESDEBUG( "cdf", "CDFUInt32: " << name() << ": Opening " << dataset <<
endl ) ;
+ status = CDFopen ( dataset.c_str(), &id ) ;
+ if ( status != CDF_OK )
+ {
+@@ -176,12 +176,12 @@
+ }
+ if( BESISDEBUG( "cdf" ) )
+ {
+- BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl )
+- BESDEBUG( "cdf", " numDims = " << numDims << endl )
+- BESDEBUG( "cdf", " maxRec = " << maxRec << endl )
+- BESDEBUG( "cdf", " numRecs = " << numRecs << endl )
+- BESDEBUG( "cdf", " recVary = " << recVary << endl )
+- BESDEBUG( "cdf", " numElems = " << numElems << endl )
++ BESDEBUG( "cdf", " varType = " << CDFutilities::DataType( varType ) <<
endl ) ;
++ BESDEBUG( "cdf", " numDims = " << numDims << endl ) ;
++ BESDEBUG( "cdf", " maxRec = " << maxRec << endl ) ;
++ BESDEBUG( "cdf", " numRecs = " << numRecs << endl ) ;
++ BESDEBUG( "cdf", " recVary = " << recVary << endl ) ;
++ BESDEBUG( "cdf", " numElems = " << numElems << endl ) ;
+ }
+
+ if( varType != CDF_UINT4 )
+@@ -210,7 +210,7 @@
+ return false ;
+ }
+ }
+- BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
++ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl ) ;
+
+ cdf_buf = malloc( varTypeSize ) ;
+ arrbuf = (void *)&d_buf ;
+@@ -245,7 +245,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl ) ;
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFreadDescriptors.cc.orig 2014-03-08
19:34:52.801531410 +0100
++++ cdf_handler-1.0.3/CDFreadDescriptors.cc 2014-03-08 20:33:28.918050519
+0100
+@@ -85,7 +85,7 @@
+ /*************************************************************************
+ * Open the CDF.
+ *************************************************************************/
+- BESDEBUG( "cdf", "Opening CDF file " << filename << endl )
++ BESDEBUG( "cdf", "Opening CDF file " << filename << endl ) ;
+ status = CDFopen ( filename.c_str(), &id ) ;
+ if ( status != CDF_OK )
+ {
+@@ -122,7 +122,7 @@
+ return false ;
+ }
+ }
+- BESDEBUG( "cdf", " numVars = " << numVars << endl )
++ BESDEBUG( "cdf", " numVars = " << numVars << endl ) ;
+
+ /*************************************************************************
+ * Get and display variable information
+@@ -160,18 +160,18 @@
+
+ if( BESISDEBUG( "cdf" ) )
+ {
+- BESDEBUG( "cdf", "varName: " << varName << endl )
+- BESDEBUG( "cdf", " varType = " << CDFutilities::DataType(
varType ) << endl )
+- BESDEBUG( "cdf", " numDims = " << numDims << endl )
++ BESDEBUG( "cdf", "varName: " << varName << endl ) ;
++ BESDEBUG( "cdf", " varType = " << CDFutilities::DataType(
varType ) << endl ) ;
++ BESDEBUG( "cdf", " numDims = " << numDims << endl ) ;
+ unsigned int i_numDims = 0 ;
+ for( i_numDims = 0; i_numDims < numDims; i_numDims++ )
+ {
+- BESDEBUG( "cdf", " dimSizes[" << i_numDims << "] = " <<
dimSizes[i_numDims] << endl )
+- BESDEBUG( "cdf", " dimVarys[" << i_numDims << "] = " <<
dimVarys[i_numDims] << endl )
++ BESDEBUG( "cdf", " dimSizes[" << i_numDims << "] = " <<
dimSizes[i_numDims] << endl ) ;
++ BESDEBUG( "cdf", " dimVarys[" << i_numDims << "] = " <<
dimVarys[i_numDims] << endl ) ;
+ }
+- BESDEBUG( "cdf", " numRecs = " << numRecs << endl )
+- BESDEBUG( "cdf", " recVary = " << recVary << endl )
+- BESDEBUG( "cdf", " numElems = " << numElems << endl )
++ BESDEBUG( "cdf", " numRecs = " << numRecs << endl ) ;
++ BESDEBUG( "cdf", " recVary = " << recVary << endl ) ;
++ BESDEBUG( "cdf", " numElems = " << numElems << endl ) ;
+ }
+
+ BaseType *var = 0 ;
+--- cdf_handler-1.0.3/CDFutilities.cc.orig 2014-03-08 19:38:56.384854522
+0100
++++ cdf_handler-1.0.3/CDFutilities.cc 2014-03-08 20:38:54.271370201 +0100
+@@ -481,7 +481,7 @@
+ dods_int32 *my_buf = (dods_int32 *)arrbuf ;
+ for( anindex = 0; anindex < numElements; anindex++ )
+ {
+- BESDEBUG( "cdf", " val = " << my_buf[anindex] << endl )
++ BESDEBUG( "cdf", " val = " << my_buf[anindex] << endl ) ;
+ }
+ }
+ break ;
diff --git a/opendap-cdf_handler-includes.patch
b/opendap-cdf_handler-includes.patch
new file mode 100644
index 0000000..0c3ad0b
--- /dev/null
+++ b/opendap-cdf_handler-includes.patch
@@ -0,0 +1,30 @@
+--- cdf_handler-1.0.3/CDFreadAttributes.cc.orig 2007-01-10
17:05:43.000000000 +0100
++++ cdf_handler-1.0.3/CDFreadAttributes.cc 2014-03-08 19:32:16.264871314
+0100
+@@ -33,6 +33,7 @@
+
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+
+ #include "CDFreadAttributes.h"
+ #include "CDFutilities.h"
+--- cdf_handler-1.0.3/CDFutilities.cc.orig 2007-07-31 20:33:14.000000000
+0200
++++ cdf_handler-1.0.3/CDFutilities.cc 2014-03-08 19:38:56.384854522 +0100
+@@ -31,6 +31,7 @@
+ // Authors:
+ // pwest Patrick West <[email protected]>
+
++#include <cstring>
+ #include <string>
+ #include <fstream>
+
+--- cdf_handler-1.0.3/CDFTypeFactory.h.orig 2008-02-02 22:27:34.000000000
+0100
++++ cdf_handler-1.0.3/CDFTypeFactory.h 2014-03-08 19:48:34.324830267 +0100
+@@ -39,6 +39,7 @@
+ // Class declarations; Make sure to include the corresponding headers in the
+ // implementation file.
+
++#include "BaseType.h"
+ #include "BaseTypeFactory.h"
+
+ using namespace libdap ;
diff --git a/opendap-cdf_handler-libdap.patch b/opendap-cdf_handler-libdap.patch
new file mode 100644
index 0000000..6d0f05f
--- /dev/null
+++ b/opendap-cdf_handler-libdap.patch
@@ -0,0 +1,251 @@
+--- cdf_handler-1.0.3/CDFByte.cc.orig 2007-07-31 20:33:14.000000000 +0200
++++ cdf_handler-1.0.3/CDFByte.cc 2014-03-08 18:49:57.394977860 +0100
+@@ -214,7 +214,7 @@
+ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
+
+ cdf_buf = malloc( varTypeSize ) ;
+- arrbuf = (void *)&_buf ;
++ arrbuf = (void *)&d_buf ;
+
+ if( numRecs == 0 ) numRecs = 1 ;
+ status = CDFlib( SELECT_, zVAR_RECCOUNT_, (long)1,
+@@ -246,7 +246,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " _buf = " << (int)_buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << (int)d_buf << endl )
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFFloat32.cc.orig 2007-07-31 20:33:14.000000000
+0200
++++ cdf_handler-1.0.3/CDFFloat32.cc 2014-03-08 18:55:23.834964161 +0100
+@@ -214,7 +214,7 @@
+ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
+
+ cdf_buf = malloc( varTypeSize ) ;
+- arrbuf = (void *)&_buf ;
++ arrbuf = (void *)&d_buf ;
+
+ if( numRecs == 0 ) numRecs = 1 ;
+ status = CDFlib( SELECT_, zVAR_RECCOUNT_, (long)1,
+@@ -246,7 +246,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " _buf = " << _buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFFloat64.cc.orig 2007-07-31 20:33:14.000000000
+0200
++++ cdf_handler-1.0.3/CDFFloat64.cc 2014-03-08 18:56:55.804960301 +0100
+@@ -212,7 +212,7 @@
+ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
+
+ cdf_buf = malloc( varTypeSize ) ;
+- arrbuf = (void *)&_buf ;
++ arrbuf = (void *)&d_buf ;
+
+ if( !numRecs ) numRecs = 1 ;
+ status = CDFlib( SELECT_, zVAR_RECCOUNT_, (long)1,
+@@ -244,7 +244,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " _buf = " << _buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFInt16.cc.orig 2007-07-31 20:33:14.000000000 +0200
++++ cdf_handler-1.0.3/CDFInt16.cc 2014-03-08 18:57:35.551625300 +0100
+@@ -213,7 +213,7 @@
+ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
+
+ cdf_buf = malloc( varTypeSize ) ;
+- arrbuf = (void *)&_buf ;
++ arrbuf = (void *)&d_buf ;
+
+ if( numRecs == 0 ) numRecs = 1 ;
+ status = CDFlib( SELECT_, zVAR_RECCOUNT_, (long)1,
+@@ -245,7 +245,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " _buf = " << _buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFInt32.cc.orig 2007-07-31 20:33:14.000000000 +0200
++++ cdf_handler-1.0.3/CDFInt32.cc 2014-03-08 18:58:48.084955588 +0100
+@@ -212,7 +212,7 @@
+ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
+
+ cdf_buf = malloc( varTypeSize ) ;
+- arrbuf = (void *)&_buf ;
++ arrbuf = (void *)&d_buf ;
+
+ if( numRecs == 0 ) numRecs = 1 ;
+ status = CDFlib( SELECT_, zVAR_RECCOUNT_, (long)1,
+@@ -244,7 +244,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " _buf = " << _buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFStr.cc.orig 2007-07-31 20:33:14.000000000 +0200
++++ cdf_handler-1.0.3/CDFStr.cc 2014-03-08 18:59:18.498287646 +0100
+@@ -213,7 +213,7 @@
+ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
+
+ cdf_buf = malloc( varTypeSize ) ;
+- arrbuf = (void *)&_buf ;
++ arrbuf = (void *)&d_buf ;
+
+ if( numRecs == 0 ) numRecs = 1 ;
+ status = CDFlib( SELECT_, zVAR_RECCOUNT_, (long)1,
+@@ -246,7 +246,7 @@
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+
+- BESDEBUG( "cdf", " _buf = " << _buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFUInt16.cc.orig 2007-07-31 20:33:14.000000000
+0200
++++ cdf_handler-1.0.3/CDFUInt16.cc 2014-03-08 19:02:21.088279984 +0100
+@@ -215,7 +215,7 @@
+ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
+
+ cdf_buf = malloc( varTypeSize ) ;
+- arrbuf = (void *)&_buf ;
++ arrbuf = (void *)&d_buf ;
+
+ if( numRecs == 0 ) numRecs = 1 ;
+ status = CDFlib( SELECT_, zVAR_RECCOUNT_, (long)1,
+@@ -247,7 +247,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " _buf = " << _buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFUInt32.cc.orig 2007-07-31 20:33:14.000000000
+0200
++++ cdf_handler-1.0.3/CDFUInt32.cc 2014-03-08 19:10:26.564926277 +0100
+@@ -213,7 +213,7 @@
+ BESDEBUG( "cdf", " varTypeSize = " << varTypeSize << endl )
+
+ cdf_buf = malloc( varTypeSize ) ;
+- arrbuf = (void *)&_buf ;
++ arrbuf = (void *)&d_buf ;
+
+ if( numRecs == 0 ) numRecs = 1 ;
+ status = CDFlib( SELECT_, zVAR_RECCOUNT_, (long)1,
+@@ -245,7 +245,7 @@
+ unsigned int arrindex = 0 ;
+ CDFutilities::read_record( cdf_buf, arrbuf, arrindex,
+ numElems, varType, numElems ) ;
+- BESDEBUG( "cdf", " _buf = " << _buf << endl )
++ BESDEBUG( "cdf", " d_buf = " << d_buf << endl )
+
+ /*************************************************************************
+ * Close CDF.
+--- cdf_handler-1.0.3/CDFreadDescriptors.h.orig 2008-02-02
22:27:34.000000000 +0100
++++ cdf_handler-1.0.3/CDFreadDescriptors.h 2014-03-08 19:34:34.864865496
+0100
+@@ -35,7 +35,7 @@
+ #define CDFreadDescriptors_h_ 1
+
+ #include <DDS.h>
+-#include <cgi_util.h>
++#include <mime_util.h>
+ #include <DODSFilter.h>
+
+ using namespace libdap ;
+--- cdf_handler-1.0.3/CDFreadDescriptors.cc.orig 2007-07-31
20:33:14.000000000 +0200
++++ cdf_handler-1.0.3/CDFreadDescriptors.cc 2014-03-08 19:34:52.801531410
+0100
+@@ -43,7 +43,7 @@
+ #include "CDFreadDescriptors.h"
+ #include "CDFutilities.h"
+ #include "CDFArray.h"
+-#include "cgi_util.h"
++#include <mime_util.h>
+
+ /*
+ * Current method of reading the data from a CDF file:
+--- cdf_handler-1.0.3/dap_cdf_handler.cc.orig 2007-08-01 17:04:11.000000000
+0200
++++ cdf_handler-1.0.3/dap_cdf_handler.cc 2014-03-08 19:35:18.444863668
+0100
+@@ -36,6 +36,7 @@
+ #include <iostream>
+ #include <string>
+
++#include <Ancillary.h>
+ #include "DODSFilter.h"
+ #include "DDS.h"
+ #include "DAS.h"
+@@ -42,7 +43,7 @@
+ #include "DataDDS.h"
+
+ #include "ObjectType.h"
+-#include "cgi_util.h"
++#include <mime_util.h>
+ #include "ConstraintEvaluator.h"
+
+ #include "CDFTypeFactory.h"
+@@ -66,7 +67,7 @@
+ DAS das;
+
+ readAttributes(das, df.get_dataset_name());
+- df.read_ancillary_das(das);
++ Ancillary::read_ancillary_das(das, df.get_dataset_name());
+ df.send_das(das);
+ break;
+ }
+@@ -77,11 +78,11 @@
+
+ string dsn = df.get_dataset_name();
+ readDescriptors( dds, dsn, name_path( dsn ) ) ;
+- df.read_ancillary_dds(dds);
++ Ancillary::read_ancillary_dds(dds, dsn);
+
+ DAS das;
+ readAttributes(das, df.get_dataset_name());
+- df.read_ancillary_das(das);
++ Ancillary::read_ancillary_das(das, dsn);
+
+ dds.transfer_attributes(&das);
+ df.send_dds(dds, ce, true);
+@@ -95,11 +96,11 @@
+ string dsn = df.get_dataset_name();
+ dds.filename( dsn ) ;
+ readDescriptors( dds, dsn, name_path( dsn ) ) ;
+- df.read_ancillary_dds(dds);
++ Ancillary::read_ancillary_dds(dds, dsn);
+
+ DAS das;
+ readAttributes(das, df.get_dataset_name());
+- df.read_ancillary_das(das);
++ Ancillary::read_ancillary_das(das, dsn);
+
+ dds.transfer_attributes(&das);
+ df.send_data(dds, ce, stdout);
+@@ -116,10 +117,10 @@
+ dds.filename( dsn ) ;
+
+ readDescriptors(dds, dsn, name_path( dsn ) ) ;
+- df.read_ancillary_dds(dds);
++ Ancillary::read_ancillary_dds(dds, dsn);
+
+ readAttributes( das, dsn ) ;
+- df.read_ancillary_das(das);
++ Ancillary::read_ancillary_das(das, dsn);
+
+ dds.transfer_attributes(&das);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opendap-cdf_handler.git/commitdiff/b3b30634d3f8f46282dfb5bdcc7a3b0b1ea025d1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
