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

rollback plugins : doivent être déclarés ds la conf d'une édition

parent 7fda3659

max.xq

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ declare 
%output:encoding("UTF-8")

%rest:path("/{$project}/checkplugins.html")

function max:checkPlugin($project){

    let $plugins := max.config:getEnabledPluginNames()

    let $plugins := max.config:getEnabledPluginNames($project)

    return

        if (not($plugins))

        then <div id='pluginsReport'>Aucun plugin pour {$project}.</div>
@@ -328,7 +328,7 @@ function max:buildSitemap($project){ 
declare %private function max:invokePluginXQueries($project, $routeDoc, $id){

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

    let $pluginsHTML :=

        for $pluginName in max.config:getEnabledPluginNames()

        for $pluginName in max.config:getEnabledPluginNames($project)

        let $pluginXQ := file:parent(static-base-uri())||'/plugins-enabled/' || $pluginName || '/'|| $pluginName ||'.xq'

            return if(file:exists($pluginXQ))

            then

rxq/config.xqm

+6 −5
Original line number Diff line number Diff line
@@ -41,10 +41,11 @@ declare function max.config:getProjectPrettyName($projectId){ 
};



(:returns enabled plugin name list:)

declare function max.config:getEnabledPluginNames(){

    let $pluginsFolder := file:parent(file:parent(static-base-uri())) || $max.cons:PLUGIN_FOLDER_NAME

    for $f in file:list($pluginsFolder,false())

    return if(ends-with($f,'/')) then replace($f,'/','') else ()

declare function max.config:getEnabledPluginNames($projectId){

    doc($max.config:CONFIGURATION_FILE)//edition[@xml:id=$projectId]//plugin/@name

    (:    let $pluginsFolder := file:parent(file:parent(static-base-uri())) || $max.cons:PLUGIN_FOLDER_NAME:)

(:    for $f in file:list($pluginsFolder,false()):)

(:    return if(ends-with($f,'/')) then replace($f,'/','') else ():)

};
@@ -157,7 +158,7 @@ declare function max.config:getXMLFormat($project as xs:string){ 
declare function max.config:getXSLTAddons($project, $routeDoc) as xs:string *{

  (:if route needs alignment, alignment.xsl is returned too :)

  let $alignXSL := if(max.config:isAlignedRoute($routeDoc)) then $max.cons:ALIGNMENT_XSL else()

  let $pluginsXSL := for $plugin in max.config:getEnabledPluginNames()

  let $pluginsXSL := for $plugin in max.config:getEnabledPluginNames($project)

                       let $xsltFile := file:parent(file:parent(static-base-uri())) || $max.cons:PLUGIN_FOLDER_NAME || "/" || $plugin || "/" || $plugin || ".xsl"

                       return if(file:exists($xsltFile))

                                 then $xsltFile

rxq/html.xqm

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ as element(script)* 


    let $pluginsFolder := file:parent(file:parent(static-base-uri())) || $max.cons:PLUGIN_FOLDER_NAME

    let $pluginsJS :=

        for $plugin in max.config:getEnabledPluginNames()

        for $plugin in max.config:getEnabledPluginNames($projectId)

            for $file in file:list($pluginsFolder || "/" || $plugin, true(), $plugin||".js")

            let $publicjs := max.config:getBaseURI() || "plugins/" || $plugin || '/' ||

            substring-before($file, ".") || ".js"
@@ -163,7 +163,7 @@ as element(link)* 
        else ()



    let $pluginsCSS :=

        for $pluginAddon in max.config:getEnabledPluginNames()

        for $pluginAddon in max.config:getEnabledPluginNames($projectId)

        let $pluginDirectory := $max.cons:PLUGIN_FOLDER_NAME || "/" || $pluginAddon

        let $cssFile := file:parent(file:parent(static-base-uri())) || $pluginDirectory || '/' || $pluginAddon || '.css'

        return if (file:exists($cssFile))

rxq/util.xqm

+7 −7
Original line number Diff line number Diff line
@@ -146,13 +146,13 @@ declare function max.util:getDocTitle($dbName, $docPath, $xmlFormat){ 
        xquery:invoke($docTitleQueryFile,map {'documentPath': $dbName ||'/'|| $docPath})

};



declare function max.util:teiDocTitle($dbName, $docPath){

    if(doc($dbName || '/' || $docPath)/tei:teiCorpus)

    then

        doc($dbName || '/' || $docPath)/tei:teiCorpus/tei:teiHeader/tei:fileDesc/tei:titleStmt

    else

        doc($dbName || '/' || $docPath)/tei:TEI/tei:teiHeader/tei:fileDesc/tei:titleStmt

};

(:declare function max.util:teiDocTitle($dbName, $docPath){:)

(:    if(doc($dbName || '/' || $docPath)/tei:teiCorpus):)

(:    then:)

(:        doc($dbName || '/' || $docPath)/tei:teiCorpus/tei:teiHeader/tei:fileDesc/tei:titleStmt:)

(:    else:)

(:        doc($dbName || '/' || $docPath)/tei:TEI/tei:teiHeader/tei:fileDesc/tei:titleStmt:)

(:};:)





declare function max.util:maxHome(){

ui/xsl/tei/tei2fo.xsl

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ 


    <xsl:template match="tei:note">

        <xsl:variable name="number"

                      select="count((//tei:note[@xml:id=current()/@xml:id])[1]/preceding::tei:note[not(@xml:id=../preceding::tei:note/@xml:id)]) + 1"/>

                      select="count(./preceding::tei:note) + 1"/>



        <!-- Variable pour ajuster l'alignement des notes de bas de page après le numéro sans doute à déplacer dans le fichier de styles -->

        <xsl:variable name="noteMarkMarginRight">