fixDataTypeErrors: fix String Matlab crash

Author: mpsonntag

+nix/DataArray.m

@@ -94,6 +94,6 @@ function write_all(obj, data)  % TODO add (optional) offset
            tmp = permute(data, length(size(data)):-1:1);
            nix_mx('DataArray::writeAll', obj.nix_handle, tmp);
         end;
-        
+
     end;
 end

src/nixdataarray.cc

@@ -42,30 +42,29 @@ namespace nixdataarray {
 
     void read_all(const extractor &input, infusor &output)
     {
-        //nix::DataArray da = input.entity<nix::DataArray>(1);
-        mexPrintf("[PURGE_ME] DA.cc read_all 01\n");
         nix::DataArray da = input.entity<nix::DataArray>(1);
-        mexPrintf("[PURGE_ME] DA.cc read_all 02\n");
         mxArray *data = make_mx_array_from_ds(da);
-        mexPrintf("[PURGE_ME] DA.cc read_all 03\n");
         output.set(0, data);
     }
 
     void write_all(const extractor &input, infusor &output)
     {
-        mexPrintf("[PURGE_ME] DA.cc write_all 01\n");
         nix::DataArray da = input.entity<nix::DataArray>(1);
-        mexPrintf("[PURGE_ME] DA.cc write_all 02\n");
         nix::DataType dtype = input.dtype(2);
-        mexPrintf("[PURGE_ME] DA.cc write_all 03\n");
+
         nix::NDSize count = input.ndsize(2);
-        mexPrintf("[PURGE_ME] DA.cc write_all 04\n");
         nix::NDSize offset(0);
-        mexPrintf("[PURGE_ME] DA.cc write_all 05\n");
         double *ptr = input.get_raw(2);
-        mexPrintf("[PURGE_ME] DA.cc write_all 06\n");
-        da.setData(dtype, ptr, count, offset);
-        mexPrintf("[PURGE_ME] DA.cc write_all 07\n");
+        
+        if (dtype == nix::DataType::String)
+        {
+            //da.setData(ptr);
+            throw std::domain_error("Writing strings is not supported as of yet.");
+        }
+        else
+        {
+            da.setData(dtype, ptr, count, offset);
+        }
     }
 
     void delete_dimension(const extractor &input, infusor &output) {
@@ -77,4 +76,4 @@ namespace nixdataarray {
         output.set(0, res);
     }
 
-} // namespace nixdataarray
+} // namespace nixdataarray

src/utils/mkarray.cc

@@ -3,13 +3,9 @@
 #include <nix.hpp>
 
 mxArray* make_mx_array_from_ds(const nix::DataSet &da) {
-    mexPrintf("[PURGE_ME] mkArray.cc 01\n");
     nix::NDSize size = da.dataExtent();
-    mexPrintf("[PURGE_ME] mkArray.cc 02\n");
     const size_t len = size.size();
-    mexPrintf("[PURGE_ME] mkArray.cc 03\n");
     std::vector<mwSize> dims(len);
-    mexPrintf("[PURGE_ME] mkArray.cc 03\n");
 
     //NB: matlab is column-major, while HDF5 is row-major
     //    data is correct with this, but dimensions don't
@@ -18,26 +14,27 @@ mxArray* make_mx_array_from_ds(const nix::DataSet &da) {
     for (size_t i = 0; i < len; i++) {
         dims[len - (i + 1)] = static_cast<mwSize>(size[i]);
     }
-    mexPrintf("[PURGE_ME] mkArray.cc 04\n");
     nix::DataType da_type = da.dataType();
-    mexPrintf("[PURGE_ME] mkArray.cc 05\n");
     DType2 dtype = dtype_nix2mex(da_type);
-    mexPrintf("[PURGE_ME] mkArray.cc 06\n");
 
     if (!dtype.is_valid) {
-        mexPrintf("[PURGE_ME] mkArray.cc 07\n");
         throw std::domain_error("Unsupported data type");
     }
 
-    mexPrintf("[PURGE_ME] mkArray.cc 08\n");
-    mxArray *data = mxCreateNumericArray(dims.size(), dims.data(), dtype.cid, dtype.clx);
-    mexPrintf("[PURGE_ME] mkArray.cc 09\n");
-    double *ptr = mxGetPr(data);
-    mexPrintf("[PURGE_ME] mkArray.cc 10\n");
-    nix::NDSize offset(size.size(), 0);
-    mexPrintf("[PURGE_ME] mkArray.cc 11\n");
-    da.getData(da_type, ptr, size, offset);
-    mexPrintf("[PURGE_ME] mkArray.cc 12\n");
+    mxArray *data;
+    if (dtype.cid == mxCHAR_CLASS)
+    {
+        data = mxCreateCharArray(dims.size(), dims.data());
+//        double *ptr = mxGetPr(data);
+//        da.getData(ptr);
+    }
+    else
+    {
+        data = mxCreateNumericArray(dims.size(), dims.data(), dtype.cid, dtype.clx);
+        double *ptr = mxGetPr(data);
+        nix::NDSize offset(size.size(), 0);
+        da.getData(da_type, ptr, size, offset);
+    }
 
     return data;
 }
@@ -105,4 +102,3 @@ mxArray* make_mx_array(const nix::Value &v)
 	return res;
 
 }
-