Commit d28eb877 authored by Orderic-Vital Pain's avatar Orderic-Vital Pain
Browse files

Normalisation des variables FILEPATH/FILENAME

parent 9141ff1b

rxq/config.xqm

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ declare function max.config:getXSLTAddons($project, $routeDoc) as xs:string *{ 
                       return if(file:exists($xsltFile))

                                 then $xsltFile

                                 else ()

  let $textHookPath := file:parent(file:parent(static-base-uri())) || "editions/" || $project || "/ui/xsl/" || $max.cons:TEXT_HOOK_XSL_FILEPATH

  let $textHookPath := file:parent(file:parent(static-base-uri())) || "editions/" || $project || "/ui/xsl/" || max.config:getXMLFormat($project) ||'/'|| $max.cons:TEXT_HOOK_XSL_FILENAME

  let $textHook := if(file:exists($textHookPath)) then $textHookPath else()

  return

    (

rxq/cons.xqm

+3 −3
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ declare variable $max.cons:METADATA_TOC_QUERY_FILEPATH := 'xq/metadata.xq'; 
declare variable $max.cons:TEXT_HOOK_XQUERY_FILEPATH := 'xq/text_hook.xq';



(: toc xsl :)

declare variable $max.cons:TOC_XSL_FILEPATH := "toc.xsl";

declare variable $max.cons:TOC_XSL_FILENAME := "toc.xsl";



(: document toc xsl :)

declare variable $max.cons:DOCUMENT_TOC_XSL_FILEPATH := "document_toc.xsl";

declare variable $max.cons:DOCUMENT_TOC_XSL_FILENAME := "document_toc.xsl";



(: nav bar xsl :)

declare variable $max.cons:NAV_BAR_XSL_FILEPATH := "nav_bar.xsl";
@@ -53,7 +53,7 @@ declare variable $max.cons:NAV_BAR_XSL_FILEPATH := "nav_bar.xsl"; 
declare variable $max.cons:DOCUMENT_TITLE_XSL_FILEPATH := "document_title.xsl";



(: text xsl :)

declare variable $max.cons:TEXT_HOOK_XSL_FILEPATH := "text_hook.xsl";

declare variable $max.cons:TEXT_HOOK_XSL_FILENAME := "text_hook.xsl";



(: document title xsl :)

declare variable $max.cons:FO_XSL_FILEPATH := "2fo.xsl";

rxq/util.xqm

+4 −4
Original line number Diff line number Diff line
@@ -256,10 +256,10 @@ declare function max.util:getProjectMenuXSL($projectId) { 
declare function max.util:getProjectTOCXSL($projectId) {



    let $xmlFormat := max.config:getXMLFormat($projectId)

    let $xsltFile := max.util:getResourceFilePath($projectId, "/ui/xsl/"|| $max.cons:TOC_XSL_FILEPATH)

    let $xsltFile := max.util:getResourceFilePath($projectId, "/ui/xsl/"|| $max.cons:TOC_XSL_FILENAME)

    return if(file:exists($xsltFile))

    then $xsltFile

    else max.util:getResourceFilePath($projectId, "/ui/xsl/core/" || $max.cons:TOC_XSL_FILEPATH)

    else max.util:getResourceFilePath($projectId, "/ui/xsl/core/" || $max.cons:TOC_XSL_FILENAME)

};
@@ -317,10 +317,10 @@ declare function max.util:getDocumentTitleXQueryFile($xmlFormat as xs:string){ 
 Returns project's doc toc XSL

:)

declare function max.util:getProjectDocumentTOCXSL($projectId){

    let $xsltFile := file:parent(file:parent(static-base-uri())) || "editions/" || $projectId || "/ui/xsl/"  || $max.cons:DOCUMENT_TOC_XSL_FILEPATH

    let $xsltFile := file:parent(file:parent(static-base-uri())) || "editions/" || $projectId || "/ui/xsl/"  || max.config:getXMLFormat($projectId) ||'/'|| $max.cons:DOCUMENT_TOC_XSL_FILENAME

    return if(file:exists($xsltFile))

    then $xsltFile

    else file:parent(file:parent(static-base-uri())) || "ui/xsl/" || max.config:getXMLFormat($projectId) ||'/'|| $max.cons:DOCUMENT_TOC_XSL_FILEPATH

    else file:parent(file:parent(static-base-uri())) || "ui/xsl/" || max.config:getXMLFormat($projectId) ||'/'|| $max.cons:DOCUMENT_TOC_XSL_FILENAME

};