fixed search to work correctly

static/abaev.js

@@ -98,6 +98,34 @@ $( document ).ready(function() {
     });
 
     // ENTRY LIST SIDE PANEL
+
+    // Function to produce HTML for the entry list
+    function filterEntryList(list, filter, showSubentries) {
+      let listHtml = "";
+      for (entry of list) {
+        let entryID = entry.xmlid;
+        let entryForm = entry.form;
+        if (entryForm.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "").startsWith(filter)
+          && (!entry.subentry || showSubentries)
+        ) {
+          listHtml += `<li id="link_${entryID}"${entry.subentry ? ' class="abv-menu-re"' : ''}"><a href="./dict/${entryID}">${entryForm}</a></li>`
+        }
+      }
+      listHtml = $(`<ul>${listHtml}</ul>`);
+      $("#entrylist").append(listHtml);
+    }
+
+    // Fetch entries from the server when page loads
+    var entries = [];
+
+    fetch('./api/entries')
+    .then(res => res.json())
+    .then(out => {
+      entries = out;
+      filterEntryList(entries, '', false);
+    })
+    .then(err => console.log(err));
+
     // Function to scroll the entry list to the selected entry OR to the first entry displayed on the current page if there is no hash in the URL
     function scrollView() {
       var $container = $('#entrylist')
@@ -113,10 +141,7 @@ $( document ).ready(function() {
 
     // Click to open the offcanvas entry list
     $( '#open-leftbar' ).on('click', function() {
-      // $("#leftbar")[0].style.width = "250px";
       $("#leftbar").show();
-      // $("#leftbar")[0].style.paddingLeft = "10px";
-
       $("main")[0].style.marginLeft = "250px";
       $("header nav")[0].style.marginLeft = "250px";
       $("footer nav")[0].style.marginLeft = "250px";
@@ -139,27 +164,26 @@ $( document ).ready(function() {
 
     // Quick filter functionality
     $('#filter-entries').on("keyup", function () {
+        $("#entrylist > ul").remove();
         var value = $(this).val().toLowerCase();
-        if (value.length > 0) {
+        filterEntryList(entries, value, $('#show-re').prop('checked'))
-          $("#entrylist > ul > li:not([hidden])").filter(function () {
+        // var value = $(this).val().toLowerCase();
-              return $(this).toggle($(this).children('a').text().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "").startsWith(value))
+        // if (value.length > 0) {
-          });
+        //   $("#entrylist > ul > li:not([hidden])").filter(function () {
-        }
+        //       return $(this).toggle($(this).children('a').text().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "").startsWith(value))
-        else {
+        //   });
-          $("#entrylist > ul > li").show();
+        // }
-        }
+        // else {
-
+        //   $("#entrylist > ul > li").show();
-        return false;
+        // }
+        //
+        // return false;
     });
 
       // Event handler to show subentries
       $('#show-re').on("change", function () {
-        if($(this).prop('checked')) {
+        $("#entrylist > ul").remove();
-          console.log('haha')
+        filterEntryList(entries, $("#filter-entries").val().toLowerCase(), $(this).prop('checked'));
-          $('li.abv-menu-re').removeAttr('hidden');
+        scrollView();
-        }
-        else {
-          $('li.abv-menu-re').prop('hidden',true);
-        }
       });
 });

xq/abv-mod.xqm

@@ -282,25 +282,21 @@ declare function abv-m:mark-element($doc as document-node(), $path as xs:string)
 declare function abv-m:search($db-lang as xs:string, 
                             $type as xs:string, 
                             $query as xs:string) {
-          let $pexpr := string-join(
+          let $db-name := `abaevdict_{$db-lang}`
-            ('declare namespace tei = "http://www.tei-c.org/ns/1.0";',
+          let $docs := collection(`{$db-name}/xml`)
-                        switch($type)
+          let $hits := switch($type)
-                        case "full" return "//text()"
+                        case "full" return $docs//text()[. contains text {$query}]
-                        case "form" return "/tei:entry[1]/tei:form/tei:orth"
+                        case "form" return $docs/tei:entry[1]/tei:form[./tei:orth contains text {$query}]
-                        case "sense" return "/tei:entry[1]/tei:sense"
+                        case "sense" return $docs/tei:entry[1]//tei:sense[./tei:cit[@type='translationEquivalent'] contains text {$query}]
-                        case "example" return "/tei:entry[1]//tei:cit[@type='example']/tei:quote"
+                        case "example" return $docs/tei:entry[1]//tei:cit[@type='example']/tei:quote[. contains text {$query}]
-                        case "translation" return "/tei:entry[1]//tei:cit[@type='translation']"
+                        case "translation" return $docs/tei:entry[1]//tei:cit[@type='translation' and . contains text {$query}]
-                        case "mentioned" return "/tei:entry[1]//tei:mentioned/(tei:m|tei:w|tei:phr|tei:s)"
+                        case "mentioned" return $docs/tei:entry[1]//tei:mentioned/(tei:m|tei:w|tei:phr|tei:s)[. contains text {$query}]
-                        case "gloss" return "tei:entry[1]//tei:gloss"
+                        case "gloss" return $docs/tei:entry[1]//tei:gloss[. contains text {$query}]
-                        case "etym" return "tei:entry[1]/tei:etym[1]//text()"
+                        case "etym" return $docs/tei:entry[1]/tei:etym[1][. contains text {$query}]
-                        default return "//text()")
+                        default return $docs//text()[. contains text {$query}]
-                      )
+          return array:build(for $hit in $hits
-          return array{for $doc in collection(`abaevdict_{$db-lang}/xml`)
+          let $entry-id := db:get($db-name,db:path($hit))/tei:entry[1]/string(@xml:id)
-          let $hits := for $node in xquery:eval($pexpr, {'': $doc})
+          group by $entry-id
-                       where $node contains text {$query}
+          order by abv-m:sortKey(abv-m:entry-form-by-id($entry-id))
-                       return path($node)
+          return {'entry': $entry-id, 'nodes': array:build(for $node in $hit return path($node))})
-          where count($hits) > 0
-          order by abv-m:sortKey($doc/tei:entry[1]/tei:form[1]/tei:orth[1])
-          return {'entry_id': string($doc/tei:entry[1]/@xml:id), 
-                  'path': array:build($hits)}}
         };

xq/restx_api.xq

@@ -23,9 +23,11 @@ declare function api:ment-index($db-lang as xs:string) {
 some Unicode characters very well in this system :)
 declare function api:entry-info-short($n as node()) 
 as map(xs:string, item()) {
-  map{'id': string(hash($n/@xml:id)), 
+  let $id := if (name($n) = 're') then string($n/@corresp) else string($n/@xml:id)
-      'xmlid': string($n/@xml:id), 
+  return map{'id': hash($id), 
-      'form': $n/text()
+      'xmlid': $id, 
+      'form': $n/text(),
+      'subentry': if (name($n) = 're') then true() else false()
    }
 };
 
@@ -173,7 +175,7 @@ declare %rest:path("{$db-lang}/api/entries")
         %rest:GET 
         function api:entries($db-lang as xs:string) {
           array:build(
-            $lookup/tei:table[1]/tei:entry,
+            $lookup/tei:table[1]/*,
             api:entry-info-short#1
           )
         };
@@ -183,7 +185,7 @@ declare %rest:path("{$db-lang}/api/entries/{$entry-id}")
         function api:entries($db-lang as xs:string, 
                              $entry-id as xs:string) {
           api:entry-info-long(
-            $lookup/tei:table[1]/tei:entry[string(hash(@xml:id))=$entry-id],
+            $lookup/tei:table[1]/*[string(hash(@xml:id))=$entry-id],
             $db-lang)
         };
         

xq/restx_dict_cached.xq

@@ -174,6 +174,10 @@ declare %rest:path("/favicon.ico")
 (: ======================= SEARCH ENTRYPOINT ===================== :)
 (: =============================================================== :)
 
+declare function page:entry-for-node($lang as xs:string, $node as node()) {
+  db:get(`abaevdict_{$lang}`,db:path($node))/tei:entry[1]/string(@xml:id)
+};
+
 declare %rest:path("/search/{$path=.+}") 
         %rest:GET 
         function page:search-default($path as xs:string) {
@@ -190,11 +194,12 @@ declare %rest:path("{$lang}/search/new")
           let $r1 := session:set('searchType', $searchType)
           let $r2 := session:set('searchQuery', $searchQuery)
           let $r3 := session:set('searchN', 1)
-          let $r4 := session:set('searchData', $sd)          
+          let $r4 := session:set('searchData', $sd)
-          return if(array:size($sd) > 0) then 
+          return 
+          if(array:size($sd) > 0) then 
                   page:by-id($lang, 
-                              $sd(1)('entry_id'), 
+                              $sd(1)('entry'),
-                              string-join($sd(1)('path')?*,"|"))
+                              string-join($sd(1)('nodes'),'|'))
                  else 
                    web:redirect('../search/clear')
         };
@@ -206,7 +211,7 @@ declare %rest:path("{$lang}/search/next")
           let $n as xs:integer := session:get('searchN')+1
           let $r1 := session:set('searchN', $n)
           let $sd := session:get('searchData')
-          return page:by-id($lang, $sd($n)('entry_id'), string-join($sd($n)('path')?*,"|"))
+          return page:by-id($lang, $sd($n)('entry'), string-join($sd($n)('nodes'),'|'))
         };
         
 declare %rest:path("{$lang}/search/prev")
@@ -216,7 +221,8 @@ declare %rest:path("{$lang}/search/prev")
           let $n as xs:integer := session:get('searchN')-1
           let $r1 := session:set('searchN', $n)
           let $sd := session:get('searchData')
-          return page:by-id($lang, $sd($n)('entry_id'), string-join($sd($n)('path')?*,"|"))
+          let $node := db:get-id(`abaevdict_{$lang}`,$sd[$n])
+          return page:by-id($lang, $sd($n)('entry'), string-join($sd($n)('nodes'),'|'))
         };      
         
 declare %rest:path("{$lang}/search/position")
@@ -226,7 +232,8 @@ declare %rest:path("{$lang}/search/position")
         function page:search-position($lang, $p as xs:integer) {
           let $r1 := session:set('searchN', $p)
           let $sd := session:get('searchData')
-          return page:by-id($lang, $sd($p)('entry_id'), string-join($sd($p)('path')?*,"|"))
+          let $node := db:get-id(`abaevdict_{$lang}`,$sd[$p])
+          return page:by-id($lang, $sd($p)('entry'), string-join($sd($p)('nodes'),'|'))
         };                
         
 declare %rest:path("{$lang}/search/clear")
@@ -503,23 +510,7 @@ declare %rest:path("{$lang}/dict")
             {if ($lang = 'ru') then 'Производные' else 'Show subentries'}
           </label>
         </fieldset>
-        <nav id="entrylist">
+        <nav id="entrylist"></nav> <!-- To be filled dynamically in js -->
-          <ul>
-          {for $doc in $page:lookup-all
-           let $id := if ($doc/name() = 'entry') then $doc/@xml:id 
-                      else $doc/@corresp
-           return element li {
-                    if ($doc/name() = 're') then
-                    (attribute hidden {'true'}, 
-                    attribute class {'abv-menu-re'}) else (),
-                    attribute id {`link_{$id}`},
-                    <a href="./dict/{$id}">
-                    {$doc/text()}
-                    </a>
-                }
-          }
-          </ul>
-        </nav>
       </aside>
       
       <!--  The dictionary itself. The entries are displayed as articles retrieved
@@ -600,13 +591,14 @@ declare %rest:path("{$lang}/dict")
                           <td>
                             <a href="./search/position?p={$pos}">
                             {
-                              abv-m:entry-form-by-id($res('entry_id'))
+                              abv-m:entry-form-by-id($res('entry'))
                             }
                             </a>
                           </td>
                           <td>
                           {
-                            xquery:eval($res('path')(1), {'': doc(`abaevdict_{$lang}/xml/{$res('entry_id')}.xml`)})
+                            xquery:eval($res('nodes')(1), 
+                            {'': doc(`abaevdict_{$lang}/xml/{$res('entry')}.xml`)})
                           }
                           </td>
                        </tr>