Changeset 9324 for branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure

Timestamp:

03/20/13 16:56:28 (12 years ago)

Author:

fschoepp

Message:

#1888:

• DAL: Added a Delete method which deletes by experiment id.
• HL DataTables will now be transposed and mapped as double[ROWS][COLUMNS] (transposed)
• JS: Moved all classes into "modules" to prevent namespace pollution (using OAAS_MODEL for model classes, OAAS_VIEW for views and OAAS_CONTROLLER for controllers)
• JS: Moved DatatypeMapper classes into Backbone views
• JS: Models now correctly send DELETE requests
• Added a new job overview page (which also renders run details) using AJAX
• Using moment.min.js to format DateTime as string
• Controllers now inherit from BaseController which provides a RedirectToLoginIfNecessary-method
• Added loading animations to several AJAX bound places (loading experiments / scenarios)
• Added a section to _Layout.cshtml which allows page-specific JavaScript includes (<script> only for a certain page)
• Fixed Build/Edit of experiment menu redirecting to the wrong page
• The Experiment Variation Dialog disables input fields, if the property has not been activated before

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure/DAL.cs (modified) (3 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure/DAL.cs

@@ -162 +162 @@
     }
 
+    public bool Delete(string username, string experimentId) {
+      TableServiceContext serviceContext = TableClient.GetDataServiceContext();
+      TableClient.CreateTableIfNotExist(AzureConstants.EXPERIMENT_TABLE);
+      var entity = (from e in serviceContext.CreateQuery<ExperimentEntity>(AzureConstants.EXPERIMENT_TABLE)
+                    where e.ExperimentId == experimentId
+                    select e).FirstOrDefault();
+
+      if (entity == null)
+        return false;
+
+      if (entity.ExperimentJsonUrl != null) {
+        CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+        container.CreateIfNotExist();
+        var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
+        blob.DeleteIfExists();
+      }
+
+      serviceContext.DeleteObject(entity);
+      serviceContext.SaveChangesWithRetries();
+      return true;
+    }
+
     public bool DeleteByName(string username, string experiment) {
       TableServiceContext serviceContext = TableClient.GetDataServiceContext();
@@ -209 +231 @@
     //}
 
-    public IEnumerable<Model.Experiment> GetExperiments(string user) {
+    public IEnumerable<Model.Experiment> GetExperiments(string user, bool namesOnly=false) {
       TableServiceContext serviceContext = TableClient.GetDataServiceContext();
       TableClient.CreateTableIfNotExist(AzureConstants.EXPERIMENT_TABLE);
@@ -216 +238 @@
                     select e).ToList();
       var experiments = new List<Experiment>();
-      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
-      container.CreateIfNotExist();
-      foreach (var entity in entites) {
-        var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
-        experiments.Add(AlgorithmConverter.ConvertJsonToExperiment(blob.DownloadText()));
-      }
-      return experiments;
+      if (namesOnly) {
+        return (from e in entites select new Model.Experiment() { Id = e.ExperimentId, Name = e.RowKey.Split('_')[1] });
+      }
+      else {
+        CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.EXPERIMENT_BLOB_CONTAINER);
+        container.CreateIfNotExist();
+        foreach (var entity in entites) {
+          var blob = container.GetBlobReference(entity.ExperimentJsonUrl);
+          experiments.Add(AlgorithmConverter.ConvertJsonToExperiment(blob.DownloadText()));
+        }
+        return experiments;
+      }
     }