Commit 120abdab authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

Merge branch 'ag/idpourgetTextHookFrag' into 'master' 

nouvelle branche pour passage de paramètre

See merge request pdn-certic/MaX!94
parents 13567485 0126894b

max.xq

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ function max:fragmentToHTMLPage($project, $routeDoc, $id, $search as xs:string ? 
    return

        let $xml :=

            <div id="wrap-{$id}">

                {max.util:getTextHookFragment($project, $routeDoc)}

                {max.util:getTextHookFragment($project, $routeDoc, $id)}

                {max.api:getXMLByID($dbPath, $id)}

            </div>

        let $txml := max:transformEditionFragment($project, $xml, $routeDoc)
@@ -194,7 +194,7 @@ function max:getFullDocument($project, $doc, $search as xs:string ?, $focus as x 
    let $id := $xmlDoc/@xml:id

    let $xml := 

    	<div id='text'>

        	{max.util:getTextHookFragment($project, $docName)}

        	{max.util:getTextHookFragment($project, $docName, $id)}

            {$xmlDoc}

        </div>

    let $txml := max:transformEditionFragment($project, $xml, $doc)

rxq/util.xqm

+3 −2
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ declare function max.util:listContextFunction(){ 
(:----------------------------------------------------------------------------------:)





declare function max.util:getTextHookFragment($projectId, $doc){

declare function max.util:getTextHookFragment($projectId, $doc, $fragmentId){

    let $xqueryFile := max.util:maxHome()  || "editions/" || $projectId || "/" || $max.cons:TEXT_HOOK_XQUERY_FILEPATH

    return

        if(file:exists($xqueryFile))
@@ -244,7 +244,8 @@ declare function max.util:getTextHookFragment($projectId, $doc){ 
                        { 'project':$projectId,

                        'baseURI': max.util:getRelativeRootPath($projectId),

                        'dbPath':max.config:getProjectDBPath($projectId),

                        'doc': $doc

                        'doc': $doc,

                        '$fragmentId' : $fragmentId

                        }

             )