example-queries updated

examples/example-queries.html

@@ -16,11 +16,11 @@
   <table>
     <tr>
       <td>Query (String):<br /><textarea id="str">1:abc AND 2:def</textarea></td>
-      <td>Query (Object):<br /><textarea id="obj">{&quot;type&quot;:&quot;complex&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;query_list&quot;:[{&quot;type&quot;:&quot;simple&quot;,&quot;operator&quot;:&quot;=&quot;,&quot;id&quot;:&quot;1&quot;,&quot;value&quot;:&quot;abc&quot;},{&quot;type&quot;:&quot;simple&quot;,&quot;operator&quot;:&quot;=&quot;,&quot;id&quot;:&quot;2&quot;,&quot;value&quot;:&quot;def&quot;}]}</textarea></td>
+      <td>Query (Object):<br /><textarea id="obj">{&quot;type&quot;:&quot;complex&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;query_list&quot;:[{&quot;type&quot;:&quot;simple&quot;,&quot;operator&quot;:&quot;=&quot;,&quot;key&quot;:&quot;1&quot;,&quot;value&quot;:&quot;abc&quot;},{&quot;type&quot;:&quot;simple&quot;,&quot;operator&quot;:&quot;=&quot;,&quot;key&quot;:&quot;2&quot;,&quot;value&quot;:&quot;def&quot;}]}</textarea></td>
     </tr>
     <tr>
-      <td>Object List:<br /><textarea id="list">[{&quot;1&quot;:&quot;abc&quot;,&quot;2&quot;:&quot;def&quot;},{&quot;1&quot;:&quot;def&quot;,&quot;2&quot;:&quot;abc&quot;}]</textarea></td>
-      <td>Result (Query String):<br /><textarea id="result">[{&quot;1&quot;:&quot;abc&quot;,&quot;2&quot;:&quot;def&quot;}]</textarea></td>
+      <td>Item list (to filter, from 'Query (Object)'):<br /><textarea id="list">[{&quot;1&quot;:&quot;abc&quot;,&quot;2&quot;:&quot;def&quot;},{&quot;1&quot;:&quot;def&quot;,&quot;2&quot;:&quot;abc&quot;}]</textarea></td>
+      <td>Result list:<br /><textarea id="result">[{&quot;1&quot;:&quot;abc&quot;,&quot;2&quot;:&quot;def&quot;}]</textarea></td>
     </tr>
     <tr>
       <td><label for="wildcard">Wildcard char: </label></td>
@@ -39,8 +39,8 @@
       <td><input type="text" id="limit" name="limit" value="[0,100]" /></td>
     </tr>
   </table>
-  <button onclick="parse()">Parse</button>
-  <button onclick="serialize()">Serialize</button>
+  <button onclick="searchTextToJson()">Search text to JSON</button>
+  <button onclick="jsonToSearchText()">JSON to Search text</button>
   <button onclick="query()">Query</button>
   <script type="text/javascript" src="../lib/md5/md5.js"></script>
   <script type="text/javascript" src="../lib/jsSha2/sha2.js"></script>
@@ -51,26 +51,24 @@
     src="http://code.jquery.com/jquery-1.8.2.min.js"></script>
   <script type="text/javascript">
     <!--
-var parse = function () {
-    $('#obj').attr('value',JSON.stringify(jIO.ComplexQueries.parse($('#str').attr('value'))));
+var searchTextToJson = function () {
+  $("#obj").attr("value", JSON.stringify(complex_queries.Query.parseStringToObject($("#str").attr("value"))));
 };
-var serialize = function () {
-    $('#str').attr('value',jIO.ComplexQueries.serialize(JSON.parse($('#obj').attr('value'))));
+var jsonToSearchText = function () {
+  $("#str").attr("value", complex_queries.QueryFactory.create(JSON.parse($("#obj").attr("value"))).toString());
 };
 var query = function () {
-    $('#result').attr('value',JSON.stringify(
-        jIO.ComplexQueries.query(
+  var list = JSON.parse($("#list").attr("value"));
+  $("#str").attr("value", complex_queries.QueryFactory.create(JSON.parse($("#obj").attr("value"))).exec(
+    list,
     {
-                query:$('#str').attr('value'),
-                filter:{
-                    sort_on:JSON.parse($('#sort_on').attr('value')),
-                    limit:JSON.parse($('#limit').attr('value')),
-                    select_list:JSON.parse($('#select_list').attr('value'))
-                },
-                wildcard_character:$('#wildcard').attr('value')
-            }, JSON.parse($('#list').attr('value'))
-        )
+      "wildcard_character": $('#wildcard').attr('value'),
+      "sort_on": JSON.parse($("#sort_on").attr("value")),
+      "limit": JSON.parse($("#limit").attr("value")),
+      "select_list": JSON.parse($("#select_list").attr("value"))
+    }
   ));
+  $("#result").attr("value", JSON.stringify(list));
 };
         // -->
   </script>