mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed escape handling for names

Browse Source
This commit is contained in:
Dennis Heimbigner 2011-05-27 18:57:35 +00:00
parent 85b6000df1
commit 3df9918cbc
20 changed files with 132 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cf
View File

@ -1,7 +1,7 @@
#!/bin/bash
#X="-x"
#HDF5=1
HDF5=1
DAP=1
#CDMR=1

4
libdap2/env
View File

@ -1,8 +1,10 @@
PARMS=""; ARGS=""; CON="" ; CE=""; OCON=""
PARMS="[log]"
F="http://motherlode.ucar.edu:9080/thredds/dodsC/fmrc/NCEP/GFS/Alaska_191km/NCEP-GFS-Alaska_191km_fmrc.ncx"
F="[cache][netcdf4]http://oceanwatch.pfeg.noaa.gov/opendap/GLOBEC/GLOBEC_cetaceans"
CON="number&number>6"
if test 1 = 0; then
F="http://motherlode.ucar.edu:9080/thredds/dodsC/fmrc/NCEP/GFS/Alaska_191km/NCEP-GFS-Alaska_191km_fmrc.ncx"
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"

2
libdispatch/nc_uri.c
View File

@ -417,7 +417,7 @@ nc_uridecodeparams(NC_URI* nc_uri)
plist[2*i+1] = strdup(vp);
cp = next;
}
plist[nparams] = NULL;
plist[2*nparams] = NULL;
free(params);
if(nc_uri->paramlist != NULL)
nc_paramfree(nc_uri->paramlist);

20
ncdap_test/expected3/1990-S1700101.HDF.WVC_Lat.dmp
View File

@ -3,15 +3,15 @@ dimensions:
WVC = 24 ;
row = 558 ;
variables:
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 ;
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 ;
// global attributes:
:Producer_Agency = "NASA" ;
@ -39,7 +39,7 @@ variables:
:Data_Format_Type = "HDF" ;
data:
NSCAT\ Rev\ 17.WVC_Lat =
NSCAT\%20Rev\%2017.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,

37
ncdap_test/expected3/test.PointFile.dmp
View File

@ -4,46 +4,47 @@ dimensions:
Sensor = 5 ;
maxStrlen64 = 64 ;
variables:
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) ;
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) ;
data:
Simple\ Point.LevelWritten.LevelWritten.LevelWritten__0 = 0, 1, 2, 3, 4 ;
Simple\%20Point.LevelWritten.LevelWritten.LevelWritten__0 = 0, 1, 2, 3, 4 ;
Simple\ Point.Data\ Vgroup.Sensor.Time.Time__0 = 1000, 998.750260394966,
Simple\%20Point.Data\%20Vgroup.Sensor.Time.Time__0 = 1000, 998.750260394966,
995.004165278026, 988.771077936042, 980.066577841242 ;
Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__0 =
Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__0 =
999.950000416665, 998.200539935204, 993.956097956697, 987.227283375627,
978.030914724148 ;
Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__1 =
Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__1 =
999.800006666578, 997.55100025328, 992.808635853866, 985.584766909561,
975.897449330605 ;
Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__2 =
Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__2 =
999.550033748988, 996.801706302619, 991.561893714788, 983.843692788121,
973.666395005375 ;
Simple\ Point.Data\ Vgroup.Sensor.Concentration.Concentration__3 =
Simple\%20Point.Data\%20Vgroup.Sensor.Concentration.Concentration__3 =
999.200106660978, 995.952733011994, 990.215996212637, 982.00423511727,
971.33797485203 ;
Simple\ Point.Data\ Vgroup.Sensor.Species.Species__0 =
Simple\%20Point.Data\%20Vgroup.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\ Point.LevelWritten.LevelWritten.LevelWritten__0 = 5, 6, 7, 8, 9 ;
FixedBuoy\%20Point.LevelWritten.LevelWritten.LevelWritten__0 = 5, 6, 7, 8, 9 ;
FloatBuoy\ Point.LevelWritten.LevelWritten.LevelWritten__0 = 10, 11, 12, 13, 14 ;
FloatBuoy\%20Point.LevelWritten.LevelWritten.LevelWritten__0 = 10, 11, 12,
13, 14 ;
}

18
ncdap_test/expected3/test.dfr1.dmp
View File

@ -1,16 +1,16 @@
netcdf test {
dimensions:
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 ;
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 ;
variables:
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) ;
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) ;
data:
Raster\ Image\ \#0 =
Raster\%20Image\%20\%230 =
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\ Image\ \#1 =
Raster\%20Image\%20\%231 =
0, 1, 2, 3, 4,
5, 6, 7, 8, 9,
10, 11, 12, 13, 14,

24
ncdap_test/expected3/test.dfr2.dmp
View File

@ -1,18 +1,18 @@
netcdf test {
dimensions:
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 ;
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 ;
variables:
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) ;
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) ;
data:
Raster\ Image\ \#0 =
Raster\%20Image\%20\%230 =
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\ Image\ \#1 =
Raster\%20Image\%20\%231 =
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\ Image\ \#2 =
Raster\%20Image\%20\%232 =
0, 1, 2, 3, 4,
5, 6, 7, 8, 9,
10, 11, 12, 13, 14,

10
ncdap_test/expected3/test.dfr3.dmp
View File

@ -1,13 +1,13 @@
netcdf test {
dimensions:
Raster\ Image\ \#0__X = 5 ;
Raster\ Image\ \#0__Y = 6 ;
Raster\ Image\ \#0__comps = 3 ;
Raster\%20Image\%20\%230__X = 5 ;
Raster\%20Image\%20\%230__Y = 6 ;
Raster\%20Image\%20\%230__comps = 3 ;
variables:
byte Raster\ Image\ \#0(Raster\ Image\ \#0__comps, Raster\ Image\ \#0__Y, Raster\ Image\ \#0__X) ;
byte Raster\%20Image\%20\%230(Raster\%20Image\%20\%230__comps, Raster\%20Image\%20\%230__Y, Raster\%20Image\%20\%230__X) ;
data:
Raster\ Image\ \#0 =
Raster\%20Image\%20\%230 =
0, 1, 2, 3, 4,
5, 6, 7, 8, 9,
10, 11, 12, 13, 14,

4
ncdap_test/expected3/test.sds6.dmp
View File

@ -10,7 +10,7 @@ dimensions:
fakeDim7 = 5 ;
variables:
int SDS_RLE(fakeDim0, fakeDim1) ;
int SDS_N-bit(fakeDim2, fakeDim3) ;
int SDS_N\%2dbit(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-bit =
SDS_N\%2dbit =
0, 2048, 4096, 6144, 8192,
10240, 12288, 14336, 16384, 18432,
20480, 22528, 24576, 26624, 28672,

4
ncdap_test/expected3/test.sds7.dmp
View File

@ -13,7 +13,7 @@ dimensions:
variables:
int SDS_None(fakeDim0, fakeDim1) ;
int SDS_RLE(fakeDim2, fakeDim3) ;
int SDS_N-bit(fakeDim4, fakeDim5) ;
int SDS_N\%2dbit(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-bit =
SDS_N\%2dbit =
0, 2048, 4096, 6144,
8192, 10240, 12288, 14336,
16384, 18432, 20480, 22528,

8
ncdap_test/expected4/1990-S1700101.HDF.WVC_Lat.dmp
View File

File diff suppressed because one or more lines are too long

58
ncdap_test/expected4/test.PointFile.dmp
View File

@ -1,12 +1,12 @@
netcdf test {
types:
compound Simple\ Point.LevelWritten.LevelWritten_t {
compound Simple\%20Point.LevelWritten.LevelWritten_t {
ubyte LevelWritten__0 ;
}; // Simple\ Point.LevelWritten.LevelWritten_t
compound Simple\ Point.LevelWritten_record_t {
Simple\ Point.LevelWritten.LevelWritten_t LevelWritten ;
}; // Simple\ Point.LevelWritten_record_t
Simple\ Point.LevelWritten_record_t(*) Simple\ Point.LevelWritten_t ;
}; // Simple\%20Point.LevelWritten.LevelWritten_t
compound Simple\%20Point.LevelWritten_record_t {
Simple\%20Point.LevelWritten.LevelWritten_t LevelWritten ;
}; // Simple\%20Point.LevelWritten_record_t
Simple\%20Point.LevelWritten_record_t(*) Simple\%20Point.LevelWritten_t ;
compound Time_t {
double Time__0 ;
}; // Time_t
@ -25,23 +25,23 @@ types:
Species_t Species ;
}; // Sensor_record_t
Sensor_record_t(*) Sensor_t ;
compound Data\ Vgroup_t {
compound Data\%20Vgroup_t {
Sensor_t Sensor ;
}; // Data\ Vgroup_t
compound Simple\ Point_t {
Simple\ Point.LevelWritten_t LevelWritten ;
Data\ Vgroup_t Data\ Vgroup ;
}; // Simple\ Point_t
compound FixedBuoy\ Point.LevelWritten.LevelWritten_t {
}; // Data\%20Vgroup_t
compound Simple\%20Point_t {
Simple\%20Point.LevelWritten_t LevelWritten ;
Data\%20Vgroup_t Data\%20Vgroup ;
}; // Simple\%20Point_t
compound FixedBuoy\%20Point.LevelWritten.LevelWritten_t {
ubyte LevelWritten__0 ;
}; // FixedBuoy\ Point.LevelWritten.LevelWritten_t
compound FixedBuoy\ Point.LevelWritten_record_t {
FixedBuoy\ Point.LevelWritten.LevelWritten_t LevelWritten ;
}; // FixedBuoy\ Point.LevelWritten_record_t
FixedBuoy\ Point.LevelWritten_record_t(*) FixedBuoy\ Point.LevelWritten_t ;
compound FixedBuoy\ Point_t {
FixedBuoy\ Point.LevelWritten_t LevelWritten ;
}; // FixedBuoy\ Point_t
}; // FixedBuoy\%20Point.LevelWritten.LevelWritten_t
compound FixedBuoy\%20Point.LevelWritten_record_t {
FixedBuoy\%20Point.LevelWritten.LevelWritten_t LevelWritten ;
}; // FixedBuoy\%20Point.LevelWritten_record_t
FixedBuoy\%20Point.LevelWritten_record_t(*) FixedBuoy\%20Point.LevelWritten_t ;
compound FixedBuoy\%20Point_t {
FixedBuoy\%20Point.LevelWritten_t LevelWritten ;
}; // FixedBuoy\%20Point_t
compound LevelWritten.LevelWritten_t {
ubyte LevelWritten__0 ;
}; // LevelWritten.LevelWritten_t
@ -49,19 +49,19 @@ types:
LevelWritten.LevelWritten_t LevelWritten ;
}; // LevelWritten_record_t
LevelWritten_record_t(*) LevelWritten_t ;
compound FloatBuoy\ Point_t {
compound FloatBuoy\%20Point_t {
LevelWritten_t LevelWritten ;
}; // FloatBuoy\ Point_t
}; // FloatBuoy\%20Point_t
variables:
Simple\ Point_t Simple\ Point ;
FixedBuoy\ Point_t FixedBuoy\ Point ;
FloatBuoy\ Point_t FloatBuoy\ Point ;
Simple\%20Point_t Simple\%20Point ;
FixedBuoy\%20Point_t FixedBuoy\%20Point ;
FloatBuoy\%20Point_t FloatBuoy\%20Point ;
data:
Simple\ Point =
Simple\%20Point =
{{{{0}}, {{1}}, {{2}}, {{3}}, {{4}}}, {{{{1000}, {999.950000416665, 999.800006666578, 999.550033748988, 999.200106660978}, {"This is a data test string (pass 0)."}}, {{998.750260394966}, {998.200539935204, 997.55100025328, 996.801706302619, 995.952733011994}, {"This is a data test string (pass 1)."}}, {{995.004165278026}, {993.956097956697, 992.808635853866, 991.561893714788, 990.215996212637}, {"This is a data test string (pass 2)."}}, {{988.771077936042}, {987.227283375627, 985.584766909561, 983.843692788121, 982.00423511727}, {"This is a data test string (pass 3)."}}, {{980.066577841242}, {978.030914724148, 975.897449330605, 973.666395005375, 971.33797485203}, {"This is a data test string (pass 4)."}}}}} ;
FixedBuoy\ Point = {{{{5}}, {{6}}, {{7}}, {{8}}, {{9}}}} ;
FixedBuoy\%20Point = {{{{5}}, {{6}}, {{7}}, {{8}}, {{9}}}} ;
FloatBuoy\ Point = {{{{10}}, {{11}}, {{12}}, {{13}}, {{14}}}} ;
FloatBuoy\%20Point = {{{{10}}, {{11}}, {{12}}, {{13}}, {{14}}}} ;
}

18
ncdap_test/expected4/test.dfr1.dmp
View File

@ -1,16 +1,16 @@
netcdf test {
dimensions:
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 ;
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 ;
variables:
ubyte Raster\ Image\ \#0(Raster\ Image\ \#0__Y, Raster\ Image\ \#0__X) ;
ubyte Raster\ Image\ \#1(Raster\ Image\ \#1__comps, Raster\ Image\ \#1__Y, Raster\ Image\ \#1__X) ;
ubyte Raster\%20Image\%20\%230(Raster\%20Image\%20\%230__Y, Raster\%20Image\%20\%230__X) ;
ubyte Raster\%20Image\%20\%231(Raster\%20Image\%20\%231__comps, Raster\%20Image\%20\%231__Y, Raster\%20Image\%20\%231__X) ;
data:
Raster\ Image\ \#0 =
Raster\%20Image\%20\%230 =
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\ Image\ \#1 =
Raster\%20Image\%20\%231 =
0, 1, 2, 3, 4,
5, 6, 7, 8, 9,
10, 11, 12, 13, 14,

24
ncdap_test/expected4/test.dfr2.dmp
View File

@ -1,18 +1,18 @@
netcdf test {
dimensions:
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 ;
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 ;
variables:
ubyte Raster\ Image\ \#0(Raster\ Image\ \#0__Y, Raster\ Image\ \#0__X) ;
ubyte Raster\ Image\ \#1(Raster\ Image\ \#1__Y, Raster\ Image\ \#1__X) ;
ubyte Raster\ Image\ \#2(Raster\ Image\ \#2__Y, Raster\ Image\ \#2__X) ;
ubyte Raster\%20Image\%20\%230(Raster\%20Image\%20\%230__Y, Raster\%20Image\%20\%230__X) ;
ubyte Raster\%20Image\%20\%231(Raster\%20Image\%20\%231__Y, Raster\%20Image\%20\%231__X) ;
ubyte Raster\%20Image\%20\%232(Raster\%20Image\%20\%232__Y, Raster\%20Image\%20\%232__X) ;
data:
Raster\ Image\ \#0 =
Raster\%20Image\%20\%230 =
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\ Image\ \#1 =
Raster\%20Image\%20\%231 =
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\ Image\ \#2 =
Raster\%20Image\%20\%232 =
0, 1, 2, 3, 4,
5, 6, 7, 8, 9,
10, 11, 12, 13, 14,

10
ncdap_test/expected4/test.dfr3.dmp
View File

@ -1,13 +1,13 @@
netcdf test {
dimensions:
Raster\ Image\ \#0__X = 5 ;
Raster\ Image\ \#0__Y = 6 ;
Raster\ Image\ \#0__comps = 3 ;
Raster\%20Image\%20\%230__X = 5 ;
Raster\%20Image\%20\%230__Y = 6 ;
Raster\%20Image\%20\%230__comps = 3 ;
variables:
ubyte Raster\ Image\ \#0(Raster\ Image\ \#0__comps, Raster\ Image\ \#0__Y, Raster\ Image\ \#0__X) ;
ubyte Raster\%20Image\%20\%230(Raster\%20Image\%20\%230__comps, Raster\%20Image\%20\%230__Y, Raster\%20Image\%20\%230__X) ;
data:
Raster\ Image\ \#0 =
Raster\%20Image\%20\%230 =
0, 1, 2, 3, 4,
5, 6, 7, 8, 9,
10, 11, 12, 13, 14,

4
ncdap_test/expected4/test.sds6.dmp
View File

@ -10,7 +10,7 @@ dimensions:
fakeDim7 = 5 ;
variables:
int SDS_RLE(fakeDim0, fakeDim1) ;
int SDS_N-bit(fakeDim2, fakeDim3) ;
int SDS_N\%2dbit(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-bit =
SDS_N\%2dbit =
0, 2048, 4096, 6144, 8192,
10240, 12288, 14336, 16384, 18432,
20480, 22528, 24576, 26624, 28672,

4
ncdap_test/expected4/test.sds7.dmp
View File

@ -13,7 +13,7 @@ dimensions:
variables:
int SDS_None(fakeDim0, fakeDim1) ;
int SDS_RLE(fakeDim2, fakeDim3) ;
int SDS_N-bit(fakeDim4, fakeDim5) ;
int SDS_N\%2dbit(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-bit =
SDS_N\%2dbit =
0, 2048, 4096, 6144,
8192, 10240, 12288, 14336,
16384, 18432, 20480, 22528,

3
oc/daplex.c
View File

@ -171,6 +171,7 @@ daplex(YYSTYPE* lvalp, DAPparsestate* state)
if(c == '%' && p[1] != 0 && p[2] != 0
&& strchr(hexdigits,p[1]) != NULL
&& strchr(hexdigits,p[2]) != NULL) {
#ifdef WRONG /* Should not unescape %xx occurrences */
int d1,d2;
d1 = tohex(p[1]);
d2 = tohex(p[2]);
@ -178,12 +179,12 @@ daplex(YYSTYPE* lvalp, DAPparsestate* state)
c=(((unsigned int)d1)<<4) | (unsigned int)d2;
p+=2;
}
#endif
} else {
if(strchr(lexstate->wordcharsn,c) == NULL) {p--; break;}
}
dapaddyytext(lexstate,c);
#else
if(strchr(lexstate->wordcharsn,c) == NULL) {p--; break;}
dapaddyytext(lexstate,c);
#endif

3
oc/dapparse.c
View File

@ -439,7 +439,8 @@ DAPparse(OCstate* conn, OCtree* tree, char* parsestring)
conn->error.message = nulldup(state->message);
tree->root = NULL;
/* Attempt to further decipher the error code */
if(strcmp(state->code,"404") == 0)
if(strcmp(state->code,"404") == 0 /* tds returns 404 */
|| strcmp(state->code,"5") == 0) /* hyrax returns 5 */
ocerr = OC_ENOFILE;
else
ocerr = OC_EDAPSVC;

2
oc/ocuri.c
View File

@ -417,7 +417,7 @@ ocuridecodeparams(OCURI* ocuri)
plist[2*i+1] = strdup(vp);
cp = next;
}
plist[nparams] = NULL;
plist[2*nparams] = NULL;
free(params);
if(ocuri->paramlist != NULL)
ocparamfree(ocuri->paramlist);