fix merge conflict

1 files changed, 12 insertions, 0 deletions

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 6dc44829..4cb82665 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -557,6 +557,7 @@ class DataSet:
         self.fullname = None
         self.type = None
         self.data_scale = None  # ZS: For example log2
+        self.accession_id = None
 
         self.setup()
 
@@ -573,6 +574,17 @@ class DataSet:
             self.group.get_samplelist()
         self.species = species.TheSpecies(self)
 
+    def as_dict(self):
+        return {
+            'name': self.name,
+            'shortname': self.shortname,
+            'fullname': self.fullname,
+            'type': self.type,
+            'data_scale': self.data_scale,
+            'group': self.group.name,
+            'accession_id': self.accession_id
+        }
+
     def get_accession_id(self):
         if self.type == "Publish":
             results = g.db.execute("""select InfoFiles.GN_AccesionId from InfoFiles, PublishFreeze, InbredSet where