Commit 47da66d5 authored by Anne Goloubkoff-Duponchel's avatar Anne Goloubkoff-Duponchel
Browse files

correction xquery avec ajout de

parent 12e6f8cf

plugins/metadata/metadata.xq

+6 −4
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ declare 
%rest:query-param("focus", "{$focus}")

%rest:path("/{$project}/{$doc=.*}/info/{$tag}.html")

function max.plugin.metadata:getMetadataDocument($project, $doc, $tag, $search as xs:string ?, $focus as xs:string ?){

    let $xml := max.plugin.metadata:getXMLByTag($project, $doc, $tag) 

    let $dbPath := max.config:getProjectDBPath($project)

    let $xml := max.plugin.metadata:getXMLByTag($project, $dbPath, $doc, $tag) 

    let $projectXSL := file:parent(file:parent(file:parent(static-base-uri())))||"editions/"||$project||"/ui/xsl/ead/" || $tag || ".xsl"

    let $maxXSL :=  max.util:maxHome() ||  "/" || "/plugins/metadata/" || $tag || ".xsl"

    let $xsl := if (file:exists($projectXSL))
@@ -45,12 +46,13 @@ function max.plugin.metadata:getMetadataDocument($project, $doc, $tag, $search a 
            return $html 

};



declare function max.plugin.metadata:getXMLByTag($project, $doc, $tag){

declare function max.plugin.metadata:getXMLByTag($project, $dbPath, $doc, $tag){

    

        switch ($tag)

        case "archdesc" return

            try{

                

                    let $queryArchdesc := '<div>{doc("'||$project || '/' || $doc ||'")/*:ead/*:archdesc/* except doc("'||$project || '/' || $doc ||'")/*:ead/*:archdesc/*:dsc}</div>'

                    let $queryArchdesc := '<div>{doc("'||$dbPath || '/' || $doc ||'")/*:ead/*:archdesc/* except doc("'|| $dbPath || '/' || $doc ||'")/*:ead/*:archdesc/*:dsc}</div>'

                    return 

                    xquery:eval($queryArchdesc,map

                        {
@@ -63,7 +65,7 @@ declare function max.plugin.metadata:getXMLByTag($project, $doc, $tag){ 
                }

        default return

            try{

                    let $queryHeader := 'doc("'||$project || '/' || $doc ||'")//*:ead/*:'|| $tag

                    let $queryHeader := 'doc("'||$dbPath || '/' || $doc ||'")//*:ead/*:'|| $tag

                    return 

                    xquery:eval($queryHeader,map

                        {