Commit 92aba31f authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

Suppression du baseURI en absolu. Les imports des assets sont en relatifs, la... 

Suppression du baseURI en absolu. Les imports des assets sont en relatifs, la définition de <baseURI/> dans la config disparaît.
parent 8da2a63f

configuration/configuration.dist.xml

+1 −2
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<configuration xmlns:xi="http://www.w3.org/2001/XInclude">

  <baseURI></baseURI>

  <editions>

  </editions>

</configuration>

max.xq

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ declare %private function max:invokePluginXQueries($project, $routeDoc, $id){ 
                xquery:eval($pluginXQ,

                        map

                        {

                        'baseURI' : max.config:getBaseURI(),

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

                        'dbPath' : $dbPath,

                        'project' : $project,

                        'doc' : $routeDoc,

plugins/ead_search/ead_search.xqm

+3 −3
Original line number Diff line number Diff line
@@ -107,13 +107,13 @@ function max.plugin.ead_search:searchPage($project){ 
            <div class="boutonSearch"><button onclick="window.eadSearch.runEadSearch()">Rechercher</button></div>

            <div id='searchLoading'>{max.i18n:getText($project,'search.loading')}</div>

            <div id="ead-search-results"></div>

            <script type="text/javascript" src="{max.config:getBaseURI() ||'plugins/ead_search/ead_search_page.js'}"></script>

            <script type="text/javascript" src="{max.util:getRelativeRootPath($project) ||'plugins/ead_search/ead_search_page.js'}"></script>

        </section>



    let $html := max.html:render($project, 'rechercher', $datalists)

    let $htmlWithCSS :=

        copy $c := $html

        modify insert node <link rel="stylesheet" type="text/css" href="{max.config:getBaseURI() ||'plugins/ead_search/ead_search_page.css'}"/> into $c//*:head[1]

        modify insert node <link rel="stylesheet" type="text/css" href="{max.util:getRelativeRootPath($project) ||'plugins/ead_search/ead_search_page.css'}"/> into $c//*:head[1]

        return $c

    return $htmlWithCSS

};
@@ -210,7 +210,7 @@ declare %private function max.plugin.ead_search:formatSearchResult($c as node(), 
        let $baseuriXml := base-uri($c)

        let $baseuri := substring-after(base-uri($id),$dbPath)

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

        let $req := <div><a href='{max.config:getBaseURI()}{$project}{$baseuri}/{$id}.html'>{$i/ancestor-or-self::*:c/*:did}</a><section>{$i/ancestor-or-self::*:c/*:did}</section></div>

        let $req := <div><a href='{max.util:getRelativeRootPath($project) }{$baseuri}/{$id}.html'>{$i/ancestor-or-self::*:c/*:did}</a><section>{$i/ancestor-or-self::*:c/*:did}</section></div>

        return 

            if (file:exists($xslRes)) 

            then

plugins/ead_search/ead_search_page.js

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class EadSearchPlugin { 
                let indexName = e.dataset.index;

                let q = e.value;

                if (q.trim() !== '') {

                    let url = baseURI + projectId + '/search-index/' + indexName + '.json?q=.*' + q + '.*';

                    let url = baseURI + 'search-index/' + indexName + '.json?q=.*' + q + '.*';

                    url += e.dataset.attr ? ('&attr=' + e.dataset.attr + '&value=' + e.dataset.value) : '';



                    let datalist = document.getElementById(indexId);
@@ -88,7 +88,7 @@ class EadSearchPlugin { 
        }

        let inputTarget = document.getElementById(tagId + '-input');

        let tagName = inputTarget.dataset.index;

        let url = baseURI + projectId + '/search-index/' + tagName + '.json?page=' + pageNumber;

        let url = baseURI + 'search-index/' + tagName + '.json?page=' + pageNumber;

        url += inputTarget.dataset.attr ? ('&attr=' + inputTarget.dataset.attr + '&value=' + inputTarget.dataset.value) : '';

        if (this.currentFirstLetterFilter)

            url += "&q=^" + this.currentFirstLetterFilter
@@ -215,7 +215,7 @@ class EadSearchPlugin { 
            filtered = true;

        })



        query = baseURI + projectId + '/' + query;

        query = baseURI + query;



        if (this.withDatesFilter) {

            //date
@@ -249,7 +249,7 @@ class EadSearchPlugin { 
        }

        document.querySelector("#searchLoading").style.display = "block";

        let query = 'resultatsSimple.html?search=' + simpleSearch;

        query = baseURI + projectId + '/' + query;

        query = baseURI + query;



        fetch(query).then(res => res.text()).then(text => {

            document.getElementById('ead-search-results').innerHTML = text

plugins/img_viewer/img_viewer.xsl

+5 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
                    <xsl:value-of select="@facs"/>

                </xsl:when>

                <xsl:otherwise>

                    <xsl:value-of select="concat($baseuri,$project,'/',$imagesRepository,@facs)"/>

                    <xsl:value-of select="concat($baseuri,$imagesRepository,@facs)"/>

                </xsl:otherwise>

            </xsl:choose>

        </xsl:variable>
@@ -55,7 +55,7 @@ 
        </xsl:choose>

      </xsl:variable>

      <xsl:variable name="href">

        <xsl:value-of select="concat($baseuri,$project,'/',$imagesRepository ,$link)"/>

        <xsl:value-of select="concat($baseuri,$imagesRepository ,$link)"/>

      </xsl:variable>

      <xsl:variable name="id">

        <xsl:value-of select="generate-id(.) "/>
@@ -63,7 +63,7 @@ 
      <img class="viewable img_viewer_link" id="{$id}">

        <xsl:attribute name="onclick">MAX.plugins['img_viewer'].openImageInDialog('<xsl:value-of select="$href"/>')</xsl:attribute>

        <xsl:attribute name="src">

          <xsl:value-of select="concat($baseuri,$project,'/',$imagesRepository,$link)"/>

          <xsl:value-of select="concat($baseuri,$imagesRepository,$link)"/>

        </xsl:attribute>

      </img>

    </xsl:template>
@@ -80,13 +80,13 @@ 
    <xsl:template match="ead:daoloc">

      <img class="img_viewer_link">

        <xsl:attribute name="src">

          <xsl:value-of select="concat($baseuri,$project,'/',$imagesRepository)"/>

          <xsl:value-of select="concat($baseuri,$imagesRepository)"/>

          <xsl:value-of select="@*:href"/>

        </xsl:attribute>

        <xsl:attribute name="href">#</xsl:attribute>

        <xsl:attribute name="onclick">

          <xsl:text>MAX.plugins['img_viewer'].openImagesInDialog('</xsl:text>

          <xsl:value-of select="concat($baseuri,$project,'/',$imagesRepository)"/>

          <xsl:value-of select="concat($baseuri,$imagesRepository)"/>

          <xsl:value-of select="@*:href"/>

          <xsl:text>')</xsl:text>

        </xsl:attribute>