#2353 refactor datastructure .self

Author: DavidBlaa

Components/DLM/BExIS.Dlm.Entities/Data/VariableValue.cs

@@ -61,7 +61,7 @@ public VariableInstance Variable
         {
             get
             {
-                if (this.Tuple.DatasetVersion.Dataset.DataStructure.Self is StructuredDataStructure)
+                if (this.Tuple.DatasetVersion.Dataset.DataStructure != null)
                 {
                     VariableInstance u = (this.Tuple.DatasetVersion.Dataset.DataStructure.Self as StructuredDataStructure).Variables
                         .Where(p => p.Id.Equals(this.VariableId))

Components/DLM/BExIS.Dlm.Services/Data/DatasetManager.cs

@@ -1254,7 +1254,7 @@ public DataTable GetLatestDatasetVersionTuples(long datasetId, int pageNumber, i
                 // should use the fallback method, but DatasetConvertor class must be merged with OutputDataManager and SearchUIHelper claases first.
                 var version = this.GetDatasetLatestVersion(datasetId);
                 var tuples = getDatasetVersionEffectiveTuples(version, pageNumber, pageSize, false); // the false, causes the method to use a scoped sesssion and keep it alive further processings that aredone later on the tuples
-                if (version.Dataset.DataStructure.Self is StructuredDataStructure)
+                if (version.Dataset.DataStructure!=null)
                 {
                     DataTable table = convertDataTuplesToDataTable(tuples, version, (StructuredDataStructure)version.Dataset.DataStructure.Self);
                     return table;
@@ -1268,7 +1268,7 @@ public DataTable GetDatasetVersionTuples(long versionId, int pageNumber, int pag
             // should use the fallback method, but DatasetConvertor class must be merged with OutputDataManager and SearchUIHelper claases first.
             var version = this.GetDatasetVersion(versionId);
             var tuples = getDatasetVersionEffectiveTuples(version, pageNumber, pageSize, false); // the false, causes the method to use a scoped sesssion and keep it alive further processings that aredone later on the tuples
-            if (version.Dataset.DataStructure.Self is StructuredDataStructure)
+            if (version.Dataset.DataStructure != null)
             {
                 DataTable table = convertDataTuplesToDataTable(tuples, version, (StructuredDataStructure)version.Dataset.DataStructure.Self);
                 return table;
@@ -3361,7 +3361,7 @@ private void createMaterializedView(long datasetId)
             {
                 var datasetRepo = uow.GetReadOnlyRepository<Dataset>();
                 Dataset ds = datasetRepo.Get(datasetId);
-                if (ds.DataStructure != null && ds.DataStructure.Self is StructuredDataStructure)
+                if (ds.DataStructure != null && ds.DataStructure!= null)
                 {
                     StructuredDataStructure sds = (StructuredDataStructure)ds.DataStructure.Self;
                     if (sds.Variables != null && sds.Variables.Count() > 0)

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DataOutController.cs

@@ -299,7 +299,7 @@ private HttpResponseMessage getData(long id, long versionId, string token, strin
                             string title = datasetVersion.Title;
 
                             // check the data sturcture type ...
-                            if (datasetVersion.Dataset.DataStructure.Self is StructuredDataStructure)
+                            if (datasetVersion.Dataset.DataStructure != null)
                             {
                                 // apply selection and projection
                                 long count = datasetManager.GetDataTuplesCount(datasetVersion.Id);
@@ -343,7 +343,7 @@ private HttpResponseMessage getData(long id, long versionId, string token, strin
                             string title = datasetVersion.Title;
 
                             // check the data sturcture type ...
-                            if (datasetVersion.Dataset.DataStructure.Self is StructuredDataStructure)
+                            if (datasetVersion.Dataset.DataStructure!=null)
                             {
                                 //FilterExpression filter = null;
                                 //OrderByExpression orderBy = null;

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DataQualityOutController.cs

@@ -48,7 +48,7 @@ public List<int> Get()
                 foreach (int id in datasetIds)
                 {
                     DatasetVersion datasetVersion = dm.GetDatasetLatestVersion(id);
-                    if (datasetVersion.Dataset.DataStructure.Self is StructuredDataStructure)
+                    if (datasetVersion.Dataset.DataStructure!=null)
                     {
                         structuredIds.Add(id);
                     }
@@ -121,7 +121,7 @@ private HttpResponseMessage getData(long id, int variableId, string token)
                         string title = datasetVersion.Title;
 
                         // check the data sturcture type ...
-                        if (datasetVersion.Dataset.DataStructure.Self is StructuredDataStructure)
+                        if (datasetVersion.Dataset.DataStructure!=null)
                         {
                             object stats = new object();
 

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DataStatisticOutController.cs

@@ -146,7 +146,7 @@ private HttpResponseMessage getData(long id, int variableId, string token)
                         string title = datasetVersion.Title;
 
                         // check the data sturcture type ...
-                        if (datasetVersion.Dataset.DataStructure != null && datasetVersion.Dataset.DataStructure.Self is StructuredDataStructure)
+                        if (datasetVersion.Dataset.DataStructure != null)
                         {
                             object stats = new object();
 

Modules/DIM/BExIS.Dim.Helper/Export/PangaeaDataRepoConverter.cs

@@ -116,7 +116,7 @@ private string generatePrimaryData(long datasetVersionId)
                 {
                     DatasetVersion datasetVersion = datasetManager.GetDatasetVersion(datasetVersionId);
 
-                    if (datasetVersion.Dataset.DataStructure.Self is StructuredDataStructure)
+                    if (datasetVersion.Dataset.DataStructure!=null)
                     {
                         OutputDataManager outputDataManager = new OutputDataManager();
                         SubmissionManager submissionManager = new SubmissionManager();