Added an OR ("Get Any") search to the index page

Fixed several issues with existing searches; for example, the user can type "Chr" before the chromosome parameter (for example LRS=(9 999 Chr2 100 105) )

1 files changed, 27 insertions, 19 deletions

diff --git a/wqflask/wqflask/templates/index_page.html b/wqflask/wqflask/templates/index_page.html
index 150a71f1..3d5ddde4 100755
--- a/wqflask/wqflask/templates/index_page.html
+++ b/wqflask/wqflask/templates/index_page.html
@@ -76,10 +76,10 @@
                                 <!--  GET ANY  SEARCH -->
 
                                 <div class="form-group">
-                                    <label for="tfor" class="col-xs-1 control-label" style="padding-left: 0px; padding-right: 0px; width: 65px !important;">Search for:</label>
+                                    <label for="or_search" class="col-xs-1 control-label" style="padding-left: 0px; padding-right: 0px; width: 65px !important;">Get Any:</label>
                                     <div class="col-xs-10 controls">
                                         <div class="col-xs-8">
-                                          <textarea name="search_terms" rows="2" class="form-control search-query" style="max-width: 550px; width: 450px !important;" id="tfor"></textarea>
+                                          <textarea name="search_terms_or" rows="1" class="form-control search-query" style="max-width: 550px; width: 450px !important;" id="or_search"></textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -87,19 +87,33 @@
                                 <!--  GET ANY HELP   -->
                                 <div class="form-group">
                                     <label for="btsearch" class="col-xs-1 control-label" style="width: 65px !important;"></label>
+                                    <div class="col-xs-10 controls">                                  
+                                        <div class="col-xs-12 controls">
+                                            Enter terms, genes, ID numbers in the <b>Search</b> field.<br>
+                                            Use <b>*</b> or <b>?</b> wildcards (Cyp*a?, synap*).<br>
+                                            Use <b>quotes</b> for terms such as <i>"tyrosine kinase"</i>.
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="and_search" class="col-xs-1 control-label" style="padding-left: 0px; padding-right: 0px; width: 65px !important;">Combined:</label>
+                                    <div class="col-xs-10 controls">
+                                        <div class="col-xs-8">
+                                          <textarea name="search_terms_and" rows="1" class="form-control search-query" style="max-width: 550px; width: 450px !important;" id="and_search"></textarea>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="btsearch" class="col-xs-1 control-label" style="width: 65px !important;"></label>
                                     <div class="col-xs-10 controls">
                                         <div class="col-xs-2 controls" style="width: 100px !important;">
                                             <input id="btsearch" type="submit" class="btn btn-primary form-control" value="Search">
                                         </div>                                    
-                                        <div class="col-xs-9 controls">
-                                            Enter terms, genes, ID numbers in the <b>Search</b> field
-                                            Use <b>*</b> or <b>?</b> wildcards (Cyp*a?, synap*)
-                                            Use <b>quotes</b> for terms such as <i>"tyrosine kinase"</i>
-                                        </div>
                                     </div>
                                 </div>
 
-
                                 <!--  SEARCH, MAKE DEFAULT -->
 
                                 <div class="form-group">
@@ -116,21 +130,15 @@
                         <h2>Advanced commands</h2>
                     </div>
 
-                    <p>GeneNetwork supports a variety of advanced searches.</p>
-
-                    <p>To try them out copy these examples into the search field:</p>
+                    <p>You can also use advanced commands. Copy these simple examples into the Get Any or Combined search fields:</p>
 
                       <ul>
-                        <!--<li><b>POSITION=(chr1 25 30)</b> finds genes, markers, or transcripts on
+                        <li><b>POSITION=(chr1 25 30)</b> finds genes, markers, or transcripts on
                         chromosome 1 between 25 and 30 Mb.</li>
 
                         <li><b>MEAN=(15 16) LRS=(23 46)</b> in the <b>Combined</b> field finds
                         highly expressed genes (15 to 16 log2 units) AND with peak <a href="http://www.genenetwork.org/glossary.html#L" target="_blank">LRS</a>
-                        linkage between 23 and 46.</li>-->
-
-                        <li><b>MEAN=(15 16)</b> finds highly expressed genes (15 to 16 log2 units).</li>
-
-                        <li><b>LRS=(23 46)</b> finds genes with peak <a href="http://www.genenetwork.org/glossary.html#L" target="_blank">LRS</a> linkage between 23 and 46.</li>
+                        linkage between 23 and 46.</li>
 
                         <li><b>RIF=mitochondrial</b> searches RNA databases for <a href="http://www.ncbi.nlm.nih.gov/projects/GeneRIF/GeneRIFhelp.html" target="_blank">
                         GeneRIF</a> links.</li>
@@ -146,12 +154,12 @@
                         <li><b>GO:0045202 LRS=(9 99 Chr4 122 155) cisLRS=(9 999 10)</b>
                         finds synapse-associated genes with <a href="http://www.genenetwork.org/glossary.html#E" target="_blank">
                         cis eQTL</a> on Chr 4 from 122 and 155 Mb with LRS scores
-                        between 9 and 999.</li>
+                        between 9 and 999.</li>-->
 
                         <li><b>RIF=diabetes LRS=(9 999 Chr2 100 105) transLRS=(9 999 10)</b>
                         finds diabetes-associated transcripts with peak <a href="http://www.genenetwork.org/glossary.html#E" target="_blank">
                         trans eQTLs</a> on Chr 2 between 100 and 105 Mb with LRS
-                        scores between 9 and 999.</li>-->
+                        scores between 9 and 999.</li>
                       </ul>
                 </section>
             </div>