oceanbox/SDSlite
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

[2.0.3] Support null as attribute value for netCDF files (#30)

Browse Source 
* Support for null as a netCDF attribute value

* Increment version number
This commit is contained in:
Vassily Lyutsarev
2021-01-26 09:20:37 +00:00
committed by GitHub
parent ddff5c0b7c
commit 826cc79a96
4 changed files with 60 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/Version.proj
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>2.0.2</Version>
<Version>2.0.3</Version>
<Copyright>(c) Microsoft Corporation. All rights reserved</Copyright>
</PropertyGroup>
</Project>

3
README.md
View File

@@ -1,6 +1,5 @@
[![NuGet](https://img.shields.io/nuget/v/SDSlite.svg?style=flat)](https://www.nuget.org/packages/SDSlite/)
[![Build Status](https://vassilyl.visualstudio.com/SDSlite/_apis/build/status/predictionmachines.SDSlite.win?branchName=master)](https://vassilyl.visualstudio.com/SDSlite/_build/latest?definitionId=2&branchName=master)
Scientific DataSet Lite
![build-test](https://github.com/predictionmachines/SDSlite/workflows/build-test/badge.svg)Scientific DataSet Lite
=======================
This is a cross platform library for manipulating netCDF, CSV and TSV files.

31
SDSLiteTests/NetCDFTests.cs
View File

@@ -95,16 +95,24 @@ namespace SDSLiteTests
{
Assert.IsTrue(ds.Metadata.ContainsKey(vname));
var v = ds.Metadata[vname];
Assert.IsNotNull(v);
Assert.AreEqual(typeof(T), v.GetType());
if (typeof(T).IsArray) {
var darr = data as Array;
var varr = v as Array;
for (int i = 0; i < darr.Length; i++)
Assert.AreEqual(darr.GetValue(i), varr.GetValue(i), String.Format("index={0}", i));
if (data == null)
{
Assert.IsNull(v);
}
else
Assert.AreEqual(data, v);
{
Assert.IsNotNull(v);
Assert.AreEqual(typeof(T), v.GetType());
if (typeof(T).IsArray)
{
var darr = data as Array;
var varr = v as Array;
for (int i = 0; i < darr.Length; i++)
Assert.AreEqual(darr.GetValue(i), varr.GetValue(i), String.Format("index={0}", i));
}
else
Assert.AreEqual(data, v);
}
}
}
@@ -121,7 +129,7 @@ namespace SDSLiteTests
[Test]
public void Empty_AddAttribute_double0()
{
Empty_AddAttribute(Math.PI);
Empty_AddAttribute(new double[0]);
}
[Test]
public void Empty_AddAttribute_double1()
@@ -159,6 +167,11 @@ namespace SDSLiteTests
Empty_AddAttribute("");
}
[Test]
public void Empty_AddAttribute_string_null()
{
Empty_AddAttribute<string>(null);
}
[Test]
public void Empty_AddAttribute_string0()
{
Empty_AddAttribute(new string[]{});

124
ScientificDataSet/Providers/NetCDF/NetCDFDataSet.cs
View File

@@ -460,7 +460,7 @@ namespace Microsoft.Research.Science.Data.NetCDF4
{
// Each variable has an entry named coordinates#Name, # - integer index
var.Metadata.ForEach(
delegate(KeyValuePair<string, object> entry)
delegate (KeyValuePair<string, object> entry)
{
if (!entry.Key.StartsWith("coordinates") || !entry.Key.EndsWith("Name"))
return;
@@ -854,51 +854,44 @@ namespace Microsoft.Research.Science.Data.NetCDF4
NetCDFDataSet.HandleResult(res);
break;
case NcType.NC_CHAR:
case NcType.NC_STRING:
int length = len;
string strvalue = NcGetAttText(ncid, varid, aname, len, out res);
NetCDFDataSet.HandleResult(res);
if (atm != null && atm.Contains(aname))
{
if (atm[aname] == typeof(DateTime[]))
value = StringToDateTimes(strvalue);
else if (atm[aname] == typeof(DateTime))
value = StringToDateTimes(strvalue)[0];
else
value = strvalue;
bool customType = (atm != null && atm.Contains(aname));
if (customType && atm[aname] == null)
}
else
{
value = trimTrailingZero ? strvalue.TrimEnd('\0') : strvalue;
}
break;
case NcType.NC_STRING:
string[] strings = new string[len];
res = NetCDF.nc_get_att_string(NcId, varid, aname, strings);
NetCDFDataSet.HandleResult(res);
if (atm != null && atm.Contains(aname) && atm[aname] == null)
{
value = null;
}
else if (customType && atm[aname] == typeof(string[]))
{
// Type is string[]
if (length == 0)
{
value = new string[0];
}
else
{
string[] strings = new string[length];
res = NetCDF.nc_get_att_string(NcId, varid, aname, strings);
NetCDFDataSet.HandleResult(res);
value = strings;
}
}
else // not string[]
{
string strvalue = NcGetAttText(ncid, varid, aname, len, out res);
NetCDFDataSet.HandleResult(res);
if (customType)
if (trimTrailingZero)
{
if (atm[aname] == typeof(DateTime[]))
value = StringToDateTimes(strvalue);
else if (atm[aname] == typeof(DateTime))
value = StringToDateTimes(strvalue)[0];
else
value = strvalue;
}
else
{
if (trimTrailingZero)
// Trimming '\0' that could be appended by C code
value = strvalue.TrimEnd('\0');
else
value = strvalue;
// Trimming '\0' that could be appended by C code
for (int i = 0; i < len; i++)
{
strings[i] = strings[i].TrimEnd('\0');
}
}
value = strings;
}
break;
case NcType.NC_SHORT:
short[] svalue = new short[len];
@@ -989,21 +982,6 @@ namespace Microsoft.Research.Science.Data.NetCDF4
return res;
}
internal static string ArrayToSingleString(string[] strings)
{
if (strings.Length == 0) return "";
StringBuilder sb = new StringBuilder();
for (int i = 0; i < strings.Length; i++)
{
sb.Append(strings[i].Replace("|", "||"));
if (i < strings.Length - 1)
sb.Append('|');
}
sb.Append('|');
return sb.ToString();
}
internal static string DateTimesToString(DateTime[] dates)
{
StringBuilder sb = new StringBuilder();
@@ -1016,32 +994,6 @@ namespace Microsoft.Research.Science.Data.NetCDF4
return sb.ToString();
}
internal static string[] StringToArray(string s)
{
List<string> result = new List<string>();
StringBuilder sb = new StringBuilder();
for (int idx = 0; idx < s.Length; idx++)
{
if (s[idx] == '|')
{
if (idx < s.Length - 1 && s[idx + 1] == '|')
{
sb.Append('|');
idx++;
}
else
{
result.Add(sb.ToString());
sb = new StringBuilder();
}
}
else
sb.Append(s[idx]);
}
result.Add(sb.ToString());
return result.ToArray();
}
internal static DateTime[] StringToDateTimes(string s)
{
if (String.IsNullOrEmpty(s)) return new DateTime[0];
@@ -1064,22 +1016,18 @@ namespace Microsoft.Research.Science.Data.NetCDF4
int res;
if (value == null)
{
atm[name] = null;
res = NcPutAttText(NcId, varid, name, null);
if (atm != null)
atm[name] = null;
res = NetCDF.nc_put_att_string(NcId, varid, name, new string[] { null });
HandleResult(res);
}
else if (value is string)
else if (value is string strValue)
{
res = NcPutAttText(NcId, varid, name, (string)value);
res = NcPutAttText(NcId, varid, name, strValue);
HandleResult(res);
}
else if (value is string[])
else if (value is string[] strArr)
{
if (atm == null)
throw new InvalidOperationException("Cannot write array of strings without AttributeTypeMap");
atm[name] = typeof(string[]);
string[] strArr = (string[])value;
res = NetCDF.nc_put_att_string(NcId, varid, name, strArr);
HandleResult(res);
}