mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-03-31 17:50:26 +08:00
fixed esupport:RVK-949505 and DML-490284
This commit is contained in:
Dennis Heimbigner
parent
414b6fefb2
commit
03f79aa8f5
12
cf
12
cf
@ -1,8 +1,9 @@
|
||||
#!/bin/bash
|
||||
#X="-x"
|
||||
|
||||
HDF5=1
|
||||
#HDF5=1
|
||||
DAP=1
|
||||
#CDMR=1
|
||||
|
||||
#M32=1
|
||||
#M64=1
|
||||
@ -51,11 +52,11 @@ IGNORE="test 0 = 1"
|
||||
|
||||
if test "x$HDF5" = "x1" ; then
|
||||
CPPFLAGS="-I${stddir}/include -I${stddir}/include $CPPFLAGS"
|
||||
LDFLAGS="-L${stddir}/lib -lhdf5_hl -lhdf5 $LDFLAGS"
|
||||
LDFLAGS="-L${stddir}/lib -lhdf5_hl -lhdf5 -L${stddir}/lib -lz $LDFLAGS"
|
||||
LD_LIBRARY_PATH="${stddir}/lib:$LD_LIBRARY_PATH"
|
||||
fi
|
||||
|
||||
if test "x$DAP" = "x1" ; then
|
||||
if test "x$DAP" = "x1" -o "x$CDMR" = "x1" ; then
|
||||
if curl-config --version >/dev/null ; then
|
||||
TMP=`curl-config --cflags`
|
||||
CPPFLAGS="$TMP $CPPFLAGS"
|
||||
@ -69,8 +70,6 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
LDFLAGS="$LDFLAGS -L${stddir}/lib -lz"
|
||||
|
||||
export CPPFLAGS
|
||||
export CFLAGS
|
||||
export LDFLAGS
|
||||
@ -107,6 +106,9 @@ if test "x$DAP" = "x" ; then
|
||||
FLAGS="$FLAGS --disable-dap"
|
||||
#FLAGS="$FLAGS --disable-dap-remote-tests"
|
||||
fi
|
||||
if test "x$CDMR" = "x1" ; then
|
||||
FLAGS="$FLAGS --enable-cdmremote"
|
||||
fi
|
||||
|
||||
DISTCHECK_CONFIGURE_FLAGS="$FLAGS"
|
||||
export DISTCHECK_CONFIGURE_FLAGS
|
||||
|
||||
137
configure.ac
137
configure.ac
@ -260,19 +260,6 @@ test "x$enable_cdmremote" = xyes || enable_cdmremote=no
|
||||
if test "x$enable_netcdf_4" = "xno" ; then enable_cdmremote=no ; fi
|
||||
AC_MSG_RESULT($enable_cdmremote)
|
||||
|
||||
# Figure out if curl support should be enabled.
|
||||
# The primary goal is to first locate curl-config
|
||||
# or the curl library location
|
||||
# The rules we implement are applied in order:
|
||||
# 1. no: if --disable-dap is set
|
||||
# 2. no: if curl library cannot be located
|
||||
# 3. yes: if --enable-dap || --enable-cdmremote is set
|
||||
# 4. yes: if neither --enable-dap nor --disable-dap is specified
|
||||
# and the curl library can be located
|
||||
# Note that for now, cdmremote must be explicitly enabled
|
||||
|
||||
# First capture all the info unconditionally
|
||||
|
||||
# Capture the state of the --enable-dap flag
|
||||
AC_MSG_CHECKING([whether DAP client is to be built])
|
||||
AC_ARG_ENABLE([dap],
|
||||
@ -281,6 +268,10 @@ AC_ARG_ENABLE([dap],
|
||||
test "x$enable_dap" = xno || enable_dap=yes
|
||||
AC_MSG_RESULT($enable_dap)
|
||||
|
||||
# Curl support is required if these flags are set:
|
||||
# 1. --enable-dap
|
||||
# 2. --enable-cdmremote
|
||||
|
||||
# If --disable-dap && --disable cdmremote , then libcurl is not required
|
||||
if test "x$enable_dap" = "xyes" -o "x$enable_cdmremote" = "xyes" ; then
|
||||
require_curl=yes
|
||||
@ -288,118 +279,16 @@ else
|
||||
require_curl=no
|
||||
fi
|
||||
|
||||
# Try to locate curl-config
|
||||
#
|
||||
AC_ARG_WITH([curl-config], [AS_HELP_STRING([--with-curl-config=<path>],
|
||||
[Specify path (or the containing directory) of the curl-config program; libcurl is required for opendap.])],
|
||||
[],[])
|
||||
|
||||
AC_MSG_CHECKING([whether a path for curl-config was specified])
|
||||
if test "x$with_curl_config" = "x" ; then
|
||||
AC_MSG_RESULT([no])
|
||||
else
|
||||
AC_MSG_RESULT([$with_curl_config])
|
||||
# Do a lib test for curl
|
||||
AC_CHECK_LIB([curl], [curl_easy_setopt])
|
||||
found_curl=no
|
||||
if test "x$ac_cv_lib_curl_curl_easy_setopt" = xyes ; then
|
||||
found_curl=yes
|
||||
fi
|
||||
|
||||
# Alternatively, allow specification of the curl installation directory
|
||||
AC_MSG_CHECKING([whether a location for curl installation was specified])
|
||||
AC_ARG_WITH([curl], [AS_HELP_STRING([--with-curl=<directory>.],
|
||||
[Specify location of CURL library; libcurl is required for opendap. Configure will expect to find subdirs bin, include and lib.])],
|
||||
[],[])
|
||||
if test "x$with_curl" = "x" ; then
|
||||
AC_MSG_RESULT([no])
|
||||
else
|
||||
AC_MSG_RESULT([$with_curl])
|
||||
fi
|
||||
|
||||
# Remaining computations are only invoked if curl is required.
|
||||
if test "$require_curl" = yes ; then
|
||||
|
||||
# Tag to indicate where curl info came from
|
||||
curlsrc=
|
||||
|
||||
if test "x$with_curl_config" != "x" ; then
|
||||
curlsrc="withconfig"
|
||||
elif test "x$with_curl" != "x" ; then
|
||||
curlsrc="withcurl"
|
||||
else
|
||||
curlsrc=""
|
||||
fi
|
||||
|
||||
# if curl source was --with-curl
|
||||
# then try to locate curl-config
|
||||
|
||||
if test "x$curlsrc" = "xwithcurl" ; then
|
||||
# look for curl-config in --with-curl directory
|
||||
if $with_curl/bin/curl-config --version >/dev/null 2>&1 ; then
|
||||
# Pretend that --with-curl-config was specified
|
||||
with_curl_config="$with_curl/bin/curl-config"
|
||||
curlsrc="withconfig"
|
||||
fi
|
||||
elif test "x$curlsrc" = "xwithconfig" ; then
|
||||
# look for curl-config using --with-curl-config,
|
||||
# allow for some errors in specifying.
|
||||
if $with_curl_config --version >/dev/null 2>&1 ; then
|
||||
# User specified curl-config directly
|
||||
with_curl_config="$with_curl_config"
|
||||
elif $with_curl_config/curl-config --version >/dev/null 2>&1 ; then
|
||||
# User specified curl-config parent directory
|
||||
with_curl_config="$with_curl_config/curl-config"
|
||||
elif $with_curl_config/bin/curl-config --version >/dev/null 2>&1 ; then
|
||||
# User specified same dir as --with-curl
|
||||
with_curl_config="$with_curl_config/bin/curl-config"
|
||||
else
|
||||
AC_MSG_ERROR([Erroneous --with-curl-config value: ${with_curl_config}])
|
||||
with_curl_config="" # not found
|
||||
fi
|
||||
else
|
||||
# look for curl-config in the path
|
||||
if curl-config --version >/dev/null 2>&1 ; then
|
||||
with_curl_config="curl-config"
|
||||
curlsrc="withconfig"
|
||||
fi
|
||||
fi
|
||||
|
||||
# report on finding of curl-config
|
||||
AC_MSG_CHECKING([checking whether a location for curl-config found])
|
||||
if test "x$with_curl_config" = "x" ; then
|
||||
AC_MSG_RESULT([no])
|
||||
else
|
||||
AC_MSG_RESULT([${with_curl_config}])
|
||||
fi
|
||||
|
||||
# Compute the curl flags and libs
|
||||
if test "x$with_curl_config" != "x" ; then
|
||||
curl_cflags=`$with_curl_config --cflags`
|
||||
curl_libs=`$with_curl_config --libs`
|
||||
curl_dir=`$with_curl_config --prefix`
|
||||
elif test "x$with_curl" != "x" ; then
|
||||
curl_libs="-L$with_curl/lib -lcurl"
|
||||
curl_cflags="-I$with_curl/include"
|
||||
curl_dir="$with_curl"
|
||||
else
|
||||
AC_MSG_ERROR([Cannot locate neither curl-config or a curl directory])
|
||||
fi
|
||||
|
||||
else #!require_curl
|
||||
|
||||
curl_cflags=""
|
||||
curl_libs=""
|
||||
curl_dir=""
|
||||
|
||||
fi #require_curl
|
||||
|
||||
AC_SUBST([CURL_CFLAGS],[${curl_cflags}])
|
||||
AC_SUBST([CURL_FCFLAGS],[${curl_cflags}])
|
||||
AC_SUBST([CURL_FFLAGS],[${curl_cflags}])
|
||||
AC_SUBST([CURL_LIBS],[${curl_libs}])
|
||||
AC_SUBST([CURLDIR],[${curl_dir}])
|
||||
|
||||
# If curl is required but there is no curl, then complain
|
||||
if test "x$curlsrc" = "x" ; then
|
||||
if test "x$require_curl" = "xyes" ; then
|
||||
AC_MSG_NOTICE([libcurl not found; disabling dap and cdmremote support])
|
||||
fi
|
||||
if test $require_curl = yes -a $found_curl = no ; then
|
||||
AC_MSG_NOTICE([libcurl not found; disabling dap and cdmremote support])
|
||||
enable_dap=no
|
||||
enable_cdmremote=no
|
||||
fi
|
||||
@ -1026,9 +915,7 @@ AC_MSG_RESULT([$BINFILE_NAME $FC $CXX])
|
||||
UD_FTPBINDIR
|
||||
|
||||
##################################################
|
||||
# OC configuration
|
||||
|
||||
# Require some version of xdr/rpc
|
||||
# Require some version of xdr/rpc if --enable-dap is set.
|
||||
# See if autoconf can find it; check libc, librpc, librpcsvc and libnsl
|
||||
if test "x$enable_dap" = xyes; then
|
||||
AC_SEARCH_LIBS([xdr_void],[c rpc nsl rpcsvc],
|
||||
|
||||
@ -23,7 +23,7 @@ LFLAG=-L/upc/share/ed/local/${HOST}/lib
|
||||
CURLLIB=-lcurl
|
||||
ZLIB=-lz
|
||||
#HDF5LIB=-lhdf5_hl -lhdf5
|
||||
HDF5LIB=/upc/share/stdinstall/local/${HOST}/lib/libhdf5_hl.a /upc/share/stdinstall/local/${HOST}/lib/libhdf5.a
|
||||
HDF5LIB=/share/ed/local/${HOST}/lib/libhdf5_hl.a /share/ed/local/${HOST}/lib/libhdf5.a
|
||||
|
||||
OTHERLIBS=-lm
|
||||
|
||||
|
||||
88
libdap2/env
88
libdap2/env
@ -1,46 +1,46 @@
|
||||
set PARMS=""; set ARGS=""; set CON="" ; set CE=""; set OCON=""
|
||||
set PARMS="[log]"
|
||||
PARMS=""; ARGS=""; CON="" ; CE=""; OCON=""
|
||||
PARMS="[log]"
|
||||
|
||||
set F="file://${HOME}/dmh/ncdap_test/testdata3/synth3"
|
||||
if (1 == 0) then
|
||||
set F="file:///home/dmh/nc/oc/dataset-duacs-nrt-over30d-global-merged-madt-h"
|
||||
set F="http://oceanwatch.pfeg.noaa.gov/opendap/GLOBEC/GLOBEC_cetaceans"
|
||||
set CON="number&number>6"
|
||||
set F="http://dapper.pmel.noaa.gov/dapper/argo/argo_all.cdp"
|
||||
#set CON="&location.LATITUDE<1&location.LATITUDE>-1"
|
||||
set F="http://test.opendap.org:8080/dods/dts/test.03"
|
||||
#set CON="s0,s1"
|
||||
set F="http://oceanwatch.pfeg.noaa.gov/opendap/GLOBEC/GLOBEC_cetaceans"
|
||||
set CON="lat,lon&lat>42.0&lat<=42.5"
|
||||
set CON="number&number>6"
|
||||
set F="http://motherlode.ucar.edu:8080/thredds/dodsC/testdods/in.nc"
|
||||
set F="http://ceda.ac.uk/dap/neodc/casix/seawifs_plankton/data/monthly/PSC_monthly_1998.nc"
|
||||
set F="http://test.opendap.org:8080/dods/dts/test.02"
|
||||
set F="http://test.opendap.org/opendap/data/nc/coads_climatology.nc"
|
||||
set F="file:///home/dmh/nc/netcdf-3/ncdap_test/testdata3/test.PointFile"
|
||||
set F="file:///home/dmh/nc/netcdf-3/ncdap_test/testdata3/synth1"
|
||||
set F="http://dods.ndbc.noaa.gov/thredds/dodsC/data/stdmet/46029/46029h9999.nc"
|
||||
set CON="wind_dir[1:10][0:0][0:0]"
|
||||
endif
|
||||
F="http://motherlode.ucar.edu:9080/thredds/dodsC/fmrc/NCEP/GFS/Alaska_191km/NCEP-GFS-Alaska_191km_fmrc.ncx"
|
||||
if test 1 = 0; then
|
||||
F="file:///home/dmh/nc/oc/dataset-duacs-nrt-over30d-global-merged-madt-h"
|
||||
F="http://oceanwatch.pfeg.noaa.gov/opendap/GLOBEC/GLOBEC_cetaceans"
|
||||
CON="number&number>6"
|
||||
F="http://dapper.pmel.noaa.gov/dapper/argo/argo_all.cdp"
|
||||
#CON="&location.LATITUDE<1&location.LATITUDE>-1"
|
||||
F="http://test.opendap.org:8080/dods/dts/test.03"
|
||||
#CON="s0,s1"
|
||||
F="http://oceanwatch.pfeg.noaa.gov/opendap/GLOBEC/GLOBEC_cetaceans"
|
||||
CON="lat,lon&lat>42.0&lat<=42.5"
|
||||
CON="number&number>6"
|
||||
F="http://motherlode.ucar.edu:8080/thredds/dodsC/testdods/in.nc"
|
||||
F="http://ceda.ac.uk/dap/neodc/casix/seawifs_plankton/data/monthly/PSC_monthly_1998.nc"
|
||||
F="http://test.opendap.org:8080/dods/dts/test.02"
|
||||
F="http://test.opendap.org/opendap/data/nc/coads_climatology.nc"
|
||||
F="file:///home/dmh/nc/netcdf-3/ncdap_test/testdata3/test.PointFile"
|
||||
F="file:///home/dmh/nc/netcdf-3/ncdap_test/testdata3/synth1"
|
||||
F="http://dods.ndbc.noaa.gov/thredds/dodsC/data/stdmet/46029/46029h9999.nc"
|
||||
CON="wind_dir[1:10][0:0][0:0]"
|
||||
fi
|
||||
|
||||
#set PARMS="${PARMS}[netcdf4]"
|
||||
#set PARMS="${PARMS}[cache]"
|
||||
set PARMS="${PARMS}[show=fetch]"
|
||||
#set PARMS="${PARMS}[compile]"
|
||||
if ( "x$CE" != "x" ) set PARMS="${PARMS}[ce=${CE}]"
|
||||
set PROG="./ncd"
|
||||
#set PROG="../ncdump/ncdump"
|
||||
set U="${PARMS}$F"
|
||||
if ( "x$CON" != "x" ) set U="${PARMS}$F?$CON"
|
||||
set UALL="${PARMS}$F"
|
||||
#set ARGS="-h $ARGS"
|
||||
#set ARGS="-w $ARGS"
|
||||
#set ARGS="-c $ARGS"
|
||||
set VARGS="--leak-check=full"
|
||||
alias qq "gdb --args $PROG $ARGS '$U'"
|
||||
alias qv "valgrind $VARGS PROG $ARGS '$U'"
|
||||
alias q0 "$PROG $ARGS '$U'"
|
||||
alias qh "$PROG -h $ARGS '$U'"
|
||||
alias qqh "gdb --args $PROG -h $ARGS '$U'"
|
||||
alias qall "$PROG -h $ARGS '${UALL}'"
|
||||
alias qv "valgrind $VARGS $PROG $ARGS '$U'"
|
||||
#PARMS="${PARMS}[netcdf4]"
|
||||
#PARMS="${PARMS}[cache]"
|
||||
PARMS="${PARMS}[show=fetch]"
|
||||
#PARMS="${PARMS}[compile]"
|
||||
if test "x$CE" != "x" ; then set PARMS="${PARMS}[ce=${CE}]" ; fi
|
||||
PROG="./ncd"
|
||||
#PROG="../ncdump/ncdump"
|
||||
U="${PARMS}$F"
|
||||
if test "x$CON" != "x" ; then U="${PARMS}$F?$CON"; fi
|
||||
UALL="${PARMS}$F"
|
||||
#ARGS="-h $ARGS"
|
||||
#ARGS="-w $ARGS"
|
||||
#ARGS="-c $ARGS"
|
||||
VARGS="--leak-check=full"
|
||||
alias qq="gdb --args $PROG $ARGS '$U'"
|
||||
alias qv="valgrind $VARGS PROG $ARGS '$U'"
|
||||
alias q0="$PROG $ARGS '$U'"
|
||||
alias qh="$PROG -h $ARGS '$U'"
|
||||
alias qqh="gdb --args $PROG -h $ARGS '$U'"
|
||||
alias qall="$PROG -h $ARGS '${UALL}'"
|
||||
alias qv="valgrind $VARGS $PROG $ARGS '$U'"
|
||||
|
||||
@ -35,6 +35,8 @@ ocerrtoncerr(OCerror ocerr)
|
||||
case OC_EDAS: return NC_EDAS;
|
||||
case OC_EDDS: return NC_EDDS;
|
||||
case OC_EDATADDS: return NC_EDATADDS;
|
||||
case OC_ERCFILE: return NC_EDAP;
|
||||
case OC_ENOFILE: return NC_ECANTREAD;
|
||||
default: break;
|
||||
}
|
||||
return NC_EDAP; /* default;*/
|
||||
|
||||
@ -10,9 +10,6 @@
|
||||
# Cause C preprocessor to search current and parent directory.
|
||||
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libsrc
|
||||
|
||||
CURL_CFLAGS = @CURL_CFLAGS@
|
||||
CURL_LIBS = @CURL_LIBS@
|
||||
|
||||
# OC Sources
|
||||
SRC= curlfunctions.c dapparse.c daplex.c ocuri.c http.c ocbytes.c \
|
||||
oc.c occompile.c occontent.c ocdata.c ocdebug.c ocdrno.c ocdump.c \
|
||||
@ -33,8 +30,7 @@ if BUILD_DAP
|
||||
noinst_LTLIBRARIES = liboc.la
|
||||
# Watch out; the gram files must be first
|
||||
liboc_la_SOURCES = ${GRAMC} ${GRAMH} $(SRC) $(HDRS)
|
||||
liboc_la_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
|
||||
liboc_la_LIBADD = $(CURL_LIBS)
|
||||
liboc_la_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
endif
|
||||
|
||||
EXTRA_DIST = ${GRAMFILES}
|
||||
|
||||
@ -438,7 +438,11 @@ DAPparse(OCstate* conn, OCtree* tree, char* parsestring)
|
||||
conn->error.code = nulldup(state->code);
|
||||
conn->error.message = nulldup(state->message);
|
||||
tree->root = NULL;
|
||||
ocerr = OC_EDAPSVC;
|
||||
/* Attempt to further decipher the error code */
|
||||
if(strcmp(state->code,"404") == 0)
|
||||
ocerr = OC_ENOFILE;
|
||||
else
|
||||
ocerr = OC_EDAPSVC;
|
||||
} else {
|
||||
OCASSERT((state->root != NULL));
|
||||
tree->root = state->root;
|
||||
|
||||
1
oc/oc.h
1
oc/oc.h
@ -85,6 +85,7 @@ typedef int OCerror;
|
||||
#define OC_EDDS (-22)
|
||||
#define OC_EDATADDS (-23)
|
||||
#define OC_ERCFILE (-24)
|
||||
#define OC_ENOFILE (-25)
|
||||
|
||||
typedef enum OCmode {
|
||||
OCFIELDMODE = OC_Structure,
|
||||
|
||||
@ -395,6 +395,8 @@ ocerrstring(int err)
|
||||
return "OC_EDATADDS: Malformed or unreadable DATADDS";
|
||||
case OC_ERCFILE:
|
||||
return "OC_ERCFILE: Malformed or unreadable run-time configuration file";
|
||||
case OC_ENOFILE:
|
||||
return "OC_ENOFILE: cannot read content of URL";
|
||||
default: break;
|
||||
}
|
||||
return "<unknown error code>";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user