Commit f57b2936 authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

Merge branch 'ag/ameliorationRecherche' into 'dev' 

amélioration recherche

See merge request pdn-certic/MaX!52
parents 0c2bc976 56fd6e05

max.xq

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ declare %private function max:applySearchMarkup($html as node(), $search as xs:s 
        let $markedHtml :=

            if ($search)

            then

                max.util:markSearchedText($html, $search, ())

                max.util:markSearchedText($html, $search, $focusTarget)

            else

                $html

        let $focusedHtml :=

plugins/search/search.xqm

+3 −1
Original line number Diff line number Diff line
@@ -95,7 +95,9 @@ function max.plugin.search:search($project,$search, $docs as item()*){ 
  let $docList := 

    if(count($docs) > 0(: = $max.plugin.search:ALL_TXT:))

      then $docs

    else for $d in collection($dbPath) return base-uri($d)

    else for $d in collection($dbPath) 

    where not(max.config:isIgnored(replace(base-uri($d), ".+/([^/]+)$", "$1"), $project))

    return base-uri($d)



  for $docPath in $docList

    let $res :=