diff options
| -rw-r--r-- | wqflask/wqflask/correlation/correlation_file_generator.py | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/wqflask/wqflask/correlation/correlation_file_generator.py b/wqflask/wqflask/correlation/correlation_file_generator.py index 97b8bde8..36959229 100644 --- a/wqflask/wqflask/correlation/correlation_file_generator.py +++ b/wqflask/wqflask/correlation/correlation_file_generator.py @@ -25,18 +25,31 @@ def get_strains(conn, inbredsetid=1): return cursor.fetchall() + def fetch_datasets(conn): - #fi parents included????? - with conn.cursor() as cursor: - cursor.execute( - "SELECT ProbeSet.Name, Strain.Name, ProbeSetData.value " - "FROM Strain LEFT JOIN ProbeSetData " - "ON Strain.Id = ProbeSetData.StrainId " - "LEFT JOIN ProbeSetXRef ON ProbeSetData.Id = ProbeSetXRef.DataId " - "LEFT JOIN ProbeSet ON ProbeSetXRef.ProbeSetId = ProbeSet.Id " - "WHERE ProbeSetXRef.ProbeSetFreezeId IN " - "(SELECT Id FROM ProbeSetFreeze WHERE Name = %s) " - "ORDER BY Strain.Name", - (db_name,)) - return cursor.fetchall() + # fi parents included????? + with conn.cursor() as cursor: + cursor.execute( + "SELECT ProbeSet.Name, Strain.Name, ProbeSetData.value " + "FROM Strain LEFT JOIN ProbeSetData " + "ON Strain.Id = ProbeSetData.StrainId " + "LEFT JOIN ProbeSetXRef ON ProbeSetData.Id = ProbeSetXRef.DataId " + "LEFT JOIN ProbeSet ON ProbeSetXRef.ProbeSetId = ProbeSet.Id " + "WHERE ProbeSetXRef.ProbeSetFreezeId IN " + "(SELECT Id FROM ProbeSetFreeze WHERE Name = %s) " + "ORDER BY Strain.Name", + (db_name,)) + return cursor.fetchall() + + +def get_probesetfreeze(conn, probes): + + with conn.cursor() as cursor: + cursor.execute( + "SELECT ProbeSetFreeze.Id, ProbeSetFreeze.Name, ProbeSetFreeze.FullName " + "FROM ProbeSetFreeze " + "WHERE ProbeSetFreeze.Id=%s", + (probes,) + ) + return cursor.fetchone() |