Skip to content

Commit

Permalink
Issue with fixed length strings, raised in #25 (#26)
Browse files Browse the repository at this point in the history
* Building hdf5 from source

* initial pass at new setup for hdf5

* addition of install.bat, test.q and restructure

* update to directory structure

* binary now hdf5 rather than libhdf5

* update to build location

* dll in bin for hdf5

* use of path only

* check for dll in Release, reintro of LD_LIBRARY_PATH

* change to win build

* change to travis_setup

* revert

* addition of include

* Update hdf5.q

* Update CMakeLists.txt

* Rearranged paths

* Update hdf5.q

* Update hdf5.q

* disable windows build

* restart of testing windows

* change to setup

* reordering

* change to build install dir

* test

* revert to initial travis_setup example

* revert to allow linux tests to pass

* revert to allow incorrect building and testing of windows

* removal of 2nd mkdir cmake

* revert to previous working version

* removal of double mkdir

* test

* certificate check turned off

* Change shared object to kdbhdf5

* Force windows to libkdbhdf5.dll so hdf5.q can find it on all OS

* addition of slack test

* addition of secure test

* trigger secure build

* removal of on pull request

* kxsystems_travis

* update to README and install script

* change to indenting

* fixed length string reads initialising at 1 rather than 0

* update to read for fixed length compound strings

Co-authored-by: nmcdonnell-kx <[email protected]>
  • Loading branch information
cmccarthy1 and nmcdonnell-kx authored Jun 15, 2020
1 parent f9d4472 commit 9cc197b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/hdf5_read.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ K readDataSimpleString(hid_t dset, hsize_t npoints, hid_t ntype, hid_t space, re
H5Tset_size(stype, sz);
fdata = (char *)calloc(npoints * sz, sizeof(char));
readfunc(dset, stype, H5S_ALL, H5S_ALL, H5P_DEFAULT, fdata);
for(i = 1; i < npoints; ++i)
for(i = 0; i < npoints; ++i)
jk(&result, kp(fdata + i * sz));
free(fdata);
}
Expand Down Expand Up @@ -209,7 +209,7 @@ K readDataCompoundString(hid_t dset, char* mname, hsize_t npoints, hid_t mtype,
H5Tinsert(memtype, mname, 0, stype);
fdata = (char *)calloc(npoints * sz, sizeof(char));
readfunc(dset, memtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, fdata);
for(i = 1; i < npoints; ++i)
for(i = 0; i < npoints; ++i)
jk(&result, kp(fdata + i * sz));
free(fdata);
}
Expand Down

0 comments on commit 9cc197b

Please sign in to comment.