Commit Graph

6283 Commits

Author SHA1 Message Date
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
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
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
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
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
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
8d59f4ebb8 Add missing updates from bigend.tmp 2019-02-10 14:00:40 -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
Ward Fisher
3a14251dd9
Merge branch 'master' into bigend.dmh 2019-02-07 14:28:39 -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
Ward Fisher
67086ccd66 Merge branch 'fix-warnings' of https://github.com/mathstuf/netcdf-c into pr-aggregation.wif 2019-02-06 14:07:29 -07:00
Ward Fisher
5fca0edf73 Move away from deprecated PackageManager to the productbuild generator. 2019-02-05 13:08:30 -07:00
Ward Fisher
455bf13529 Some housekeeping. Next big push may be to clean up older files. 2019-02-05 12:57:27 -07:00
Dennis Heimbigner
8714066b18 Fix errors when building on big-endian machine
re: issue https://github.com/Unidata/netcdf-c/issues/1278
re: issue https://github.com/Unidata/netcdf-c/issues/876
re: issue https://github.com/Unidata/netcdf-c/issues/806

* Major change to the handling of 8-byte parameters for nc_def_var_filter.
  The old code was not well thought out.
  * The new algorithm is documented in docs/filters.md.
  * Added new utility file plugins/H5Zutil.c to support
  * Modified plugins/H5Zmisc.c to use new algorithm
  the new algorithm.
  * Renamed include/ncfilter.h to include/netcdf_filter.h
    and made it an installed header so clients can access the
    new algorithm utility.
  * Fixed nc_test4/tst_filterparser.c and nc_test4/test_filter_misc.c
    to use the new algorithm
* libdap4/ fixes:
  * d4swap.c has an error in the endian pre-processing such
    that record counts were not being swapped correctly.
  * d4data.c had an error in that checksums were being computed
    after endian swapping rather than before.
* ocinitialize() was never being called, so xxdr bigendian handling
  was never set correctly.
  * Required adding debug statements to occompile
* Found and fixed memory leak in ncdump.c

Not tested:
* HDF4
* Pnetcdf
* parallel HDF5
2019-01-31 21:13:06 -07:00
Ward Fisher
9ca942b201
Merge branch 'master' into fix-warnings 2019-01-31 12:39:06 -07:00
Ed Hartnett
9cde4f0185
Merge branch 'master' into ejh_rename_bug 2019-01-30 12:17:37 -07:00
Ed Hartnett
f0ec05c434
Merge branch 'master' into ejh_not_read_rename_2 2019-01-30 12:17:17 -07:00
Ward Fisher
299b215862
Merge branch 'master' into ejh_rename_var_to_non_coord_var 2019-01-30 11:08:58 -07:00
Ward Fisher
79e8089b54
Merge branch 'master' into gh1295.wif 2019-01-30 11:08:47 -07:00
Ward Fisher
69c4ed60c0
Merge pull request #1301 from Unidata/zerodim.dmh
When doing prefetch in DAP2, ignore invisible variables.
2019-01-30 11:08:26 -07:00
Ward Fisher
12724837b0 Fixed a typo. 2019-01-30 10:34:51 -07:00
Ward Fisher
df5a146432 Added test in support of https://github.com/Unidata/netcdf-c/issues/1300 and https://github.com/Unidata/netcdf-c/issues/1301 2019-01-29 15:23:03 -07:00
Dennis Heimbigner
54656b4a16 When doing prefetch in DAP2, ignore invisible variables.
re: Issue https://github.com/Unidata/netcdf-c/issues/1300

Add a check for invisible variables.
2019-01-29 13:43:02 -07:00
Ed Hartnett
fcae21bb9e more testing 2019-01-27 11:48:28 -07:00
Ed Hartnett
b3796633e7 more testing 2019-01-27 11:40:18 -07:00
Ed Hartnett
e859be9a1d more testing 2019-01-27 11:38:39 -07:00
Ed Hartnett
828304ed41 now using secret hdf5 var name during renames if needed 2019-01-27 11:33:06 -07:00
Ed Hartnett
1b3f397c4c added name parameter to give_var_secret_name to base secret name on 2019-01-27 11:29:49 -07:00
Ed Hartnett
784dc0e0ad now creating secret hdf5 name on var rename, if needed 2019-01-27 11:17:57 -07:00
Ed Hartnett
660bda1be3 made function give_var_secret_name() static again 2019-01-27 11:14:29 -07:00
Ed Hartnett
e74ec6f2a0 made function give_var_secret_name() not static, fixed warning 2019-01-27 11:10:41 -07:00
Ed Hartnett
c95887cc53 removed name param from function give_var_secret_name() 2019-01-27 11:07:57 -07:00
Ed Hartnett
627a55cf78 added function give_var_secret_name() 2019-01-27 11:06:02 -07:00
Ed Hartnett
42c64598dc created function create_dim_wo_var() 2019-01-27 10:51:25 -07:00
Ward Fisher
766d2acfc3 Update CmakeLists.txt in support of https://github.com/Unidata/netcdf-c/issues/1295 2019-01-25 11:26:26 -07:00
Ed Hartnett
a89f9ddeb9
Merge branch 'master' into ejh_rename_bug 2019-01-25 07:05:13 -07:00
Ed Hartnett
b2bd90373a
Merge branch 'master' into ejh_not_read_rename_2 2019-01-25 07:03:59 -07:00
Ward Fisher
9b073894fe
Merge pull request #1293 from Unidata/pr-aggregation.wif
Y.A.A. (Yet Another Another Aggregation)
2019-01-24 16:41:11 -07:00
Ed Hartnett
66cc9c5020 fixed rename bug 2019-01-24 10:20:46 -07:00
Ed Hartnett
713804ea03 added rename test to tst_rename2.c which fails :-( 2019-01-24 10:01:46 -07:00
Ward Fisher
688c06d50c
Merge branch 'master' into fix-warnings 2019-01-23 15:12:20 -07:00
Ward Fisher
237f0c6e65 Merge branch 'ejh_tidy' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation.wif 2019-01-23 15:11:59 -07:00
Ward Fisher
591b1fd131 Merge branch 'bugfix/debian-stable-default-compilation' of https://github.com/t-b/netcdf-c into pr-aggregation.wif 2019-01-23 15:10:15 -07:00