Commit Graph

6545 Commits

Author SHA1 Message Date
Ward Fisher
e69432704a Corrected cmake error on OSX in plugins compilation. 2019-02-15 16:07:22 -07:00
Ward Fisher
0098f4c9f1 Merge branch 'master' into v4.6.2.1-dev.wif 2019-02-15 15:46:14 -07:00
Ward Fisher
05dadede2b
Merge pull request #1321 from Unidata/dap4endianfix2.dmh
Fix additional big-endian machine error in dap4.
2019-02-15 15:45:48 -07:00
Ward Fisher
c75794b40a Updated Release notes for impending v4.6.2.1 release. 2019-02-15 15:31:24 -07:00
Ward Fisher
53ba2ff316
Merge pull request #1311 from Unidata/filterexpr.dmh
Extend nccopy -F option syntax.
2019-02-15 15:16:25 -07:00
Ward Fisher
1efe8333ac
Merge pull request #1308 from NetCDF-World-Domination-Council/ejh_more_rename_woes_3
Fix bug which changed varids after var rename
2019-02-15 15:16:04 -07:00
Ward Fisher
802209dcfe
Merge pull request #1318 from Unidata/rename-aggregation.wif
Combination of the remaining rename-related PR's
2019-02-15 15:15:46 -07:00
Ward Fisher
0092599cc7
Merge pull request #1319 from Unidata/dap2groups.dmh
Fix handling of '/' characters in names in DAP2.
2019-02-15 15:15:26 -07:00
Dennis Heimbigner
ddd324c1f0 Fix LGTM complaint 2019-02-15 12:40:30 -07:00
Dennis Heimbigner
d13619b3e1 Fix additional big-endian machine error in dap4.
Follow on to PR: https://github.com/Unidata/netcdf-c/pull/1302
2019-02-15 11:36:29 -07:00
Dennis Heimbigner
c59d5ce205 Fix handling of '/' characters in names in DAP2.
re: https://github.com/Unidata/thredds/issues/1224
[note that this is an issue in thredds, but the fix is in netcdf-c]

A thredds server can encode a netcdf-4 file into DAP2
by flattening names to include the containing group path,
where the group names are separated by '/'.

But the '/' is prohibited in netcdf names even if escaped
(a decision before my time).

So, if the netcdf-c/libdap2 code encounters a DAP2 name with '/'
characters, the '/' characters are converted to the string
%2f. Unfortunately, there is a glitch, namely that converting
the leading '/' produces a name that is still illegal. This PR
modifies the code to just drop the leading '/' character.
2019-02-14 20:25:40 -07:00
Ed Hartnett
c61afffae3
Merge branch 'master' into ejh_more_rename_woes_3 2019-02-14 14:07:33 -07:00
Ward Fisher
30c2ca2413
Merge pull request #1312 from Unidata/urlauth.dmh
URL with username+pwd in url is not working.
2019-02-14 13:27:20 -07:00
Dennis Heimbigner
24510f2ffb Forgot to distribute ncmodel.h 2019-02-13 21:46:01 -07:00
Dennis Heimbigner
f19cac7d59 Merge branch 'master' into byterange.dmh 2019-02-13 21:35:36 -07:00
Ward Fisher
acbc4a2e41
Merge branch 'master' into filterexpr.dmh 2019-02-13 16:55:21 -07:00
Ward Fisher
df03fd3240 Merge branch 'ejh_more_rename_woes_3' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into rename-aggregation.wif 2019-02-13 16:37:50 -07:00
Ward Fisher
e9aeafe0fd
Merge branch 'master' into ejh_more_rename_woes_3 2019-02-13 16:37:28 -07:00
Ward Fisher
4a06f24813
Merge branch 'master' into ejh_more_rename_woes_2 2019-02-13 16:35:54 -07:00
Ward Fisher
6c3b7a0077
Merge branch 'master' into urlauth.dmh 2019-02-13 16:32:38 -07:00
Ward Fisher
29d2643f8e
Merge pull request #1317 from Unidata/fillhack.dmh
Add hack to deal with DAP2 signed byte conversion.
2019-02-13 16:07:19 -07:00
Dennis Heimbigner
a1f080db19
Merge branch 'master' into byterange.dmh 2019-02-13 14:45:53 -07:00
Dennis Heimbigner
724128ad3b Add hack to deal with DAP2 signed byte hack.
re: issue https://github.com/Unidata/netcdf-c/issues/1316

The DAP2 data model does not have a signed byte type,
but netcdf-3 does have (only) a signed byte type.
So, when converting a netcdf-3 signed byte typed variable to
a DAP2 unsigned byte, the following actions are taken by thredds:
1. The variable type is marked as DAP2 (unsigned) byte.
2. A special attribute, "_Unsigned=false" is set for the variable
3. The corresponding "_FillValue" attribute, if any, is up-converted
   to the DAP2 Int16 type in order to hold, with sign, any signed byte
   fill value.

On the netcdf-c side, this looks like a fillvalue type mismatch and causes
an error. Instead, the netcdf-c dap2 conversion code needs to recognize
this hack and undo it locally.

So this change looks for the above case, and if found, then it properly
converts the _FillValue type to netcdf-3 signed byte.

Since DAP2 supports both signed and unsigned integers of sizes 16 and 32 bits,
this should be the only hack needed (famous last words).

It may later be desirable for the thredds DAP2 converter to modify its
behavior as well.
2019-02-13 14:36:14 -07:00
Ed Hartnett
f937ed7b25
Merge branch 'master' into ejh_more_rename_woes_2 2019-02-12 15:05:34 -07:00
Ward Fisher
e32e0b1eb2
Merge branch 'master' into filterexpr.dmh 2019-02-12 09:48:03 -07:00
Ward Fisher
ec06e9d4c9
Merge branch 'master' into ejh_more_rename_woes_3 2019-02-12 09:47:34 -07:00
Ward Fisher
bbe19501d1
Merge pull request #1314 from simonholgate/fix_tst_cdf5format_for_loop
Added int i and j declarations
2019-02-12 09:41:05 -07:00
Simon Holgate
6834f4155c Added int i and j declarations 2019-02-12 15:10:39 +00:00
Ed Hartnett
909402ccd6
Merge branch 'master' into ejh_more_rename_woes_3 2019-02-12 05:49:04 -07:00
Ed Hartnett
1c22629201
Merge branch 'master' into ejh_more_rename_woes_2 2019-02-12 05:48:45 -07:00
Ward Fisher
56f94893ec
Merge pull request #1302 from Unidata/bigend.dmh
Fix errors when building on big-endian machine
2019-02-11 16:38:55 -07:00
Dennis Heimbigner
5f0fdd7e5d Update Makefile.am to use ref_ filter files 2019-02-11 16:07:03 -07:00
Ward Fisher
adf4a48a29 Corrected a doxygen warning in the DAP4 documentation. 2019-02-11 13:29:40 -07:00
Ward Fisher
40f2f5e949 Updated link to reflect newer netCDF-Fortran documentation location. 2019-02-11 13:28:34 -07:00
Ward Fisher
70bd755548 Fixed typo. 2019-02-11 13:06:41 -07:00
Ward Fisher
ebf507233c Updated link to new fortran documentation. 2019-02-11 13:03:07 -07:00
Dennis Heimbigner
8d59f4ebb8 Add missing updates from bigend.tmp 2019-02-10 14:00:40 -07:00
Dennis Heimbigner
e932655888 Renamed the baseline files for tst_filter.sh 2019-02-09 15:14:13 -07:00
Dennis Heimbigner
4cd440dd96 URL with username+pwd in url is not working.
re: esupport (DVK-211460)

Turns out it was a typo in libdispatch/dauth.c
Fix is to Change:
HTTP.USERNAME -> HTTP.CREDENTIALS.USERNAME
and
HTTP.PASSWORD-> HTTP.CREDENTIALS.PASSWORD
2019-02-09 15:06:03 -07:00
Dennis Heimbigner
a6b04c0c66 Extend nccopy -F option syntax.
A user suggested that the nccopy -F option
syntax should be extended to support specification
of multiple (or all) variables in a single -F option.

The new syntax allows:

1. '*' as the name of the variable; this means apply the
   filter to all variables in the data set.
2. *var1|var2|...* as the variable name to indicate that the filter
   should be applied to the multiple specified variables.
2019-02-08 18:48:17 -07:00
Ward Fisher
4c6d56abc0
Merge branch 'master' into ejh_more_rename_woes_3 2019-02-07 14:28:46 -07:00
Ward Fisher
1d56285145
Merge branch 'master' into ejh_more_rename_woes_2 2019-02-07 14:28:43 -07:00
Ward Fisher
3a14251dd9
Merge branch 'master' into bigend.dmh 2019-02-07 14:28:39 -07:00
Ward Fisher
1fde39c8d7
Merge branch 'master' into byterange.dmh 2019-02-07 14:28:23 -07:00
Ward Fisher
a260bbbf76
Merge pull request #1309 from Unidata/pr-aggregation.wif
Rinse and Repeat: PR Edition
2019-02-07 14:27:17 -07:00
Ward Fisher
6511599a6d Corrected issue in support of https://github.com/Unidata/netcdf-c/issues/1310 2019-02-07 12:43:07 -07:00
Ward Fisher
035b3030ef Merge branch 'ejh_rename_var_to_non_coord_var' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2019-02-06 14:09:48 -07:00
Ward Fisher
ecc11ed29d Merge remote-tracking branch 'origin/gh1295.wif' into pr-aggregation.wif 2019-02-06 14:09:00 -07:00
Ward Fisher
9aae0351ac Merge branch 'ejh_rename_bug' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2019-02-06 14:08:41 -07:00
Ward Fisher
2c335466bd Merge branch 'ejh_not_read_rename_2' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2019-02-06 14:08:06 -07:00