Skip to content
Snippets Groups Projects

Documentation

Merged Daniel Hornung requested to merge f-doc into dev
All threads resolved!
Files
4
+ 8
6
@@ -198,9 +198,7 @@ auto mxFromCaosDBParents(const ce::Parents &parents) -> mxArray * {
auto parent = parents.at(i);
mxSetField(result, i, "id", mxCreateString(parent.GetId().c_str()));
mxSetField(result, i, "name", mxCreateString(parent.GetName().c_str()));
// FIXME Add again once upstream is ready.
// mxSetField(result, i, "description",
// mxCreateString(parent.GetDescription().c_str()));
mxSetField(result, i, "description", mxCreateString(parent.GetDescription().c_str()));
}
return result;
}
@@ -489,10 +487,14 @@ auto dataTypeFromMx(const mxArray *datatypeArray) -> ce::DataType {
auto dtype_name = mxGetStdString(mxGetField(datatypeArray, 0, "dtypeName"));
ce::DataType dtype;
if (is_reference) {
dtype = ce::DataType(dtype_name, is_list);
if (is_reference && is_list) {
dtype = ce::DataType::ListOf(dtype_name);
} else if (is_reference) {
dtype = ce::DataType(dtype_name);
} else if (is_list) {
dtype = ce::DataType::ListOf(cu::getEnumValueFromName<ce::AtomicDataType>(dtype_name));
} else {
dtype = ce::DataType(cu::getEnumValueFromName<ce::AtomicDataType>(dtype_name), is_list);
dtype = ce::DataType(cu::getEnumValueFromName<ce::AtomicDataType>(dtype_name));
}
return dtype;
Loading