Merge pull request #861 from genenetwork/feature/gnqa-search-2

Feature/gnqa search 2

2 files changed, 27 insertions, 14 deletions

diff --git a/gn2/wqflask/api/markdown.py b/gn2/wqflask/api/markdown.py
index 580b9ac0..aa7dd3c4 100644
--- a/gn2/wqflask/api/markdown.py
+++ b/gn2/wqflask/api/markdown.py
@@ -24,6 +24,7 @@ links_blueprint = Blueprint("links_blueprint", __name__)
 policies_blueprint = Blueprint("policies_blueprint", __name__)
 facilities_blueprint = Blueprint("facilities_blueprint", __name__)
 news_blueprint = Blueprint("news_blueprint", __name__)
+xapian_syntax_blueprint = Blueprint("xapian_syntax_blueprint", __name__)
 
 blogs_blueprint = Blueprint("blogs_blueprint", __name__)
 
@@ -117,6 +118,13 @@ def news():
         rendered_markdown=render_markdown("general/news/news.md")), 200
 
 
+@xapian_syntax_blueprint.route('/')
+def xapian():
+    return render_template(
+        "search-syntax.html",
+        rendered_markdown=render_markdown("general/search/xapian_syntax.md")), 200
+
+
 @environments_blueprint.route("/")
 def environments():
 
diff --git a/gn2/wqflask/api/router.py b/gn2/wqflask/api/router.py
index bcd08e8d..e9b70919 100644
--- a/gn2/wqflask/api/router.py
+++ b/gn2/wqflask/api/router.py
@@ -379,23 +379,28 @@ def fetch_traits(dataset_name, file_format="json"):
         if len(trait_ids) > 0:
             if data_type == "ProbeSet":
                 query = """
-                            SELECT
-                                ProbeSet.Id, ProbeSet.Name, ProbeSet.Symbol, ProbeSet.description, ProbeSet.Chr, ProbeSet.Mb, ProbeSet.alias,
-                                ProbeSetXRef.mean, ProbeSetXRef.se, ProbeSetXRef.Locus, ProbeSetXRef.LRS, ProbeSetXRef.pValue, ProbeSetXRef.additive, ProbeSetXRef.h2
-                            FROM
-                                ProbeSet, ProbeSetXRef, ProbeSetFreeze
+                            SELECT DISTINCT
+                                ProbeSet.`Id`, ProbeSet.`Name`, ProbeSet.`Symbol`, ProbeSet.`description`,
+                                ProbeSet.`Chr`, ProbeSet.`Mb`, ProbeSet.`alias`, ProbeSetXRef.`mean`,
+                                ProbeSetXRef.`se`, ProbeSetXRef.`Locus`, ProbeSetXRef.`LRS`,
+                                ProbeSetXRef.`pValue`, ProbeSetXRef.`additive`, ProbeSetXRef.`h2`,
+                                Geno.`Chr`, Geno.`Mb`
+                            FROM 
+                                Species
+                                INNER JOIN InbredSet ON InbredSet.`SpeciesId`= Species.`Id`
+                                INNER JOIN ProbeFreeze ON ProbeFreeze.`InbredSetId` = InbredSet.`Id`
+                                INNER JOIN Tissue ON ProbeFreeze.`TissueId` = Tissue.`Id`
+                                INNER JOIN ProbeSetFreeze ON ProbeSetFreeze.`ProbeFreezeId` = ProbeFreeze.`Id`
+                                INNER JOIN ProbeSetXRef ON ProbeSetXRef.`ProbeSetFreezeId` = ProbeSetFreeze.`Id`
+                                INNER JOIN ProbeSet ON ProbeSet.`Id` = ProbeSetXRef.`ProbeSetId`
+                                LEFT JOIN Geno ON ProbeSetXRef.`Locus` = Geno.`Name` AND Geno.`SpeciesId` = Species.`Id`
                             WHERE
-                                ProbeSetXRef.ProbeSetFreezeId = "{0}" AND
-                                ProbeSetXRef.ProbeSetId = ProbeSet.Id AND
-                                ProbeSetXRef.ProbeSetFreezeId = ProbeSetFreeze.Id AND
-                                ProbeSetFreeze.public > 0 AND
-                                ProbeSetFreeze.confidentiality < 1
+                                ProbeSetXRef.ProbeSetFreezeId = "{0}"
                             ORDER BY
-                                ProbeSet.Id
-                        """
+                                ProbeSet.Id"""
 
-                field_list = ["Id", "Name", "Symbol", "Description", "Chr", "Mb",
-                              "Aliases", "Mean", "SE", "Locus", "LRS", "P-Value", "Additive", "h2"]
+                field_list = ["Id", "Name", "Symbol", "Description", "Chr", "Mb", "Aliases", "Mean",
+                              "SE", "Locus", "LRS", "P-Value", "Additive", "h2", "Peak Chr", "Peak Mb"]
             elif data_type == "Geno":
                 query = """
                             SELECT