Skip to content
Snippets Groups Projects
Commit dffa80bf authored by L. Ellenbeck's avatar L. Ellenbeck
Browse files

WIP: fixes test coscine/issues#888

parent 9d3550c2
No related tags found
1 merge request!1Topic/888 automated import
Pipeline #315967 passed
......@@ -10,6 +10,7 @@ namespace Coscine.OrganizationLoader
public string RONID { get; set; }
public List<string> Memberships { get; set; }
public string DegreePre { get; set; }
public string DegreePost { get; set; }
public string Ubpublications { get; set; }
public List<Role> RoleAssignments { get; set; }
}
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Coscine.OrganizationLoader
{
public class OrganizationLoader
{
}
}
......@@ -104,7 +104,6 @@
<ItemGroup>
<Compile Include="Employee.cs" />
<Compile Include="Organization.cs" />
<Compile Include="OrganizationLoader.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Role.cs" />
......
......@@ -212,6 +212,7 @@ namespace Coscine.OrganizationLoader
RONID = node["RONID"].InnerText?.Trim(),
Memberships = node["OrganizationMemberships"]?.ChildNodes?.Cast<XmlNode>().Select(x => x["OrgId"].InnerText?.Trim()).ToList(),
DegreePre = node["DegreePre"]?.InnerText,
DegreePost = node["DegreePost"]?.InnerText,
Ubpublications = node["Ubpublications"]?.InnerText?.Trim(),
RoleAssignments = node["RoleAssignments"]?.ChildNodes?.Cast<XmlNode>().Select(x => new Role { RID = x["RID"].InnerText?.Trim(), OrgId = x["OrgId"].InnerText?.Trim() }).ToList(),
......@@ -332,7 +333,7 @@ namespace Coscine.OrganizationLoader
streamWriter.Flush();
return Encoding.ASCII.GetString(memoryStream.ToArray());
return Encoding.UTF8.GetString(memoryStream.ToArray());
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment