- Timestamp:
- 07/16/15 11:50:41 (9 years ago)
- Location:
- branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj
r12691 r12765 189 189 </ItemGroup> 190 190 <ItemGroup> 191 <ProjectReference Include="..\..\HeuristicLab.Services.Access.DataAccess\3.3\HeuristicLab.Services.Access.DataAccess-3.3.csproj"> 192 <Project>{0F652437-998A-4EAB-8BF1-444B5FE8CE97}</Project> 193 <Name>HeuristicLab.Services.Access.DataAccess-3.3</Name> 194 </ProjectReference> 191 195 <ProjectReference Include="..\..\HeuristicLab.Services.Access\3.3\HeuristicLab.Services.Access-3.3.csproj"> 192 196 <Project>{9FAC0B23-2730-452A-9BA0-D7CA1746C541}</Project> -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs
r12551 r12765 24 24 using System.Data.Linq; 25 25 using System.Linq; 26 using HeuristicLab.Services.Access.DataAccess; 26 27 using HeuristicLab.Services.Hive.DataAccess; 27 28 using HeuristicLab.Services.Hive.DataAccess.Manager; … … 150 151 } 151 152 if (totalTasks == completedTasks) { 152 dimJob.DateCompleted = factTaskDao.GetLastCompletedTaskFromJob(dimJob.JobId) ;153 dimJob.DateCompleted = factTaskDao.GetLastCompletedTaskFromJob(dimJob.JobId) ?? DateTime.Now; 153 154 } 154 155 dimJob.TotalTasks = totalTasks; … … 171 172 join client in recentlyAddedClients on slave.ResourceId equals client.ResourceId 172 173 where (slave.Name != client.Name 174 || slave.ParentResourceId == null && client.ResourceGroupId != null // because both can be null and null comparison 175 || slave.ParentResourceId != null && client.ResourceGroupId == null // does return no entry on the sql server 173 176 || slave.ParentResourceId != client.ResourceGroupId 174 || slave.ParentResource.ParentResourceId != client.ResourceGroup2Id)177 || ((slave.ParentResource != null) && slave.ParentResource.ParentResourceId != client.ResourceGroup2Id)) 175 178 select new { 176 179 SlaveId = slave.ResourceId, … … 186 189 x.Name, 187 190 ResourceGroupId = x.ParentResourceId, 188 GroupName = x.ParentResource .Name,189 ResourceGroup2Id = x.ParentResource .ParentResourceId,190 GroupName2 = x.ParentResource .ParentResource.Name191 GroupName = x.ParentResource != null ? x.ParentResource.Name : null, 192 ResourceGroup2Id = x.ParentResource != null ? x.ParentResource.ParentResourceId : null, 193 GroupName2 = x.ParentResource != null ? x.ParentResource.ParentResource != null ? x.ParentResource.ParentResource.Name : null : null 191 194 }) 192 195 .ToList(); … … 311 314 private string GetUserName(Guid userId) { 312 315 try { 313 var userManager = ServiceLocator.Instance.UserManager; 314 var user = userManager.GetUserById(userId); 315 return user != null ? user.UserName : UnknownUserName; 316 // we cannot use the ServiceLocator.Instance.UserManager since the janitor service 317 // is not hosted in the iis the MemberShip.GetUser method causes exceptions 318 // needs to be further investigated current workaround: use the authenticationcontext 319 // we could also connect to the access service to get the user name 320 using (ASPNETAuthenticationDataContext dc = new ASPNETAuthenticationDataContext()) { 321 var user = dc.aspnet_Users.SingleOrDefault(x => x.UserId == userId); 322 return user != null ? user.UserName : UnknownUserName; 323 } 316 324 } 317 325 catch (Exception) {
Note: See TracChangeset
for help on using the changeset viewer.