diff --git a/xq/site/components/entries.xqm b/xq/site/components/entries.xqm index fa83b74..7b33a3f 100644 --- a/xq/site/components/entries.xqm +++ b/xq/site/components/entries.xqm @@ -18,7 +18,7 @@ declare %rest:path("{$lang}/entries/{$id}") if (count($query) = 0) then doc(`abaevdict_{$lang}/html/{$id}.html`) else - let $xml := doc(`abaevdict_{$lang}/xml/{$id}.xml`) + let $xml := doc(`abaevdict_{$lang}/xml/{$id}.xml`)/tei:entry[1] let $marked := ft:mark( xquery:eval( `declare namespace tei = "http://www.tei-c.org/ns/1.0"; diff --git a/xq/site/restx_main.xq b/xq/site/restx_main.xq index 8298da1..8053f68 100644 --- a/xq/site/restx_main.xq +++ b/xq/site/restx_main.xq @@ -244,7 +244,7 @@ declare %rest:path("search") %output:html-version('5') function site:search($pattern as xs:string?, $text as xs:string?) { - site:index('en') + site:search('en',$pattern,$text) }; 0 \ No newline at end of file diff --git a/xsl/abaev2html.xsl b/xsl/abaev2html.xsl index e4011b9..dcdaa2e 100644 --- a/xsl/abaev2html.xsl +++ b/xsl/abaev2html.xsl @@ -52,6 +52,7 @@ + - + +