# HG changeset patch
# User mingchen0919
# Date 1521636858 14400
# Node ID 3a564664e40f36f7e6a873f6ca7846fe0dcf5040
# Parent  238ab20dc43154b1bb0ef87c05fbf7692079e109
add advanced search

diff -r 238ab20dc431 -r 3a564664e40f mygene_and_myvariant_macros.xml
--- a/mygene_and_myvariant_macros.xml	Wed Mar 21 01:32:15 2018 -0400
+++ b/mygene_and_myvariant_macros.xml	Wed Mar 21 08:54:18 2018 -0400
@@ -1436,24 +1436,4 @@
         <option value="wellderly.sift" selected="false">wellderly.sift</option>
         <option value="wellderly.vartype" selected="false">wellderly.vartype</option>
     </xml>
-    <xml name="AND_operator">
-        <repeat name="AND_operator_repeat" title="Field paths" min="1" max="20" default="0">
-            <expand macros="fields" />
-            <param type="text" name="variant_query" label="Search keywords" optional="False">
-                <sanitizer>
-                    <valid initial="string.printable"/>
-                </sanitizer>
-            </param>
-        </repeat>
-    </xml>
-    <xml name="OR_operator">
-        <repeat name="OR_operator_repeat" title="Field paths" min="1" max="20" default="0">
-            <expand macros="fields" />
-            <param type="text" name="variant_query" label="Search keywords" optional="False">
-                <sanitizer>
-                    <valid initial="string.printable"/>
-                </sanitizer>
-            </param>
-        </repeat>
-    </xml>
 </macros>
\ No newline at end of file
diff -r 238ab20dc431 -r 3a564664e40f variant_advanced_search.xml
--- a/variant_advanced_search.xml	Wed Mar 21 01:32:15 2018 -0400
+++ b/variant_advanced_search.xml	Wed Mar 21 08:54:18 2018 -0400
@@ -1,4 +1,4 @@
-<tool id="variant_advanced_search" name="variant:advanced_search" version="1.0.0">
+<tool id="variant_advanced_search" name="variant:advanced search" version="1.0.0">
     <description>
         some description
     </description>
@@ -34,12 +34,39 @@
 
     ]]></command>
     <inputs>
-        <expand macro="AND_operator" />
-        <expand macro="OR_operator" />
-        <param type="select" name="return_fields" label="Returned fields" optional="False" multiple="True">
-            <option value="all">ALL_FIELDS</option>
-            <expand macro="fields"/>
-        </param>
+        <repeat name="AND_operator_repeat" title="AND" min="1" default="1">
+            <param type="select" name="field" label="" optional="False" multiple="FALSE">
+                <option value="all">ALL_FIELDS</option>
+                <expand macro="fields"/>
+            </param>
+            <param type="text" name="variant_query" label="Search keywords" optional="False">
+                <sanitizer>
+                    <valid initial="string.printable"/>
+                </sanitizer>
+            </param>
+        </repeat>
+        <repeat name="OR_operator_repeat" title="OR" min="0" default="0">
+            <param type="select" name="field" label="OR" optional="False" multiple="FALSE">
+                <option value="all">ALL_FIELDS</option>
+                <expand macro="fields"/>
+            </param>
+            <param type="text" name="variant_query" label="Search keywords" optional="False">
+                <sanitizer>
+                    <valid initial="string.printable"/>
+                </sanitizer>
+            </param>
+        </repeat>
+        <repeat name="HAS_FIELD_operator_repeat" title="HAS FIELD" min="0" default="0">
+            <param type="select" name="field" label="OR" optional="False" multiple="FALSE">
+                <option value="all">ALL_FIELDS</option>
+                <expand macro="fields"/>
+            </param>
+            <param type="text" name="variant_query" label="Search keywords" optional="False">
+                <sanitizer>
+                    <valid initial="string.printable"/>
+                </sanitizer>
+            </param>
+        </repeat>
     </inputs>
     <outputs>
         <data format="html" name="report" label="${tool.name} report"/>
diff -r 238ab20dc431 -r 3a564664e40f variant_simple_search.xml
--- a/variant_simple_search.xml	Wed Mar 21 01:32:15 2018 -0400
+++ b/variant_simple_search.xml	Wed Mar 21 08:54:18 2018 -0400
@@ -1,4 +1,4 @@
-<tool id="variant_ids_search" name="variant: ids search" version="1.0.0">
+<tool id="variant_simple_search" name="variant: ids search" version="1.0.0">
     <description>
         some description
     </description>