Changeset 976 for trunk

Timestamp:

12/11/08 17:20:03 (16 years ago)

Author:

svonolfe

Message:

Fixed selecting by name (#372)

Location:

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess

Files:

• PermissionOwnerAdapter.cs (modified) (1 diff)
• ResourceAdapter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/PermissionOwnerAdapter.cs

@@ -116 +116 @@
 
     public PermissionOwner GetPermissionOwnerByName(String name) {
-      PermissionOwner permOwner = new PermissionOwner();
+       dsHiveServer.PermissionOwnerRow row = null;
 
-      dsHiveServer.PermissionOwnerRow row =
-        data.Single<dsHiveServer.PermissionOwnerRow>(
-          r => !r.IsNameNull() && r.Name == name);
+      IEnumerable<dsHiveServer.PermissionOwnerRow> permOwners =
+        from r in
+          data.AsEnumerable<dsHiveServer.PermissionOwnerRow>()
+        where !r.IsNameNull() && r.Name == name
+        select r;
+
+      if (permOwners.Count<dsHiveServer.PermissionOwnerRow>() == 1)
+        row = permOwners.First<dsHiveServer.PermissionOwnerRow>();
 
       if (row != null) {
+        PermissionOwner permOwner = new PermissionOwner();
         Convert(row, permOwner);
 

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/ResourceAdapter.cs

@@ -113 +113 @@
 
     public Resource GetResourceByName(string name) {
-      Resource resource = new Resource();
+      dsHiveServer.ResourceRow row = null;
 
-      dsHiveServer.ResourceRow row =
-        data.Single<dsHiveServer.ResourceRow>(
-          r => !r.IsNameNull() && r.Name == name);
+      IEnumerable<dsHiveServer.ResourceRow> permOwners =
+        from r in
+          data.AsEnumerable<dsHiveServer.ResourceRow>()
+        where !r.IsNameNull() && r.Name == name
+        select r;
+
+      if (permOwners.Count<dsHiveServer.ResourceRow>() == 1)
+        row = permOwners.First<dsHiveServer.ResourceRow>();
 
       if (row != null) {
-        Convert(row, resource);
+        Resource res = new Resource();
+        Convert(row, res);
 
-        return resource;
+        return res;
       } else {
         return null;