On branch master

2 files changed, 47 insertions, 5 deletions

diff --git a/wqflask/maintenance/dataset/datastructure/datastructure.py b/wqflask/maintenance/dataset/datastructure/datastructure.py
index ed429cb4..73e1c0d8 100644
--- a/wqflask/maintenance/dataset/datastructure/datastructure.py
+++ b/wqflask/maintenance/dataset/datastructure/datastructure.py
@@ -4,8 +4,8 @@ sys.path.append('..')
 
 from utilities import db
 
-def get_type(inbredsetid):
-    cursor=db.get_cursor()
+def get_probesetfreeze(inbredsetid):
+    cursor = db.get_cursor()
     sql = """
         SELECT ProbeSetFreeze.`Id`, ProbeSetFreeze.`Name`, ProbeSetFreeze.`FullName`
         FROM ProbeSetFreeze, ProbeFreeze
@@ -14,7 +14,4 @@ def get_type(inbredsetid):
         """
     cursor.execute(sql, (inbredsetid))
     return cursor.fetchall()
-    
-	
-print get_type()
     
\ No newline at end of file
diff --git a/wqflask/maintenance/dataset/probesets/probesets.py b/wqflask/maintenance/dataset/probesets/probesets.py
new file mode 100644
index 00000000..7fa65786
--- /dev/null
+++ b/wqflask/maintenance/dataset/probesets/probesets.py
@@ -0,0 +1,45 @@
+import sys
+sys.path.append('.')
+sys.path.append('..')
+
+from utilities import db
+
+def fetch_probesetxref(probesetfreezeid):
+    cursor = db.get_cursor()
+    sql = """
+        SELECT ProbeSetXRef.`ProbeSetId`, ProbeSetXRef.`DataId`
+        FROM ProbeSetXRef
+        WHERE ProbeSetXRef.`ProbeSetFreezeId`=%s
+        """
+    cursor.execute(sql, (probesetfreezeid))
+    return cursor.fetchall()
+    
+def fetch_probeset(probesetid):
+    cursor = db.get_cursor()
+    sql = """
+        SELECT *
+        FROM ProbeSet
+        WHERE ProbeSet.`Id`=%s
+        """
+    cursor.execute(sql, (probesetid))
+    return cursor.fetchone()
+    
+def fetch_probesetdata(probesetdataid):
+    cursor = db.get_cursor()
+    sql = """
+        SELECT Strain.`Id`, Strain.`Name`, ProbeSetData.`value`
+        FROM ProbeSetData, Strain
+        WHERE ProbeSetData.`Id`=%s
+        AND ProbeSetData.`StrainId`=Strain.`Id`;
+        """
+    cursor.execute(sql, (probesetdataid))
+    return cursor.fetchall()
+
+results = fetch_probesetxref(112)
+for row in results:
+    print row
+    probesetid = row[0]
+    probesetdataid = row[1]
+    print fetch_probeset(probesetid)
+    print fetch_probesetdata(probesetdataid)
+    break
\ No newline at end of file