Changeset 5534 for branches/OKB (trunk integration)/HeuristicLab.Services.OKB

Timestamp:

02/22/11 03:08:43 (13 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3

Files:

• Administration/AdministrationService.cs (modified) (2 diffs)
• Administration/Convert.cs (modified) (3 diffs)
• Administration/DataTransfer/Algorithm.cs (modified) (1 diff)
• Administration/DataTransfer/DataType.cs (deleted)
• Administration/DataTransfer/Problem.cs (modified) (1 diff)
• HeuristicLab.Services.OKB-3.3.csproj (modified) (1 diff)

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Administration/AdministrationService.cs

@@ -134 +134 @@
     public byte[] GetAlgorithmData(long algorithmId) {
       using (OKBDataContext okb = new OKBDataContext()) {
-        return okb.Algorithms.Where(x => x.Id == algorithmId).Select(x => x.BinaryData.Data.ToArray()).FirstOrDefault();
+        var data = okb.Algorithms.Where(x => x.Id == algorithmId).Select(x => x.BinaryData).FirstOrDefault();
+        if (data != null) return data.Data.ToArray();
+        else return null;
       }
     }
@@ -219 +221 @@
     public byte[] GetProblemData(long problemId) {
       using (OKBDataContext okb = new OKBDataContext()) {
-        return okb.Problems.Where(x => x.Id == problemId).Select(x => x.BinaryData.Data.ToArray()).FirstOrDefault();
+        var data = okb.Problems.Where(x => x.Id == problemId).Select(x => x.BinaryData).FirstOrDefault();
+        if (data != null) return data.Data.ToArray();
+        else return null;
       }
     }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Administration/Convert.cs

@@ -62 +62 @@
     public static DT.Algorithm ToDto(DA.Algorithm source) {
       if (source == null) return null;
-      return new DT.Algorithm { Id = source.Id, Name = source.Name, Description = source.Description, PlatformId = source.PlatformId, AlgorithmClassId = source.AlgorithmClassId, DataType = Convert.ToDto(source.DataType) };
+      return new DT.Algorithm { Id = source.Id, Name = source.Name, Description = source.Description, PlatformId = source.PlatformId, AlgorithmClassId = source.AlgorithmClassId, DataTypeName = source.DataType.Name, DataTypeTypeName = source.DataType.TypeName };
     }
     public static DA.Algorithm ToEntity(DT.Algorithm source, DA.OKBDataContext okb) {
       if (source == null) return null;
-      return new DA.Algorithm { Id = source.Id, Name = source.Name, Description = source.Description, PlatformId = source.PlatformId, AlgorithmClassId = source.AlgorithmClassId, DataType = Convert.ToEntity(source.DataType, okb) };
+      return new DA.Algorithm { Id = source.Id, Name = source.Name, Description = source.Description, PlatformId = source.PlatformId, AlgorithmClassId = source.AlgorithmClassId, DataType = Convert.ToEntity(source.DataTypeName, source.DataTypeTypeName, okb) };
     }
     public static void ToEntity(DT.Algorithm source, DA.Algorithm target, DA.OKBDataContext okb) {
       if ((source != null) && (target != null)) {
-        target.Id = source.Id; target.Name = source.Name; target.Description = source.Description; target.PlatformId = source.PlatformId; target.AlgorithmClassId = source.AlgorithmClassId; target.DataType = Convert.ToEntity(source.DataType, okb);
+        target.Id = source.Id; target.Name = source.Name; target.Description = source.Description; target.PlatformId = source.PlatformId; target.AlgorithmClassId = source.AlgorithmClassId; target.DataType = Convert.ToEntity(source.DataTypeName, source.DataTypeTypeName, okb);
       }
     }
@@ -94 +94 @@
     public static DT.Problem ToDto(DA.Problem source) {
       if (source == null) return null;
-      return new DT.Problem { Id = source.Id, Name = source.Name, Description = source.Description, PlatformId = source.PlatformId, ProblemClassId = source.ProblemClassId, DataType = Convert.ToDto(source.DataType) };
+      return new DT.Problem { Id = source.Id, Name = source.Name, Description = source.Description, PlatformId = source.PlatformId, ProblemClassId = source.ProblemClassId, DataTypeName = source.DataType.Name, DataTypeTypeName = source.DataType.TypeName };
     }
     public static DA.Problem ToEntity(DT.Problem source, DA.OKBDataContext okb) {
       if (source == null) return null;
-      return new DA.Problem { Id = source.Id, Name = source.Name, Description = source.Description, PlatformId = source.PlatformId, ProblemClassId = source.ProblemClassId, DataType = Convert.ToEntity(source.DataType, okb) };
+      return new DA.Problem { Id = source.Id, Name = source.Name, Description = source.Description, PlatformId = source.PlatformId, ProblemClassId = source.ProblemClassId, DataType = Convert.ToEntity(source.DataTypeName, source.DataTypeTypeName, okb) };
     }
     public static void ToEntity(DT.Problem source, DA.Problem target, DA.OKBDataContext okb) {
       if ((source != null) && (target != null)) {
-        target.Id = source.Id; target.Name = source.Name; target.Description = source.Description; target.PlatformId = source.PlatformId; target.ProblemClassId = source.ProblemClassId; target.DataType = Convert.ToEntity(source.DataType, okb);
+        target.Id = source.Id; target.Name = source.Name; target.Description = source.Description; target.PlatformId = source.PlatformId; target.ProblemClassId = source.ProblemClassId; target.DataType = Convert.ToEntity(source.DataTypeName, source.DataTypeTypeName, okb);
       }
     }
@@ -108 +108 @@
 
     #region DataType
-    private static DT.DataType ToDto(DA.DataType source) {
-      if (source == null) return null;
-      return new DT.DataType { Name = source.Name, TypeName = source.TypeName };
-    }
-    private static DA.DataType ToEntity(DT.DataType source, DA.OKBDataContext okb) {
-      if (source == null) return null;
-      var entity = okb.DataTypes.Where(x => (x.Name == source.Name) && (x.TypeName == source.TypeName)).FirstOrDefault();
+    private static DA.DataType ToEntity(string dataTypeName, string dataTypeTypeName, DA.OKBDataContext okb) {
+      if ((dataTypeName == null) || (dataTypeTypeName == null)) return null;
+      var entity = okb.DataTypes.Where(x => (x.Name == dataTypeName) && (x.TypeName == dataTypeTypeName)).FirstOrDefault();
       if (entity == null)
-        entity = new DA.DataType() { Id = 0, Name = source.Name, TypeName = source.TypeName };
+        entity = new DA.DataType() { Id = 0, Name = dataTypeName, TypeName = dataTypeTypeName };
       return entity;
     }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Administration/DataTransfer/Algorithm.cs

@@ -30 +30 @@
     public long AlgorithmClassId { get; set; }
     [DataMember]
-    public DataType DataType { get; set; }
+    public string DataTypeName { get; set; }
+    [DataMember]
+    public string DataTypeTypeName { get; set; }
   }
 }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Administration/DataTransfer/Problem.cs

@@ -30 +30 @@
     public long ProblemClassId { get; set; }
     [DataMember]
-    public DataType DataType { get; set; }
+    public string DataTypeName { get; set; }
+    [DataMember]
+    public string DataTypeTypeName { get; set; }
   }
 }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj

@@ -124 +124 @@
     <Compile Include="Administration\DataTransfer\Algorithm.cs" />
     <Compile Include="Administration\DataTransfer\AlgorithmClass.cs" />
-    <Compile Include="Administration\DataTransfer\DataType.cs" />
     <Compile Include="Administration\DataTransfer\NamedOKBItem.cs" />
     <Compile Include="Administration\DataTransfer\OKBItem.cs" />