mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-03-19 17:30:27 +08:00
modify dap legal names
This commit is contained in:
Dennis Heimbigner
parent
d749958799
commit
8b3b307b10
cfconfigure.ac
libdap2
ncdap_test
expected3
1990-S1700101.HDF.WVC_Lat.dmpsynth1.dmptest.PointFile.dmptest.dfr1.dmptest.dfr2.dmptest.dfr3.dmptest.sds6.dmptest.sds7.dmp
testdata3
tst_ncdap_shared.shncremote_test
Makefile.am
expected3
expectremote3
D1.dmpDrifters.dmpEOSDB.dmpSimpleDrdsExample.dmpb31.dmpb31a.dmptest.01.dmptest.03.2.dmptest.03.dmptest.04.dmptest.05.dmptest.06.dmptest.07.dmptest.50.dmptest.53.dmptest.vs1.dmptest.vs2.dmptest.vs3.dmptest.vs4.dmpwhoi.dmp
test_cvt.ctestdata3
Makefile.amsynth1.dastest.01.dodstest.02.dodstest.03.dodstest.04.dodstest.05.dodstest.07.dodstest.50.dodstest.53.dods
tst_ncdap_shared.shtst_remote.shoc
2
cf
2
cf
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
#X="-x"
|
||||
|
||||
HDF5=1
|
||||
#HDF5=1
|
||||
DAP=1
|
||||
#CDMR=1
|
||||
#RPC=1
|
||||
|
||||
15
configure.ac
15
configure.ac
@ -270,6 +270,21 @@ if test "x$enable_dap" = "xno" ; then
|
||||
fi
|
||||
AC_MSG_RESULT($enable_dap_remote_tests)
|
||||
|
||||
# Control if groups are supported in [netcdf4]dap2 code
|
||||
AC_MSG_CHECKING([whether [netcdf4] group names should be enabled (default on)])
|
||||
AC_ARG_ENABLE([dap-groups],
|
||||
[AS_HELP_STRING([--disable-dap-groups],
|
||||
[disable [netcdf4] dap group names])])
|
||||
test "x$enable_groups" = xno || enable_dap_groups=yes
|
||||
if test "x$enable_dap" = "xno" -o "x$enable_enable_netcdf_4" = "xno" ; then
|
||||
AC_MSG_NOTICE([dap groups disabled because dap disabled or netcdf-4 disabled])
|
||||
enable_dap_groups=no
|
||||
fi
|
||||
AC_MSG_RESULT($enable_dap_groups)
|
||||
if test "x$enable_dap_groups" = xyes; then
|
||||
AC_DEFINE([ENABLE_DAP_GROUPS], [1], [if true, enable DAP group names])
|
||||
fi
|
||||
|
||||
# Set the config.h flags
|
||||
if test "x$enable_dap" = xyes; then
|
||||
AC_DEFINE([USE_DAP], [1], [if true, build DAP Client])
|
||||
|
||||
12
libdap2/env
12
libdap2/env
@ -1,11 +1,11 @@
|
||||
TOPDIR="/home/dmh/mach/minor"
|
||||
#http://esrl.noaa.gov/psd/thredds/dodsC/Datasets/noaa.oisst.v2/sst.wkmean.1990-present.nc"
|
||||
PARMS=""; ARGS=""; CON="" ; CE=""; OCON=""
|
||||
PARMS="[log]"
|
||||
|
||||
#F="file:///home/dmh/nc/netcdf-3/ncdap_test/testdata3/in.nc"
|
||||
F="http://motherlode.ucar.edu:8080/dts/test.07"
|
||||
CON="person"
|
||||
VAR="person.name"
|
||||
F="file://${TOPDIR}/ncdap_test/testdata3/synth1"
|
||||
#CON="person"
|
||||
#VAR="person.name"
|
||||
|
||||
#PARMS="${PARMS}[netcdf4]"
|
||||
PARMS="${PARMS}[cache]"
|
||||
@ -53,8 +53,8 @@ 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="file://${TOPDIR}/ncdap_test/testdata3/test.PointFile"
|
||||
F="file://${TOPDIR}/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]"
|
||||
F="http://nomads.ncep.noaa.gov:9090/dods/gens/gens20111011/gep20_00z"
|
||||
|
||||
@ -245,7 +245,8 @@ typedef struct CDFnode {
|
||||
char* ncbasename; /* generally cdflegalname(ocname) */
|
||||
char* ncfullname; /* complete path name from root to this node*/
|
||||
OCobject dds; /* oc mirror node*/
|
||||
struct CDFnode* container;
|
||||
struct CDFnode* group; /* null => in root group */
|
||||
struct CDFnode* container; /* e.g. struct or sequence, but not group */
|
||||
struct CDFnode* root;
|
||||
CDFtree* tree; /* root level metadata;only defined if root*/
|
||||
CDFdim dim; /* nctype == dimension */
|
||||
|
||||
@ -3,15 +3,15 @@ dimensions:
|
||||
WVC = 24 ;
|
||||
row = 558 ;
|
||||
variables:
|
||||
short NSCAT\%20Rev\%2017.WVC_Lat(row, WVC) ;
|
||||
NSCAT\%20Rev\%2017.WVC_Lat:long_name = "latitude" ;
|
||||
NSCAT\%20Rev\%2017.WVC_Lat:units = "deg" ;
|
||||
NSCAT\%20Rev\%2017.WVC_Lat:scale_factor = 0.01 ;
|
||||
NSCAT\%20Rev\%2017.WVC_Lat:scale_factor_err = 0. ;
|
||||
NSCAT\%20Rev\%2017.WVC_Lat:add_offset = 0. ;
|
||||
NSCAT\%20Rev\%2017.WVC_Lat:add_offset_err = 0. ;
|
||||
NSCAT\%20Rev\%2017.WVC_Lat:calibrated_nt = 22 ;
|
||||
NSCAT\%20Rev\%2017.WVC_Lat:valid_range = -6281s, 8051s ;
|
||||
short NSCAT\ Rev\ 17.WVC_Lat(row, WVC) ;
|
||||
NSCAT\ Rev\ 17.WVC_Lat:long_name = "latitude" ;
|
||||
NSCAT\ Rev\ 17.WVC_Lat:units = "deg" ;
|
||||
NSCAT\ Rev\ 17.WVC_Lat:scale_factor = 0.01 ;
|
||||
NSCAT\ Rev\ 17.WVC_Lat:scale_factor_err = 0. ;
|
||||
NSCAT\ Rev\ 17.WVC_Lat:add_offset = 0. ;
|
||||
NSCAT\ Rev\ 17.WVC_Lat:add_offset_err = 0. ;
|
||||
NSCAT\ Rev\ 17.WVC_Lat:calibrated_nt = 22 ;
|
||||
NSCAT\ Rev\ 17.WVC_Lat:valid_range = -6281s, 8051s ;
|
||||
|
||||
// global attributes:
|
||||
:Producer_Agency = "NASA" ;
|
||||
@ -39,7 +39,7 @@ variables:
|
||||
:Data_Format_Type = "HDF" ;
|
||||
data:
|
||||
|
||||
NSCAT\%20Rev\%2017.WVC_Lat =
|
||||
NSCAT\ Rev\ 17.WVC_Lat =
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5928,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5889,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5851,
|
||||
|
||||
@ -3,7 +3,7 @@ dimensions:
|
||||
S1.v1_0 = 3 ;
|
||||
variables:
|
||||
int S1.v1(S1.v1_0) ;
|
||||
S1.v1:a1 = 32 ;
|
||||
S1.v1:a\ 1 = 32 ;
|
||||
data:
|
||||
|
||||
S1.v1 = 132, 232, 332 ;
|
||||
|
||||
@ -4,47 +4,46 @@ dimensions:
|
||||
Sensor = 5 ;
|
||||
maxStrlen64 = 64 ;
|
||||
variables:
|
||||
byte Simple\%20Point.LevelWritten.LevelWritten.LevelWritten__0(LevelWritten) ;
|
||||
double Simple\%20Point.Data\%20Vgroup.Sensor.Time.Time__0(Sensor) ;
|
||||
double Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__0(Sensor) ;
|
||||
double Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__1(Sensor) ;
|
||||
double Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__2(Sensor) ;
|
||||
double Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__3(Sensor) ;
|
||||
char Simple\%20Point.Data\%20Vgroup.Sensor.Species.Species__0(Sensor, maxStrlen64) ;
|
||||
byte FixedBuoy\%20Point.LevelWritten.LevelWritten.LevelWritten__0(LevelWritten) ;
|
||||
byte FloatBuoy\%20Point.LevelWritten.LevelWritten.LevelWritten__0(LevelWritten) ;
|
||||
byte Simple\ Point.LevelWritten.LevelWritten.LevelWritten__0(LevelWritten) ;
|
||||
double Simple\ Point.Data\ Vgroup.Sensor.Time.Time__0(Sensor) ;
|
||||
double Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__0(Sensor) ;
|
||||
double Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__1(Sensor) ;
|
||||
double Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__2(Sensor) ;
|
||||
double Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__3(Sensor) ;
|
||||
char Simple\ Point.Data\ Vgroup.Sensor.Species.Species__0(Sensor, maxStrlen64) ;
|
||||
byte FixedBuoy\ Point.LevelWritten.LevelWritten.LevelWritten__0(LevelWritten) ;
|
||||
byte FloatBuoy\ Point.LevelWritten.LevelWritten.LevelWritten__0(LevelWritten) ;
|
||||
data:
|
||||
|
||||
Simple\%20Point.LevelWritten.LevelWritten.LevelWritten__0 = 0, 1, 2, 3, 4 ;
|
||||
Simple\ Point.LevelWritten.LevelWritten.LevelWritten__0 = 0, 1, 2, 3, 4 ;
|
||||
|
||||
Simple\%20Point.Data\%20Vgroup.Sensor.Time.Time__0 = 1000, 998.750260394966,
|
||||
Simple\ Point.Data\ Vgroup.Sensor.Time.Time__0 = 1000, 998.750260394966,
|
||||
995.004165278026, 988.771077936042, 980.066577841242 ;
|
||||
|
||||
Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__0 =
|
||||
Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__0 =
|
||||
999.950000416665, 998.200539935204, 993.956097956697, 987.227283375627,
|
||||
978.030914724148 ;
|
||||
|
||||
Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__1 =
|
||||
Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__1 =
|
||||
999.800006666578, 997.55100025328, 992.808635853866, 985.584766909561,
|
||||
975.897449330605 ;
|
||||
|
||||
Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__2 =
|
||||
Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__2 =
|
||||
999.550033748988, 996.801706302619, 991.561893714788, 983.843692788121,
|
||||
973.666395005375 ;
|
||||
|
||||
Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__3 =
|
||||
Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__3 =
|
||||
999.200106660978, 995.952733011994, 990.215996212637, 982.00423511727,
|
||||
971.33797485203 ;
|
||||
|
||||
Simple\%20Point.Data\%20Vgroup.Sensor.Species.Species__0 =
|
||||
Simple\ Point.Data\ Vgroup.Sensor.Species.Species__0 =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 4)." ;
|
||||
|
||||
FixedBuoy\%20Point.LevelWritten.LevelWritten.LevelWritten__0 = 5, 6, 7, 8, 9 ;
|
||||
FixedBuoy\ Point.LevelWritten.LevelWritten.LevelWritten__0 = 5, 6, 7, 8, 9 ;
|
||||
|
||||
FloatBuoy\%20Point.LevelWritten.LevelWritten.LevelWritten__0 = 10, 11, 12,
|
||||
13, 14 ;
|
||||
FloatBuoy\ Point.LevelWritten.LevelWritten.LevelWritten__0 = 10, 11, 12, 13, 14 ;
|
||||
}
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
netcdf test {
|
||||
dimensions:
|
||||
Raster\%20Image\%20\%230__X = 5 ;
|
||||
Raster\%20Image\%20\%230__Y = 6 ;
|
||||
Raster\%20Image\%20\%231__X = 5 ;
|
||||
Raster\%20Image\%20\%231__Y = 6 ;
|
||||
Raster\%20Image\%20\%231__comps = 3 ;
|
||||
Raster\ Image\ \#0__X = 5 ;
|
||||
Raster\ Image\ \#0__Y = 6 ;
|
||||
Raster\ Image\ \#1__X = 5 ;
|
||||
Raster\ Image\ \#1__Y = 6 ;
|
||||
Raster\ Image\ \#1__comps = 3 ;
|
||||
variables:
|
||||
byte Raster\%20Image\%20\%230(Raster\%20Image\%20\%230__Y, Raster\%20Image\%20\%230__X) ;
|
||||
byte Raster\%20Image\%20\%231(Raster\%20Image\%20\%231__comps, Raster\%20Image\%20\%231__Y, Raster\%20Image\%20\%231__X) ;
|
||||
byte Raster\ Image\ \#0(Raster\ Image\ \#0__Y, Raster\ Image\ \#0__X) ;
|
||||
byte Raster\ Image\ \#1(Raster\ Image\ \#1__comps, Raster\ Image\ \#1__Y, Raster\ Image\ \#1__X) ;
|
||||
data:
|
||||
|
||||
Raster\%20Image\%20\%230 =
|
||||
Raster\ Image\ \#0 =
|
||||
0, 1, 2, 3, 4,
|
||||
5, 6, 7, 8, 9,
|
||||
10, 11, 12, 13, 14,
|
||||
@ -18,7 +18,7 @@ data:
|
||||
20, 21, 22, 23, 24,
|
||||
25, 26, 27, 28, 29 ;
|
||||
|
||||
Raster\%20Image\%20\%231 =
|
||||
Raster\ Image\ \#1 =
|
||||
0, 1, 2, 3, 4,
|
||||
5, 6, 7, 8, 9,
|
||||
10, 11, 12, 13, 14,
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
netcdf test {
|
||||
dimensions:
|
||||
Raster\%20Image\%20\%230__X = 5 ;
|
||||
Raster\%20Image\%20\%230__Y = 6 ;
|
||||
Raster\%20Image\%20\%231__X = 5 ;
|
||||
Raster\%20Image\%20\%231__Y = 6 ;
|
||||
Raster\%20Image\%20\%232__X = 5 ;
|
||||
Raster\%20Image\%20\%232__Y = 6 ;
|
||||
Raster\ Image\ \#0__X = 5 ;
|
||||
Raster\ Image\ \#0__Y = 6 ;
|
||||
Raster\ Image\ \#1__X = 5 ;
|
||||
Raster\ Image\ \#1__Y = 6 ;
|
||||
Raster\ Image\ \#2__X = 5 ;
|
||||
Raster\ Image\ \#2__Y = 6 ;
|
||||
variables:
|
||||
byte Raster\%20Image\%20\%230(Raster\%20Image\%20\%230__Y, Raster\%20Image\%20\%230__X) ;
|
||||
byte Raster\%20Image\%20\%231(Raster\%20Image\%20\%231__Y, Raster\%20Image\%20\%231__X) ;
|
||||
byte Raster\%20Image\%20\%232(Raster\%20Image\%20\%232__Y, Raster\%20Image\%20\%232__X) ;
|
||||
byte Raster\ Image\ \#0(Raster\ Image\ \#0__Y, Raster\ Image\ \#0__X) ;
|
||||
byte Raster\ Image\ \#1(Raster\ Image\ \#1__Y, Raster\ Image\ \#1__X) ;
|
||||
byte Raster\ Image\ \#2(Raster\ Image\ \#2__Y, Raster\ Image\ \#2__X) ;
|
||||
data:
|
||||
|
||||
Raster\%20Image\%20\%230 =
|
||||
Raster\ Image\ \#0 =
|
||||
0, 1, 2, 3, 4,
|
||||
5, 6, 7, 8, 9,
|
||||
10, 11, 12, 13, 14,
|
||||
@ -20,7 +20,7 @@ data:
|
||||
20, 21, 22, 23, 24,
|
||||
25, 26, 27, 28, 29 ;
|
||||
|
||||
Raster\%20Image\%20\%231 =
|
||||
Raster\ Image\ \#1 =
|
||||
0, 1, 2, 3, 4,
|
||||
5, 6, 7, 8, 9,
|
||||
10, 11, 12, 13, 14,
|
||||
@ -28,7 +28,7 @@ data:
|
||||
20, 21, 22, 23, 24,
|
||||
25, 26, 27, 28, 29 ;
|
||||
|
||||
Raster\%20Image\%20\%232 =
|
||||
Raster\ Image\ \#2 =
|
||||
0, 1, 2, 3, 4,
|
||||
5, 6, 7, 8, 9,
|
||||
10, 11, 12, 13, 14,
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
netcdf test {
|
||||
dimensions:
|
||||
Raster\%20Image\%20\%230__X = 5 ;
|
||||
Raster\%20Image\%20\%230__Y = 6 ;
|
||||
Raster\%20Image\%20\%230__comps = 3 ;
|
||||
Raster\ Image\ \#0__X = 5 ;
|
||||
Raster\ Image\ \#0__Y = 6 ;
|
||||
Raster\ Image\ \#0__comps = 3 ;
|
||||
variables:
|
||||
byte Raster\%20Image\%20\%230(Raster\%20Image\%20\%230__comps, Raster\%20Image\%20\%230__Y, Raster\%20Image\%20\%230__X) ;
|
||||
byte Raster\ Image\ \#0(Raster\ Image\ \#0__comps, Raster\ Image\ \#0__Y, Raster\ Image\ \#0__X) ;
|
||||
data:
|
||||
|
||||
Raster\%20Image\%20\%230 =
|
||||
Raster\ Image\ \#0 =
|
||||
0, 1, 2, 3, 4,
|
||||
5, 6, 7, 8, 9,
|
||||
10, 11, 12, 13, 14,
|
||||
|
||||
@ -10,7 +10,7 @@ dimensions:
|
||||
fakeDim7 = 5 ;
|
||||
variables:
|
||||
int SDS_RLE(fakeDim0, fakeDim1) ;
|
||||
int SDS_N\%2dbit(fakeDim2, fakeDim3) ;
|
||||
int SDS_N-bit(fakeDim2, fakeDim3) ;
|
||||
int SDS_Skip_Huffman(fakeDim4, fakeDim5) ;
|
||||
int SDS_Deflate(fakeDim6, fakeDim7) ;
|
||||
data:
|
||||
@ -33,7 +33,7 @@ data:
|
||||
143360, 145408, 147456, 149504, 151552,
|
||||
153600, 155648, 157696, 159744, 161792 ;
|
||||
|
||||
SDS_N\%2dbit =
|
||||
SDS_N-bit =
|
||||
0, 2048, 4096, 6144, 8192,
|
||||
10240, 12288, 14336, 16384, 18432,
|
||||
20480, 22528, 24576, 26624, 28672,
|
||||
|
||||
@ -13,7 +13,7 @@ dimensions:
|
||||
variables:
|
||||
int SDS_None(fakeDim0, fakeDim1) ;
|
||||
int SDS_RLE(fakeDim2, fakeDim3) ;
|
||||
int SDS_N\%2dbit(fakeDim4, fakeDim5) ;
|
||||
int SDS_N-bit(fakeDim4, fakeDim5) ;
|
||||
int SDS_Skip_Huffman(fakeDim6, fakeDim7) ;
|
||||
int SDS_Deflate(fakeDim8, fakeDim9) ;
|
||||
data:
|
||||
@ -40,7 +40,7 @@ data:
|
||||
57344, 59392, 61440, 63488,
|
||||
65536, 67584, 69632, 71680 ;
|
||||
|
||||
SDS_N\%2dbit =
|
||||
SDS_N-bit =
|
||||
0, 2048, 4096, 6144,
|
||||
8192, 10240, 12288, 14336,
|
||||
16384, 18432, 20480, 22528,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Attributes {
|
||||
S1 {
|
||||
v1 {
|
||||
Int32 a1 32;
|
||||
Int32 a%201 32;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,8 +20,6 @@ test.05 test.06a test.07a \
|
||||
test.07 test.21 test.22 \
|
||||
test.23 test.31 \
|
||||
test.50 test.53 test.55 \
|
||||
"
|
||||
X="\
|
||||
test.56 test.57 \
|
||||
test.66 test.67 test.68 test.69 \
|
||||
test.an1 \
|
||||
@ -44,68 +42,4 @@ test.nc text.nc"
|
||||
# only to detect which are considered XFAIL tests.
|
||||
XFAILTESTS=""
|
||||
|
||||
#FILETESTS="${SYNTHETICDATA} ${ACTUALDATA1} ${ACTUALDATA2}"
|
||||
FILETESTS="${ACTUALDATA1}"
|
||||
|
||||
##################################################
|
||||
# Remote test info
|
||||
##################################################
|
||||
|
||||
# REMOTEURL1="http://motherlode.ucar.edu:8080/dts"
|
||||
# REMOTEURL2="http://test.opendap.org/dap/netcdf/examples"
|
||||
#
|
||||
#
|
||||
# REMOTETESTS1="\
|
||||
# "
|
||||
#
|
||||
# REMOTETESTS2="\
|
||||
# 123bears.nc 123.nc \
|
||||
# a21160601.nc bears.nc ber-2002-10-01.nc \
|
||||
# ceopL2AIRS2-2.nc ceopL2AIRS2.nc coads_climatology2.nc \
|
||||
# data.nc fnoc1.nc in1.nc \
|
||||
# in_2.nc in.nc in_no_three_double_dmn.nc \
|
||||
# in_v.nc saco1.nc testfile.nc \
|
||||
# test.nc text.nc"
|
||||
#
|
||||
# # Following are too big to include in distribution
|
||||
# TOOBIG="test.06 test.32 \
|
||||
# ceopL2AIRS2.nc testfile.nc test.Swathfile\
|
||||
# 3fnoc.nc a21160601.nc"
|
||||
#
|
||||
# if test 1 = 0 ; then
|
||||
# TESTSERVER="http://test.opendap.org"
|
||||
# TESTFF="${TESTSERVER}/opendap/nph-dods/data/ff"
|
||||
# TESTHDF="${TESTSERVER}/opendap/nph-dods/data/hdf"
|
||||
#
|
||||
# # Client parameters
|
||||
# cl_10="[limit=10]"
|
||||
# cl_gso_13="[limit-GSO_AVHRR=13]"
|
||||
# cl_gso_27="[limit-GSO_AVHRR=27]"
|
||||
# cl_day_7="[limit-GSO_AVHRR.day_num=7]"
|
||||
#
|
||||
# # Constraints
|
||||
#
|
||||
# ce_day="GSO_AVHRR.day_num"
|
||||
# ce_day_160="GSO_AVHRR.day_num&GSO_AVHRR.day_num>160"
|
||||
#
|
||||
# # ce3: an array inside a structure; watch escaping
|
||||
# ce_nscat_lat="NSCAT Rev 17.WVC_Lat"
|
||||
#
|
||||
# # ce4 a field in a structure in a sequence in a structure.
|
||||
# ce_nscat1="NSCAT Rev 17.SwathIndex.begin.begin__0"
|
||||
# ce_nscat2="NSCAT Rev 17.SwathIndex.begin.begin__0&NSCAT Rev 17.SwathIndex.begin.begin__0>0"
|
||||
#
|
||||
# avhrr_server="${TESTFF}/1998-6-avhrr.dat"
|
||||
# hdf_server="${TESTHDF}/1990-S1700101.HDF"
|
||||
# nscat_server="${hdf_server}"
|
||||
#
|
||||
# avhrr_server_1="${cl_10}$avhrr_server"
|
||||
# avhrr_server_2="${cl_gso_27}$avhrr_server"
|
||||
# avhrr_server_3="${cl_gso_27}${cl_day_7}$avhrr_server"
|
||||
# avhrr_server_4="${cl_gso_13}$avhrr_server"
|
||||
#
|
||||
# REMOTETESTS=
|
||||
# XFAILREMOTETESTS=
|
||||
#
|
||||
# REMOTETESTSET="${REMOTETESTS} ${XFAILREMOTETESTS}"
|
||||
# fi
|
||||
FILETESTS="${SYNTHETICDATA} ${ACTUALDATA1} ${ACTUALDATA2}"
|
||||
|
||||
@ -14,55 +14,56 @@ check_PROGRAMS =
|
||||
TESTS =
|
||||
TESTS_ENVIRONMENT=TOPSRCDIR=${abs_top_srcdir}
|
||||
|
||||
#TESTS += tst_ncdap3.sh
|
||||
|
||||
if USE_NETCDF4
|
||||
TESTS += tst_ncdap4.sh
|
||||
endif # USE_NETCDF4
|
||||
TESTS += tst_ncdap3.sh
|
||||
|
||||
# remote tests are optional
|
||||
# because the server may be down
|
||||
# because the server may be down or inaccessible
|
||||
|
||||
if ENABLE_DAP_REMOTE_TESTS
|
||||
TESTS += tst_remote3.sh
|
||||
|
||||
if ENABLE_DAP_LONG_TESTS
|
||||
TESTS += tst_longremote3.sh
|
||||
TESTS += tst_longremote3.sh
|
||||
endif
|
||||
|
||||
if USE_NETCDF4
|
||||
TESTS += tst_remote4.sh
|
||||
if ENABLE_DAP_LONG_TESTS
|
||||
TESTS += tst_longremote4.sh
|
||||
endif
|
||||
endif
|
||||
|
||||
endif #REMOTE_TESTS
|
||||
|
||||
# Do the programmatic tests last; all are part of the remote test set
|
||||
if ENABLE_DAP_REMOTE_TESTS
|
||||
|
||||
# Conversion tests
|
||||
|
||||
if USE_NETCDF4
|
||||
test_cvt4_SOURCES = test_cvt.c
|
||||
t_dap4_SOURCES = t_dap4.c
|
||||
check_PROGRAMS += test_cvt4 t_dap4
|
||||
TESTS += test_cvt4 t_dap4
|
||||
else
|
||||
test_cvt3_SOURCES = test_cvt.c
|
||||
test_vara_SOURCES = test_vara.c
|
||||
check_PROGRAMS += t_dap3a test_cvt3 test_vara
|
||||
TESTS += t_dap3a test_cvt3 test_vara
|
||||
#test_varm3_SOURCES = test_varm3.c
|
||||
#TESTS += test_varm3
|
||||
#check_PROGRAMS += test_varm3
|
||||
endif
|
||||
test_varm3_SOURCES = test_varm3.c
|
||||
TESTS += test_varm3
|
||||
check_PROGRAMS += test_varm3
|
||||
|
||||
t_dap3a_SOURCES = t_dap3a.c
|
||||
check_PROGRAMS += t_dap3a
|
||||
TESTS += t_dap3a
|
||||
|
||||
endif #ENABLE_DAP_REMOTE_TESTS
|
||||
|
||||
|
||||
if USE_NETCDF4
|
||||
|
||||
#TESTS += tst_ncdap4.sh
|
||||
|
||||
if ENABLE_DAP_REMOTE_TESTS
|
||||
|
||||
#TESTS += tst_remote4.sh
|
||||
|
||||
if ENABLE_DAP_LONG_TESTS
|
||||
#TESTS += tst_longremote4.sh
|
||||
endif
|
||||
|
||||
# Conversion tests
|
||||
|
||||
#test_cvt4_SOURCES = test_cvt.c
|
||||
#t_dap4_SOURCES = t_dap4.c
|
||||
#check_PROGRAMS += test_cvt4 t_dap4
|
||||
#TESTS += test_cvt4 t_dap4
|
||||
|
||||
endif ENABLE_DAP_REMOTE_TESTS
|
||||
|
||||
endif #USE_NETCDF4
|
||||
|
||||
# Need to add subdirs
|
||||
SUBDIRS = testdata3 expected3 expected4 expectremote3 expectremote4
|
||||
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
netcdf NestedSeq {
|
||||
dimensions:
|
||||
unlimited = UNLIMITED ; // (0 currently)
|
||||
person1 = 5 ;
|
||||
variables:
|
||||
int person1.age(person1) ;
|
||||
short person1.stuff.foo(unlimited) ;
|
||||
data:
|
||||
|
||||
person1.age = 1, 2, 3, 5, 8 ;
|
||||
|
||||
@ -1,16 +1,11 @@
|
||||
netcdf NestedSeq2 {
|
||||
dimensions:
|
||||
unlimited = UNLIMITED ; // (0 currently)
|
||||
person1 = 5 ;
|
||||
person2 = 5 ;
|
||||
variables:
|
||||
int person1.age(person1) ;
|
||||
int person1.size(person1) ;
|
||||
short person1.stuff.foo(unlimited) ;
|
||||
short person1.stuff.bar(unlimited) ;
|
||||
int person2.age(person2) ;
|
||||
short person2.stuff.foo(unlimited) ;
|
||||
short person2.stuff.bar(unlimited) ;
|
||||
int person2.size(person2) ;
|
||||
data:
|
||||
|
||||
|
||||
@ -11,17 +11,17 @@ data:
|
||||
|
||||
Drifters.instrument_id =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 4).",
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 8)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.location =
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 9)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.latitude = 1000, 999.800006666578, 999.200106660978,
|
||||
998.200539935204, 996.801706302619 ;
|
||||
|
||||
@ -67,17 +67,17 @@ data:
|
||||
|
||||
Drifters.Drifter_ID =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 10).",
|
||||
"This is a data test string (pass 15).",
|
||||
"This is a data test string (pass 20)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.Date_Sampled =
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 11).",
|
||||
"This is a data test string (pass 16).",
|
||||
"This is a data test string (pass 21)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.Latitude = 1000, 990.215996212637, 961.055438310771,
|
||||
913.088940312308, 847.255111013416 ;
|
||||
@ -119,26 +119,26 @@ data:
|
||||
857.708681363824, 777.572718750928 ;
|
||||
|
||||
Drifters.Region =
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 12).",
|
||||
"This is a data test string (pass 17).",
|
||||
"This is a data test string (pass 22)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.Decimal_Day = 991.561893714788, 963.770896365891, 917.120822816605,
|
||||
852.524522059506, 771.246014997106 ;
|
||||
|
||||
Drifters.Calibration_File =
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 8).",
|
||||
"This is a data test string (pass 13).",
|
||||
"This is a data test string (pass 18).",
|
||||
"This is a data test string (pass 23)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.Drifter_Type =
|
||||
"This is a data test string (pass 4).",
|
||||
"This is a data test string (pass 9).",
|
||||
"This is a data test string (pass 14).",
|
||||
"This is a data test string (pass 19).",
|
||||
"This is a data test string (pass 24)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
}
|
||||
|
||||
@ -108,17 +108,17 @@ data:
|
||||
|
||||
Abbott_Image_Data.Image_Name =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 14).",
|
||||
"This is a data test string (pass 21).",
|
||||
"This is a data test string (pass 28)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Abbott_Image_Data.Date_Sampled =
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 8).",
|
||||
"This is a data test string (pass 15).",
|
||||
"This is a data test string (pass 22).",
|
||||
"This is a data test string (pass 29)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Abbott_Image_Data.North_Latitude = 1000, 999.200106660978, 996.801706302619,
|
||||
992.808635853866, 987.227283375627 ;
|
||||
@ -133,55 +133,55 @@ data:
|
||||
993.956097956697, 988.771077936042, 982.00423511727 ;
|
||||
|
||||
Abbott_Image_Data.Version =
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 9).",
|
||||
"This is a data test string (pass 16).",
|
||||
"This is a data test string (pass 23).",
|
||||
"This is a data test string (pass 30)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Abbott_Image_Data.Julian_Date = 1, 2, 3, 5, 8 ;
|
||||
|
||||
Abbott_Image_Data.PI =
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 10).",
|
||||
"This is a data test string (pass 17).",
|
||||
"This is a data test string (pass 24).",
|
||||
"This is a data test string (pass 31)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Abbott_Image_Data.Algorithm_Code =
|
||||
"This is a data test string (pass 4).",
|
||||
"This is a data test string (pass 11).",
|
||||
"This is a data test string (pass 18).",
|
||||
"This is a data test string (pass 25).",
|
||||
"This is a data test string (pass 32)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Abbott_Image_Data.Project =
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 12).",
|
||||
"This is a data test string (pass 19).",
|
||||
"This is a data test string (pass 26).",
|
||||
"This is a data test string (pass 33)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Abbott_Image_Data.Comments =
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 13).",
|
||||
"This is a data test string (pass 20).",
|
||||
"This is a data test string (pass 27).",
|
||||
"This is a data test string (pass 34)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Sat_Images.Image_Name =
|
||||
"This is a data test string (pass 35).",
|
||||
"This is a data test string (pass 44).",
|
||||
"This is a data test string (pass 53).",
|
||||
"This is a data test string (pass 62).",
|
||||
"This is a data test string (pass 71)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Sat_Images.Date_Sampled =
|
||||
"This is a data test string (pass 36).",
|
||||
"This is a data test string (pass 45).",
|
||||
"This is a data test string (pass 54).",
|
||||
"This is a data test string (pass 63).",
|
||||
"This is a data test string (pass 72)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Sat_Images.North_Latitude = 980.066577841242, 971.33797485203,
|
||||
961.055438310771, 949.235418082441, 935.896823677935 ;
|
||||
@ -196,48 +196,48 @@ data:
|
||||
952.333569885713, 939.372712847379, 924.909059857313 ;
|
||||
|
||||
Sat_Images.Version =
|
||||
"This is a data test string (pass 37).",
|
||||
"This is a data test string (pass 46).",
|
||||
"This is a data test string (pass 55).",
|
||||
"This is a data test string (pass 64).",
|
||||
"This is a data test string (pass 73)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Sat_Images.Satellite =
|
||||
"This is a data test string (pass 38).",
|
||||
"This is a data test string (pass 47).",
|
||||
"This is a data test string (pass 56).",
|
||||
"This is a data test string (pass 65).",
|
||||
"This is a data test string (pass 74)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Sat_Images.Instrument =
|
||||
"This is a data test string (pass 39).",
|
||||
"This is a data test string (pass 48).",
|
||||
"This is a data test string (pass 57).",
|
||||
"This is a data test string (pass 66).",
|
||||
"This is a data test string (pass 75)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Sat_Images.Channel =
|
||||
"This is a data test string (pass 40).",
|
||||
"This is a data test string (pass 49).",
|
||||
"This is a data test string (pass 58).",
|
||||
"This is a data test string (pass 67).",
|
||||
"This is a data test string (pass 76)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Sat_Images.Resolution =
|
||||
"This is a data test string (pass 41).",
|
||||
"This is a data test string (pass 50).",
|
||||
"This is a data test string (pass 59).",
|
||||
"This is a data test string (pass 68).",
|
||||
"This is a data test string (pass 77)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Sat_Images.Image_Size = 13, 610, 28657, 1346269, 63245986 ;
|
||||
|
||||
Sat_Images.Image_Type =
|
||||
"This is a data test string (pass 42).",
|
||||
"This is a data test string (pass 51).",
|
||||
"This is a data test string (pass 60).",
|
||||
"This is a data test string (pass 69).",
|
||||
"This is a data test string (pass 78)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Sat_Images.Image_Bits_Per_Pixel = 21, 987, 46368, 2178309, 102334155 ;
|
||||
|
||||
@ -904,22 +904,22 @@ data:
|
||||
Sat_Images.Year = 144, 6765, 317811, 14930352, 701408733 ;
|
||||
|
||||
Sat_Images.Month =
|
||||
"This is a data test string (pass 43).",
|
||||
"This is a data test string (pass 52).",
|
||||
"This is a data test string (pass 61).",
|
||||
"This is a data test string (pass 70).",
|
||||
"This is a data test string (pass 79)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Sat_Images.Day = 233, 10946, 514229, 24157817, 1134903170 ;
|
||||
|
||||
Sat_Images.Hour = 377, 17711, 832040, 39088169, 1836311903 ;
|
||||
|
||||
Drifters.Instrument_ID =
|
||||
"This is a data test string (pass 80).",
|
||||
"This is a data test string (pass 85).",
|
||||
"This is a data test string (pass 90).",
|
||||
"This is a data test string (pass 95).",
|
||||
"This is a data test string (pass 100)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.Battery = 921.060994002885, 696.706709347165, 362.357754476673,
|
||||
-29.1995223012899, -416.146836547144 ;
|
||||
@ -1036,32 +1036,32 @@ data:
|
||||
40.7850112415899, -351.528841940961, -688.344020399234 ;
|
||||
|
||||
Drifters.Date_Greenwich =
|
||||
"This is a data test string (pass 81).",
|
||||
"This is a data test string (pass 86).",
|
||||
"This is a data test string (pass 91).",
|
||||
"This is a data test string (pass 96).",
|
||||
"This is a data test string (pass 101)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.Date_Local_Time =
|
||||
"This is a data test string (pass 82).",
|
||||
"This is a data test string (pass 87).",
|
||||
"This is a data test string (pass 92).",
|
||||
"This is a data test string (pass 97).",
|
||||
"This is a data test string (pass 102)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.DateStamp =
|
||||
"This is a data test string (pass 83).",
|
||||
"This is a data test string (pass 88).",
|
||||
"This is a data test string (pass 93).",
|
||||
"This is a data test string (pass 98).",
|
||||
"This is a data test string (pass 103)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.algo_code =
|
||||
"This is a data test string (pass 84).",
|
||||
"This is a data test string (pass 89).",
|
||||
"This is a data test string (pass 94).",
|
||||
"This is a data test string (pass 99).",
|
||||
"This is a data test string (pass 104)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.GPS_hour = -1109825406, -1055680967, -1262539787, 1845853122,
|
||||
2118290601 ;
|
||||
@ -1094,30 +1094,30 @@ data:
|
||||
-401779575 ;
|
||||
|
||||
Instrument.Instrument_ID =
|
||||
"This is a data test string (pass 105).",
|
||||
"This is a data test string (pass 109).",
|
||||
"This is a data test string (pass 113).",
|
||||
"This is a data test string (pass 117).",
|
||||
"This is a data test string (pass 121)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Instrument.Instrument_Type =
|
||||
"This is a data test string (pass 106).",
|
||||
"This is a data test string (pass 110).",
|
||||
"This is a data test string (pass 114).",
|
||||
"This is a data test string (pass 118).",
|
||||
"This is a data test string (pass 122)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Instrument.Sensor_Platform_ID =
|
||||
"This is a data test string (pass 107).",
|
||||
"This is a data test string (pass 111).",
|
||||
"This is a data test string (pass 115).",
|
||||
"This is a data test string (pass 119).",
|
||||
"This is a data test string (pass 123)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Instrument.Comment =
|
||||
"This is a data test string (pass 108).",
|
||||
"This is a data test string (pass 112).",
|
||||
"This is a data test string (pass 116).",
|
||||
"This is a data test string (pass 120).",
|
||||
"This is a data test string (pass 124)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
}
|
||||
|
||||
@ -176,10 +176,10 @@ data:
|
||||
|
||||
Drifters.instrument_id =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 4).",
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 8)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.flag_argos = 998.750260394966, 862.807070514761, 531.860721374355,
|
||||
80.7084484547995, -388.684753364753 ;
|
||||
@ -209,11 +209,11 @@ data:
|
||||
0.796326710732153, -461.072691376713 ;
|
||||
|
||||
Drifters.location =
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 9)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Drifters.longitude = 990.215996212637, 813.878456662534, 453.596121425577,
|
||||
-9.20354326880945, -469.923113727602 ;
|
||||
|
||||
@ -20,15 +20,15 @@ data:
|
||||
|
||||
b31.class =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 4).",
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 8)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
b31.text =
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 9)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
}
|
||||
|
||||
@ -15,15 +15,15 @@ data:
|
||||
|
||||
b31.class =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 4).",
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 8)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
b31.text =
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 9)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
}
|
||||
|
||||
@ -33,5 +33,5 @@ data:
|
||||
|
||||
s = "This is a data test string (pass 0)." ;
|
||||
|
||||
u = "http://www.dods.org" ;
|
||||
u = "http://www.opendap.org" ;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -29,5 +29,5 @@ data:
|
||||
|
||||
types.s = "This is a data test string (pass 0)." ;
|
||||
|
||||
types.u = "http://www.dods.org" ;
|
||||
types.u = "http://www.opendap.org" ;
|
||||
}
|
||||
|
||||
@ -29,5 +29,5 @@ data:
|
||||
|
||||
types.strings.s = "This is a data test string (pass 0)." ;
|
||||
|
||||
types.strings.u = "http://www.dods.org" ;
|
||||
types.strings.u = "http://www.opendap.org" ;
|
||||
}
|
||||
|
||||
3934
ncremote_test/expectremote3/test.06.dmp
Normal file
3934
ncremote_test/expectremote3/test.06.dmp
Normal file
File diff suppressed because it is too large
Load Diff
@ -53,9 +53,9 @@ data:
|
||||
"This is a data test string (pass 4)." ;
|
||||
|
||||
types.u =
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org" ;
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org" ;
|
||||
}
|
||||
|
||||
@ -52,14 +52,14 @@ data:
|
||||
"This is a data test string (pass 9)." ;
|
||||
|
||||
types.u =
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org" ;
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org" ;
|
||||
}
|
||||
|
||||
@ -64,54 +64,54 @@ data:
|
||||
"This is a data test string (pass 9)." ;
|
||||
|
||||
types.ss.u =
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org",
|
||||
"http://www.dods.org" ;
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org",
|
||||
"http://www.opendap.org" ;
|
||||
}
|
||||
|
||||
@ -45,15 +45,15 @@ data:
|
||||
|
||||
Vdata_DFNT_CHAR8.Field_DFNT_CHAR8.Field_DFNT_CHAR8__0 =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 4)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Vdata_DFNT_UCHAR8.Field_DFNT_UCHAR8.Field_DFNT_UCHAR8__0 =
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 8).",
|
||||
"This is a data test string (pass 9)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
}
|
||||
|
||||
@ -179,15 +179,15 @@ data:
|
||||
|
||||
Vdata_DFNT_CHAR8.Field_DFNT_CHAR8.Field_DFNT_CHAR8__0 =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 4)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Vdata_DFNT_UCHAR8.Field_DFNT_UCHAR8.Field_DFNT_UCHAR8__0 =
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 8).",
|
||||
"This is a data test string (pass 9)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
}
|
||||
|
||||
@ -35,15 +35,15 @@ data:
|
||||
|
||||
Vdata.dCHAR8.dCHAR8__0 =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 4).",
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 8)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Vdata.dUCHAR8.dUCHAR8__0 =
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 9)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
}
|
||||
|
||||
@ -45,15 +45,15 @@ data:
|
||||
|
||||
Vdata_DFNT_CHAR8.Field_DFNT_CHAR8.Field_DFNT_CHAR8__0 =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 4)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
Vdata_DFNT_UCHAR8.Field_DFNT_UCHAR8.Field_DFNT_UCHAR8__0 =
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 8).",
|
||||
"This is a data test string (pass 9)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
}
|
||||
|
||||
@ -15,21 +15,21 @@ data:
|
||||
|
||||
emolt_sensor.SITE =
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 2).",
|
||||
"This is a data test string (pass 4).",
|
||||
"This is a data test string (pass 6).",
|
||||
"This is a data test string (pass 8)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
emolt_sensor.SERIAL_NUM = 0, 32, 64, 96, 128 ;
|
||||
|
||||
emolt_sensor.PROBE_SETTING = 16, 48, 80, 112, 144 ;
|
||||
|
||||
emolt_sensor.TIME_LOCAL =
|
||||
"This is a data test string (pass 1).",
|
||||
"This is a data test string (pass 3).",
|
||||
"This is a data test string (pass 5).",
|
||||
"This is a data test string (pass 7).",
|
||||
"This is a data test string (pass 9)." ;
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0).",
|
||||
"This is a data test string (pass 0)." ;
|
||||
|
||||
emolt_sensor.YRDAY0_LOCAL = 1000, 999.200106660978, 996.801706302619,
|
||||
992.808635853866, 987.227283375627 ;
|
||||
|
||||
@ -107,7 +107,8 @@ static char string3[DIMSIZE][STRLEN];
|
||||
|
||||
int main()
|
||||
{
|
||||
int ncid, varid, i, j;
|
||||
int ncid, varid;
|
||||
int i,j;
|
||||
int ncstat = NC_NOERR;
|
||||
char* url;
|
||||
char* topsrcdir;
|
||||
|
||||
@ -18,8 +18,8 @@ synth8.das synth8.dds synth8.dods \
|
||||
123.nc.das 123.nc.dds 123.nc.dods \
|
||||
1990-S1700101.HDF.WVC_Lat.das 1990-S1700101.HDF.WVC_Lat.dds 1990-S1700101.HDF.WVC_Lat.dods \
|
||||
1998-6-avhrr.dat.das 1998-6-avhrr.dat.dds 1998-6-avhrr.dat.dods \
|
||||
b31a.das b31a.dds b31a.dods \
|
||||
b31.das b31.dds b31.dods \
|
||||
b31a.das b31a.dds b31a.dods \
|
||||
bears.nc.das bears.nc.dds bears.nc.dods \
|
||||
ber-2002-10-01.nc.das ber-2002-10-01.nc.dds ber-2002-10-01.nc.dods \
|
||||
ceopL2AIRS2-2.nc.das ceopL2AIRS2-2.nc.dds ceopL2AIRS2-2.nc.dods \
|
||||
@ -36,8 +36,8 @@ in.nc.das in.nc.dds in.nc.dods \
|
||||
in_no_three_double_dmn.nc.das in_no_three_double_dmn.nc.dds in_no_three_double_dmn.nc.dods \
|
||||
in_v.nc.das in_v.nc.dds in_v.nc.dods \
|
||||
nestedDAS.das nestedDAS.dds nestedDAS.dods \
|
||||
NestedSeq2.das NestedSeq2.dds NestedSeq2.dods \
|
||||
NestedSeq.das NestedSeq.dds NestedSeq.dods \
|
||||
NestedSeq2.das NestedSeq2.dds NestedSeq2.dods \
|
||||
OverideExample.das OverideExample.dds OverideExample.dods \
|
||||
pbug0001b.das pbug0001b.dds pbug0001b.dods \
|
||||
saco1.nc.das saco1.nc.dds saco1.nc.dods \
|
||||
@ -47,10 +47,10 @@ test.02.das test.02.dds test.02.dods \
|
||||
test.03.das test.03.dds test.03.dods \
|
||||
test.04.das test.04.dds test.04.dods \
|
||||
test.05.das test.05.dds test.05.dods \
|
||||
test.06a.das test.06a.dds test.06a.dods \
|
||||
test.06.das test.06.dds test.06.dods \
|
||||
test.07a.das test.07a.dds test.07a.dods \
|
||||
test.06a.das test.06a.dds test.06a.dods \
|
||||
test.07.das test.07.dds test.07.dods \
|
||||
test.07a.das test.07a.dds test.07a.dods \
|
||||
test.21.das test.21.dds test.21.dods \
|
||||
test.22.das test.22.dds test.22.dods \
|
||||
test.23.das test.23.dds test.23.dods \
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Attributes {
|
||||
S1 {
|
||||
v1 {
|
||||
Int32 a1 32;
|
||||
Int32 a1%20a1 32;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -8,7 +8,7 @@
|
||||
|
||||
FILEURL="file://${testdata3}"
|
||||
|
||||
SYNTHETICDATA="synth1 synth2 synth3 synth4 synth5 synth6 synth7 synth8"
|
||||
SYNTHETICDATA="synth1 synth2 synth3 synth4 synth5 synth6 synth7"
|
||||
|
||||
ACTUALDATA1=\
|
||||
"1990-S1700101.HDF.WVC_Lat 1998-6-avhrr.dat \
|
||||
@ -43,66 +43,3 @@ test.nc text.nc"
|
||||
XFAILTESTS=""
|
||||
|
||||
FILETESTS="${SYNTHETICDATA} ${ACTUALDATA1} ${ACTUALDATA2}"
|
||||
|
||||
##################################################
|
||||
# Remote test info
|
||||
##################################################
|
||||
|
||||
# REMOTEURL1="http://motherlode.ucar.edu:8080/dts"
|
||||
# REMOTEURL2="http://test.opendap.org/dap/netcdf/examples"
|
||||
#
|
||||
#
|
||||
# REMOTETESTS1="\
|
||||
# "
|
||||
#
|
||||
# REMOTETESTS2="\
|
||||
# 123bears.nc 123.nc \
|
||||
# a21160601.nc bears.nc ber-2002-10-01.nc \
|
||||
# ceopL2AIRS2-2.nc ceopL2AIRS2.nc coads_climatology2.nc \
|
||||
# data.nc fnoc1.nc in1.nc \
|
||||
# in_2.nc in.nc in_no_three_double_dmn.nc \
|
||||
# in_v.nc saco1.nc testfile.nc \
|
||||
# test.nc text.nc"
|
||||
#
|
||||
# # Following are too big to include in distribution
|
||||
# TOOBIG="test.06 test.32 \
|
||||
# ceopL2AIRS2.nc testfile.nc test.Swathfile\
|
||||
# 3fnoc.nc a21160601.nc"
|
||||
#
|
||||
# if test 1 = 0 ; then
|
||||
# TESTSERVER="http://test.opendap.org"
|
||||
# TESTFF="${TESTSERVER}/opendap/nph-dods/data/ff"
|
||||
# TESTHDF="${TESTSERVER}/opendap/nph-dods/data/hdf"
|
||||
#
|
||||
# # Client parameters
|
||||
# cl_10="[limit=10]"
|
||||
# cl_gso_13="[limit-GSO_AVHRR=13]"
|
||||
# cl_gso_27="[limit-GSO_AVHRR=27]"
|
||||
# cl_day_7="[limit-GSO_AVHRR.day_num=7]"
|
||||
#
|
||||
# # Constraints
|
||||
#
|
||||
# ce_day="GSO_AVHRR.day_num"
|
||||
# ce_day_160="GSO_AVHRR.day_num&GSO_AVHRR.day_num>160"
|
||||
#
|
||||
# # ce3: an array inside a structure; watch escaping
|
||||
# ce_nscat_lat="NSCAT Rev 17.WVC_Lat"
|
||||
#
|
||||
# # ce4 a field in a structure in a sequence in a structure.
|
||||
# ce_nscat1="NSCAT Rev 17.SwathIndex.begin.begin__0"
|
||||
# ce_nscat2="NSCAT Rev 17.SwathIndex.begin.begin__0&NSCAT Rev 17.SwathIndex.begin.begin__0>0"
|
||||
#
|
||||
# avhrr_server="${TESTFF}/1998-6-avhrr.dat"
|
||||
# hdf_server="${TESTHDF}/1990-S1700101.HDF"
|
||||
# nscat_server="${hdf_server}"
|
||||
#
|
||||
# avhrr_server_1="${cl_10}$avhrr_server"
|
||||
# avhrr_server_2="${cl_gso_27}$avhrr_server"
|
||||
# avhrr_server_3="${cl_gso_27}${cl_day_7}$avhrr_server"
|
||||
# avhrr_server_4="${cl_gso_13}$avhrr_server"
|
||||
#
|
||||
# REMOTETESTS=
|
||||
# XFAILREMOTETESTS=
|
||||
#
|
||||
# REMOTETESTSET="${REMOTETESTS} ${XFAILREMOTETESTS}"
|
||||
# fi
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -x
|
||||
#set -x
|
||||
quiet=0
|
||||
leakcheck=0
|
||||
timing=0
|
||||
@ -17,6 +17,12 @@ longtests="$5"
|
||||
|
||||
if test "x$timing" = "x1" ; then leakcheck=0; fi
|
||||
|
||||
# get the list of test files
|
||||
WHICHTESTS="S1 C1 C2"
|
||||
if test -n "$longtests"; then
|
||||
WHICHTESTS="${WHICHTESTS} L1 LC1"
|
||||
fi
|
||||
|
||||
# This fails because solaris ping does not like the -c1 option
|
||||
# # See if we can access the remote server at all
|
||||
# PINGURL="test.opendap.org"
|
||||
@ -41,17 +47,9 @@ expected3="${srcdir}/expectremote3"
|
||||
expected4="${srcdir}/expectremote4"
|
||||
fi
|
||||
|
||||
# get the list of test files
|
||||
##################################################
|
||||
# Remote test info
|
||||
##################################################
|
||||
# For now, only do only following test sets
|
||||
if test -n "$longtests"; then
|
||||
WHICHTESTS="L1 LC1"
|
||||
else
|
||||
WHICHTESTS="S1 C1"
|
||||
fi
|
||||
WHICHTESTS=S1
|
||||
|
||||
# For special testing
|
||||
REMOTEURLX="http://motherlode.ucar.edu:8080/dts"
|
||||
@ -62,19 +60,21 @@ REMOTETESTSXC="test.03;1;s0,s1"
|
||||
|
||||
# These shorter tests are always run
|
||||
REMOTEURLS1="http://motherlode.ucar.edu:8080/dts"
|
||||
REMOTETESTSS1="
|
||||
test.01 test.02
|
||||
test.04 test.05 test.06a test.07a test.07 \
|
||||
test.21 test.22 test.23 \
|
||||
test.31 \
|
||||
REMOTETESTSS1="\
|
||||
test.01 test.02 test.04 test.05 test.06 test.07a test.07 \
|
||||
test.21 \
|
||||
test.50 test.53 test.55 test.56 test.57 \
|
||||
test.66 test.67 test.68 test.69"
|
||||
REMOTETESTSS1="test.02"
|
||||
|
||||
# Server is failing on some tests ; investigate why
|
||||
S1FAIL="test.06a test.22 test.23 test.31"
|
||||
|
||||
# These longer tests are optional
|
||||
REMOTEURLL1="$REMOTEURLS1"
|
||||
REMOTETESTSL1="\
|
||||
test.03 \
|
||||
test.06 \
|
||||
b31 b31a D1 Drifters EOSDB \
|
||||
ingrid nestedDAS NestedSeq NestedSeq2 OverideExample \
|
||||
SimpleDrdsExample test.an1 \
|
||||
@ -87,7 +87,7 @@ whoi"
|
||||
|
||||
|
||||
# Anything larger than about 100k will not be in the distribution
|
||||
TOOBIG="parserBug0001 test.satimage Sat_Images test.06 test.32"
|
||||
TOOBIGL1="parserBug0001 test.satimage Sat_Images test.32"
|
||||
|
||||
# Following contain %XX escapes which I cannot handle yet
|
||||
ESCAPEDFAIL="test.dfr1 test.dfr2 test.dfr3 test.GridFile test.PointFile test.SwathFile test.sds6 test.sds7"
|
||||
|
||||
9
oc/Make0
9
oc/Make0
@ -14,14 +14,16 @@ makeoc::
|
||||
rm -f ocinternal.h
|
||||
sed -e 's|/[*]#undef OC_DISK_STORAGE[*]/|#undef OC_DISK_STORAGE|g' \
|
||||
< ${OCDIR}/ocinternal.h | tr -d '\r' >./ocinternal.h
|
||||
# Temporary
|
||||
sed -e 's|dapdecode(parsestate->lexstate,|(|' \
|
||||
< ${OCDIR}/dap.y | tr -d '\r' >./dap.y
|
||||
|
||||
# # Temporary
|
||||
# sed -e 's|dapdecode(parsestate->lexstate,|(|' \
|
||||
# < ${OCDIR}/dap.y | tr -d '\r' >./dap.y
|
||||
|
||||
diffoc::
|
||||
if ! test -e ${OCDIR} ; then echo "${OCDIR} not found"; exit ; fi
|
||||
for f in ${OCDIR}/*.[chy] ; do \
|
||||
x=`basename $$f | tr -d '
' ` ; \
|
||||
if test "x$${x}" = "xdaptab.c" -o "x$${x}" = "xdaptab.h" ; then echo "ignore: $${x}"; continue; fi ;\
|
||||
if test -e ${THISDIR}/$$x -a -e ${OCDIR}/$$x ; then \
|
||||
diff --brief -wBb ${THISDIR}/$$x $$f ; \
|
||||
else \
|
||||
@ -30,6 +32,7 @@ diffoc::
|
||||
done
|
||||
for f in ${OCDIR}/*.[chy] ; do \
|
||||
x=`basename $$f|tr -d '
' ` ; \
|
||||
if test "x$${x}" = "xdaptab.c" -o "x$${x}" = "xdaptab.h" ; then echo "ignore: $${x}"; continue; fi ;\
|
||||
if test -e ${THISDIR}/$$x -a -e ${OCDIR}/$$x ; then \
|
||||
if ! diff --brief -wBb ${THISDIR}/$$x $$f > /dev/null ; then \
|
||||
echo diff -wBb ${THISDIR}/$$x $$f ;\
|
||||
|
||||
2
oc/dap.y
2
oc/dap.y
@ -243,7 +243,7 @@ errorprog : /*empty*/ {$$=null;} | SCAN_PROG '=' WORD_WORD ';' {$$=$3;}
|
||||
and are disambiguated by context
|
||||
*/
|
||||
name:
|
||||
WORD_WORD {$$=($1);}
|
||||
WORD_WORD {$$=dapdecode(parsestate->lexstate,$1);}
|
||||
| SCAN_ALIAS {$$=strdup("alias");}
|
||||
| SCAN_ARRAY {$$=strdup("array");}
|
||||
| SCAN_ATTR {$$=strdup("attributes");}
|
||||
|
||||
841
oc/daptab.c
841
oc/daptab.c
File diff suppressed because it is too large
Load Diff
@ -146,11 +146,6 @@ WriteFileCallback(void* ptr, size_t size, size_t nmemb, void* data)
|
||||
if(realsize == 0)
|
||||
oc_log(LOGWARN,"WriteFileCallback: zero sized chunk");
|
||||
count = fwrite(ptr, size, nmemb, fetchdata->stream);
|
||||
if(ferror(fetchdata->stream)) {
|
||||
perror("xxx");
|
||||
fflush(stderr);
|
||||
abort();
|
||||
}
|
||||
if (count > 0) {
|
||||
fetchdata->size += (count * size);
|
||||
} else {
|
||||
|
||||
78
oc/oc.c
78
oc/oc.c
@ -128,10 +128,7 @@ oc_close(OCconnection conn)
|
||||
OCerror
|
||||
oc_root_free(OCconnection conn, OCobject root0)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* root;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,root,root0);
|
||||
OCDEREF(OCnode*,root,root0);
|
||||
|
||||
@ -143,13 +140,10 @@ oc_root_free(OCconnection conn, OCobject root0)
|
||||
unsigned int
|
||||
oc_inq_nobjects(OCconnection conn, OCobject root0)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* root;
|
||||
OClist* nodes;
|
||||
unsigned int nobjects;
|
||||
OCVERIFYX(OCstate*,state,conn,-1);
|
||||
OCVERIFYX(OCnode*,root,root0,-1);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCDEREF(OCnode*,root,root0);
|
||||
|
||||
if(root == NULL) return 0;
|
||||
@ -165,13 +159,10 @@ OCobject*
|
||||
oc_inq_objects(OCconnection conn, OCobject root0)
|
||||
{
|
||||
unsigned int i;
|
||||
OCstate* state;
|
||||
OCnode* root;
|
||||
OClist* nodes;
|
||||
OCobject* objects = NULL;
|
||||
unsigned int nobjects;
|
||||
OCVERIFYX(OCstate*,state,conn,OCNULL);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFYX(OCnode*,root,root0,OCNULL);
|
||||
OCDEREF(OCnode*,root,root0);
|
||||
|
||||
@ -196,10 +187,7 @@ oc_inq_objects(OCconnection conn, OCobject root0)
|
||||
const char*
|
||||
oc_inq_text(OCconnection conn, OCobject root0)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* root;
|
||||
OCVERIFYX(OCstate*,state,conn,OCNULL);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFYX(OCnode*,root,root0,NULL);
|
||||
OCDEREF(OCnode*,root,root0);
|
||||
|
||||
@ -220,10 +208,7 @@ oc_inq_object(OCconnection conn,
|
||||
unsigned int* subnodesp,
|
||||
unsigned int* nattrp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -262,10 +247,7 @@ oc_inq_name(OCconnection conn, OCobject node0, char** namep)
|
||||
OCerror
|
||||
oc_inq_nsubnodes(OCconnection conn, OCobject node0, unsigned int* nsubnodesp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -276,10 +258,7 @@ oc_inq_nsubnodes(OCconnection conn, OCobject node0, unsigned int* nsubnodesp)
|
||||
OCerror
|
||||
oc_inq_primtype(OCconnection conn, OCobject node0, OCtype* typep)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -297,10 +276,7 @@ oc_inq_type(OCconnection conn, OCobject node0, OCtype* typep)
|
||||
OCerror
|
||||
oc_inq_class(OCconnection conn, OCobject node0, OCtype* typep)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -311,10 +287,7 @@ oc_inq_class(OCconnection conn, OCobject node0, OCtype* typep)
|
||||
OCerror
|
||||
oc_inq_rank(OCconnection conn, OCobject node0, unsigned int* rankp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -325,10 +298,7 @@ oc_inq_rank(OCconnection conn, OCobject node0, unsigned int* rankp)
|
||||
OCerror
|
||||
oc_inq_nattr(OCconnection conn, OCobject node0, unsigned int* nattrp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -345,10 +315,7 @@ oc_inq_nattr(OCconnection conn, OCobject node0, unsigned int* nattrp)
|
||||
OCerror
|
||||
oc_inq_root(OCconnection conn, OCobject node0, OCobject* rootp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -359,10 +326,7 @@ oc_inq_root(OCconnection conn, OCobject node0, OCobject* rootp)
|
||||
OCerror
|
||||
oc_inq_container(OCconnection conn, OCobject node0, OCobject* containerp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -375,12 +339,9 @@ oc_inq_container(OCconnection conn, OCobject node0, OCobject* containerp)
|
||||
OCerror
|
||||
oc_inq_subnodes(OCconnection conn, OCobject node0, OCobject** subnodesp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCobject* subnodes = NULL;
|
||||
unsigned int len;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -402,12 +363,9 @@ OCerror
|
||||
oc_inq_ith(OCconnection conn,
|
||||
OCobject node0, unsigned int index, OCobject* subnodeidp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCobject subnodeid = OCNULL;
|
||||
unsigned int nsubnodes;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -425,11 +383,8 @@ oc_inq_ith(OCconnection conn,
|
||||
OCerror
|
||||
oc_inq_dimset(OCconnection conn, OCobject node0, OCobject** dimids)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCobject* dims = NULL;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -450,11 +405,8 @@ oc_inq_dimset(OCconnection conn, OCobject node0, OCobject** dimids)
|
||||
OCerror
|
||||
oc_inq_ithdim(OCconnection conn, OCobject node0, unsigned int index, OCobject* dimidp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCobject dimid = OCNULL;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -469,10 +421,7 @@ oc_inq_ithdim(OCconnection conn, OCobject node0, unsigned int index, OCobject* d
|
||||
OCerror
|
||||
oc_inq_dim(OCconnection conn, OCobject node0, size_t* sizep, char** namep)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* dim;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,dim,node0);
|
||||
OCDEREF(OCnode*,dim,node0);
|
||||
|
||||
@ -490,12 +439,9 @@ oc_inq_attrstrings(OCconnection conn, OCobject node0, unsigned int i,
|
||||
char** namep, OCtype* octypep,
|
||||
unsigned int* nvaluesp, char*** stringsp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCattribute* attr;
|
||||
unsigned int nattrs;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -523,12 +469,9 @@ OCerror
|
||||
oc_inq_attr(OCconnection conn, OCobject node0, unsigned int i,
|
||||
char** namep, OCtype* octypep, unsigned int* nvaluesp, void** valuesp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* node;
|
||||
OCattribute* attr;
|
||||
unsigned int nattrs;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,node,node0);
|
||||
OCDEREF(OCnode*,node,node0);
|
||||
|
||||
@ -563,10 +506,7 @@ OCerror
|
||||
oc_inq_dasattr_nvalues(OCconnection conn, OCobject node0,
|
||||
unsigned int* nvaluesp)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* attr;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,attr,node0);
|
||||
OCDEREF(OCnode*,attr,node0);
|
||||
if(attr->octype != OC_Attribute) return OC_EINVAL;
|
||||
@ -578,11 +518,8 @@ OCerror
|
||||
oc_inq_dasattr(OCconnection conn, OCobject node0, unsigned int i,
|
||||
OCtype* primtypep, char** valuep)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* attr;
|
||||
unsigned int nvalues;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,attr,node0);
|
||||
OCDEREF(OCnode*,attr,node0);
|
||||
|
||||
@ -754,11 +691,8 @@ oc_data_count(OCconnection conn, OCdata content0, size_t* sizep)
|
||||
OCerror
|
||||
oc_data_index(OCconnection conn, OCdata content0, size_t* sizep)
|
||||
{
|
||||
OCstate* state;
|
||||
OCcontent* current;
|
||||
OCerror ocerr = OC_NOERR;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCcontent*,current,content0);
|
||||
OCDEREF(OCcontent*,current,content0);
|
||||
|
||||
@ -769,11 +703,8 @@ oc_data_index(OCconnection conn, OCdata content0, size_t* sizep)
|
||||
OCerror
|
||||
oc_data_object(OCconnection conn, OCdata content0, OCobject* op)
|
||||
{
|
||||
OCstate* state;
|
||||
OCcontent* current;
|
||||
OCerror ocerr = OC_NOERR;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCcontent*,current,content0);
|
||||
OCDEREF(OCcontent*,current,content0);
|
||||
|
||||
@ -784,11 +715,8 @@ oc_data_object(OCconnection conn, OCdata content0, OCobject* op)
|
||||
OCerror
|
||||
oc_data_mode(OCconnection conn, OCdata content0, OCmode* modep)
|
||||
{
|
||||
OCstate* state;
|
||||
OCcontent* current;
|
||||
OCerror ocerr = OC_NOERR;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCcontent*,current,content0);
|
||||
OCDEREF(OCcontent*,current,content0);
|
||||
|
||||
@ -1008,11 +936,8 @@ oc_svcerrordata(OCconnection conn, char** codep,
|
||||
OCerror
|
||||
oc_raw_xdrsize(OCconnection conn, OCobject root0, size_t* sizep)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* root;
|
||||
OCerror ocerr = OC_NOERR;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,root,root0);
|
||||
OCDEREF(OCnode*,root,root0);
|
||||
|
||||
@ -1047,11 +972,8 @@ oc_get_lastmodified_data(OCconnection conn)
|
||||
int
|
||||
oc_dumpnode(OCconnection conn, OCobject root0)
|
||||
{
|
||||
OCstate* state;
|
||||
OCnode* root;
|
||||
OCerror ocerr = OC_NOERR;
|
||||
OCVERIFY(OCstate*,state,conn);
|
||||
OCDEREF(OCstate*,state,conn);
|
||||
OCVERIFY(OCnode*,root,root0);
|
||||
OCDEREF(OCnode*,root,root0);
|
||||
ocdumpnode(root);
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
See the COPYRIGHT file for more information. */
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
@ -73,12 +73,11 @@ static int
|
||||
occompile1(OCstate* state, OCnode* xnode, OCmemdata** memdatap, XDR* xdrs)
|
||||
{
|
||||
unsigned int i,j,xdrcount;
|
||||
int stat = OC_NOERR;
|
||||
OCerror ocstat = OC_NOERR;
|
||||
size_t nelements;
|
||||
OCmemdata* memdata = NULL;
|
||||
OCmemdata* structdata = NULL;
|
||||
OClist* records = NULL;
|
||||
OCerror ocstat = OC_NOERR;
|
||||
OCmemdata** pmem = NULL;
|
||||
|
||||
|
||||
@ -100,9 +99,9 @@ occompile1(OCstate* state, OCnode* xnode, OCmemdata** memdatap, XDR* xdrs)
|
||||
memdata->mode = Dimmode;
|
||||
pmem = (OCmemdata**)&memdata->data;
|
||||
/* Consume the leading count field */
|
||||
if(!xdr_u_int(xdrs,&xdrcount)) {stat = OC_EXDR; goto fail;}
|
||||
if(!xdr_u_int(xdrs,&xdrcount)) {ocstat = OC_EXDR; goto fail;}
|
||||
/* validate the datadds dimensions */
|
||||
if(xdrcount != nelements) {stat=OC_EINVALCOORDS; goto fail;}
|
||||
if(xdrcount != nelements) {ocstat=OC_EINVALCOORDS; goto fail;}
|
||||
for(i=0;i<nelements;i++) {
|
||||
ocstat = occompilefields(state,xnode,&structdata,xdrs);
|
||||
if(ocstat != OC_NOERR) {
|
||||
@ -127,7 +126,7 @@ occompile1(OCstate* state, OCnode* xnode, OCmemdata** memdatap, XDR* xdrs)
|
||||
/* pick up the sequence record begin marker*/
|
||||
char tmp[sizeof(unsigned int)];
|
||||
/* extract the tag byte*/
|
||||
if(!xdr_opaque(xdrs,tmp,sizeof(tmp))) {stat = OC_EXDR; goto fail;}
|
||||
if(!xdr_opaque(xdrs,tmp,sizeof(tmp))) {ocstat = OC_EXDR; goto fail;}
|
||||
if(tmp[0] == StartOfoclist) { /* Walk each member field*/
|
||||
ocstat = occompilefields(state,xnode,&structdata,xdrs);
|
||||
if(ocstat != OC_NOERR) goto fail;
|
||||
@ -137,7 +136,7 @@ occompile1(OCstate* state, OCnode* xnode, OCmemdata** memdatap, XDR* xdrs)
|
||||
break; /* we are done with the this sequence instance*/
|
||||
} else {
|
||||
oc_log(LOGERR,"missing/invalid begin/end record marker\n");
|
||||
stat = OC_EINVALCOORDS;
|
||||
ocstat = OC_EINVALCOORDS;
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
@ -389,7 +389,7 @@ errorstring(XDR* xdrs)
|
||||
pos = xdr_getpos(xdrs);
|
||||
memset(s,0,sizeof(s));
|
||||
/* Do this a byte at a time, since we do not know how much is left */
|
||||
for(i=0;i<4096;i++) {
|
||||
for(i=0;i<size;i++) {
|
||||
if(!xdr_getbytes(xdrs,s+i,1)) break;
|
||||
}
|
||||
/* check for error tag at front */
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
#ifndef OCOCDBG_H
|
||||
#define OCOCDBG_H
|
||||
|
||||
#undef OCDEBUG
|
||||
|
||||
#include <stdarg.h>
|
||||
#include "ocdump.h"
|
||||
|
||||
#undef OCDEBUG
|
||||
|
||||
/* OCCATCHERROR is used to detect errors as close
|
||||
to their point of origin as possible. When
|
||||
enabled, one can set a breakpoint in ocbreakpoint()
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
See the COPYRIGHT file for more information. */
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
See the COPYRIGHT file for more information. */
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "ocinternal.h"
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
@ -81,7 +81,6 @@ ocuriparse(const char* uri0, OCURI** ocurip)
|
||||
char* user = NULL;
|
||||
char* pwd = NULL;
|
||||
char* file = NULL;
|
||||
char* stop;
|
||||
|
||||
if(uri0 == NULL)
|
||||
return OC_EBADURL;
|
||||
@ -98,7 +97,6 @@ ocuriparse(const char* uri0, OCURI** ocurip)
|
||||
while((c=*p1++)) {if(c != ' ' && c != '\t') *p++ = c;}
|
||||
|
||||
p = uri;
|
||||
stop = p + strlen(p);
|
||||
|
||||
/* break up the uri string into pieces*/
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user