Changeset 4140 for branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

Timestamp:

08/03/10 17:20:46 (14 years ago)

Author:

kgrading

Message:

#828 added various improvements to the plugin cache manager, the execution engine, the transaction handling on the serverside and the server console

File:

• branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (3 diffs)

branches/3.2/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

@@ -595 +595 @@
       }
       job.JobInfo.Percentage = percentage;
-
-      if (finished) {
+      if(exception != null) {
+        job.JobInfo.State = State.failed;
+        job.JobInfo.Exception = exception.ToString();
+        job.JobInfo.DateFinished = DateTime.Now;
+      } else if (finished) {
         job.JobInfo.State = State.finished;
         job.JobInfo.DateFinished = DateTime.Now;
@@ -718 +721 @@
       ResponsePlugin response = new ResponsePlugin();
       foreach (HivePluginInfoDto pluginInfo in pluginList) {
-        // TODO: BuildDate deleted, not needed???
-        // TODO: Split version to major, minor and revision number
-        foreach (IPluginDescription currPlugin in ApplicationManager.Manager.Plugins) {
-          if (currPlugin.Name == pluginInfo.Name) {
-
-            CachedHivePluginInfoDto currCachedPlugin = new CachedHivePluginInfoDto {
-              Name = currPlugin.Name,
-              Version = currPlugin.Version,
-              BuildDate = currPlugin.BuildDate
-            };
-
-            foreach (string fileName in from file in currPlugin.Files select file.Name) {
-              currCachedPlugin.PluginFiles.Add(new HivePluginFile(File.ReadAllBytes(fileName), fileName));
-            }
-            response.Plugins.Add(currCachedPlugin);
+        if(pluginInfo.Update) {
+          //check if there is a newer version         
+          IPluginDescription ipd =
+            ApplicationManager.Manager.Plugins.Where(pd => pd.Name == pluginInfo.Name && pd.Version.Major == pluginInfo.Version.Major && pd.Version.Minor == pluginInfo.Version.Minor && pd.Version.Revision > pluginInfo.Version.Revision).SingleOrDefault();
+          if(ipd != null) {
+            response.Plugins.Add(convertPluginDescriptorToDto(ipd));  
+          }  
+        } else {
+          IPluginDescription ipd =
+            ApplicationManager.Manager.Plugins.Where(pd => pd.Name == pluginInfo.Name && pd.Version.Major == pluginInfo.Version.Major && pd.Version.Minor == pluginInfo.Version.Minor && pd.Version.Revision >= pluginInfo.Version.Revision).SingleOrDefault();
+          if(ipd != null) {
+            response.Plugins.Add(convertPluginDescriptorToDto(ipd));  
+          } else {
+            response.Success = false;
+            response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_PLUGINS_NOT_AVAIL;
+            return response;
           }
         }
@@ -741 +745 @@
       return response;
 
+    }
+
+    private CachedHivePluginInfoDto convertPluginDescriptorToDto(IPluginDescription currPlugin) {
+      CachedHivePluginInfoDto currCachedPlugin = new CachedHivePluginInfoDto {
+                                                                               Name = currPlugin.Name,
+                                                                               Version = currPlugin.Version,
+                                                                               BuildDate = currPlugin.BuildDate
+                                                                             };
+
+      foreach (string fileName in from file in currPlugin.Files select file.Name) {
+        currCachedPlugin.PluginFiles.Add(new HivePluginFile(File.ReadAllBytes(fileName), fileName));
+      }
+      return currCachedPlugin;
     }