diff --git a/static/abaev.js b/static/abaev.js index c2aa5f7..63ce6a2 100644 --- a/static/abaev.js +++ b/static/abaev.js @@ -98,34 +98,6 @@ $( 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 += `` - } - } - listHtml = $(``); - $("#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') @@ -141,7 +113,10 @@ $( 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"; @@ -164,26 +139,27 @@ $( document ).ready(function() { // Quick filter functionality $('#filter-entries').on("keyup", function () { - $("#entrylist > ul").remove(); var value = $(this).val().toLowerCase(); - filterEntryList(entries, value, $('#show-re').prop('checked')) - // var value = $(this).val().toLowerCase(); - // 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(); - // } - // - // return false; + 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(); + } + + return false; }); // Event handler to show subentries $('#show-re').on("change", function () { - $("#entrylist > ul").remove(); - filterEntryList(entries, $("#filter-entries").val().toLowerCase(), $(this).prop('checked')); - scrollView(); + if($(this).prop('checked')) { + console.log('haha') + $('li.abv-menu-re').removeAttr('hidden'); + } + else { + $('li.abv-menu-re').prop('hidden',true); + } }); }); diff --git a/xq/abv-mod.xqm b/xq/abv-mod.xqm index 79eb447..e38ce14 100644 --- a/xq/abv-mod.xqm +++ b/xq/abv-mod.xqm @@ -282,21 +282,25 @@ 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 $db-name := `abaevdict_{$db-lang}` - let $docs := collection(`{$db-name}/xml`) - let $hits := switch($type) - case "full" return $docs//text()[. contains text {$query}] - case "form" return $docs/tei:entry[1]/tei:form[./tei:orth contains text {$query}] - case "sense" return $docs/tei:entry[1]//tei:sense[./tei:cit[@type='translationEquivalent'] contains text {$query}] - case "example" return $docs/tei:entry[1]//tei:cit[@type='example']/tei:quote[. contains text {$query}] - case "translation" return $docs/tei:entry[1]//tei:cit[@type='translation' and . contains text {$query}] - case "mentioned" return $docs/tei:entry[1]//tei:mentioned/(tei:m|tei:w|tei:phr|tei:s)[. contains text {$query}] - case "gloss" return $docs/tei:entry[1]//tei:gloss[. contains text {$query}] - case "etym" return $docs/tei:entry[1]/tei:etym[1][. contains text {$query}] - default return $docs//text()[. contains text {$query}] - return array:build(for $hit in $hits - let $entry-id := db:get($db-name,db:path($hit))/tei:entry[1]/string(@xml:id) - group by $entry-id - order by abv-m:sortKey(abv-m:entry-form-by-id($entry-id)) - return {'entry': $entry-id, 'nodes': array:build(for $node in $hit return path($node))}) + let $pexpr := string-join( + ('declare namespace tei = "http://www.tei-c.org/ns/1.0";', + switch($type) + case "full" return "//text()" + case "form" return "/tei:entry[1]/tei:form/tei:orth" + case "sense" return "/tei:entry[1]/tei:sense" + case "example" return "/tei:entry[1]//tei:cit[@type='example']/tei:quote" + case "translation" return "/tei:entry[1]//tei:cit[@type='translation']" + case "mentioned" return "/tei:entry[1]//tei:mentioned/(tei:m|tei:w|tei:phr|tei:s)" + case "gloss" return "tei:entry[1]//tei:gloss" + case "etym" return "tei:entry[1]/tei:etym[1]//text()" + default return "//text()") + ) + return array{for $doc in collection(`abaevdict_{$db-lang}/xml`) + let $hits := for $node in xquery:eval($pexpr, {'': $doc}) + where $node contains text {$query} + 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)}} }; \ No newline at end of file diff --git a/xq/restx_api.xq b/xq/restx_api.xq index 6d8cea0..5f75851 100644 --- a/xq/restx_api.xq +++ b/xq/restx_api.xq @@ -23,11 +23,9 @@ 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()) { - let $id := if (name($n) = 're') then string($n/@corresp) else string($n/@xml:id) - return map{'id': hash($id), - 'xmlid': $id, - 'form': $n/text(), - 'subentry': if (name($n) = 're') then true() else false() + map{'id': string(hash($n/@xml:id)), + 'xmlid': string($n/@xml:id), + 'form': $n/text() } }; @@ -175,7 +173,7 @@ declare %rest:path("{$db-lang}/api/entries") %rest:GET function api:entries($db-lang as xs:string) { array:build( - $lookup/tei:table[1]/*, + $lookup/tei:table[1]/tei:entry, api:entry-info-short#1 ) }; @@ -185,7 +183,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]/*[string(hash(@xml:id))=$entry-id], + $lookup/tei:table[1]/tei:entry[string(hash(@xml:id))=$entry-id], $db-lang) }; diff --git a/xq/restx_dict_cached.xq b/xq/restx_dict_cached.xq index 4d736b8..d8d2d39 100644 --- a/xq/restx_dict_cached.xq +++ b/xq/restx_dict_cached.xq @@ -174,10 +174,6 @@ 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) { @@ -194,12 +190,11 @@ 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) - return - if(array:size($sd) > 0) then + let $r4 := session:set('searchData', $sd) + return if(array:size($sd) > 0) then page:by-id($lang, - $sd(1)('entry'), - string-join($sd(1)('nodes'),'|')) + $sd(1)('entry_id'), + string-join($sd(1)('path')?*,"|")) else web:redirect('../search/clear') }; @@ -211,7 +206,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'), string-join($sd($n)('nodes'),'|')) + return page:by-id($lang, $sd($n)('entry_id'), string-join($sd($n)('path')?*,"|")) }; declare %rest:path("{$lang}/search/prev") @@ -221,8 +216,7 @@ 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') - let $node := db:get-id(`abaevdict_{$lang}`,$sd[$n]) - return page:by-id($lang, $sd($n)('entry'), string-join($sd($n)('nodes'),'|')) + return page:by-id($lang, $sd($n)('entry_id'), string-join($sd($n)('path')?*,"|")) }; declare %rest:path("{$lang}/search/position") @@ -232,8 +226,7 @@ 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') - let $node := db:get-id(`abaevdict_{$lang}`,$sd[$p]) - return page:by-id($lang, $sd($p)('entry'), string-join($sd($p)('nodes'),'|')) + return page:by-id($lang, $sd($p)('entry_id'), string-join($sd($p)('path')?*,"|")) }; declare %rest:path("{$lang}/search/clear") @@ -510,7 +503,23 @@ declare %rest:path("{$lang}/dict") {if ($lang = 'ru') then 'Производные' else 'Show subentries'} - +