Commit 943e0e6c authored by dje's avatar dje
Browse files

suppression variable de config reverse proxy

parent e534ee73

configuration/configuration.dist.xml

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

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

  <basexBaseURI/>

  <editions> 

  </editions>

</configuration>

plugins/breadcrumb/breadcrumb.xqm

+5 −2
Original line number Diff line number Diff line
@@ -36,7 +36,10 @@ declare %private function max.plugin.breadcrumb:getBreadcrumbTop($project){ 
};







(:

Ugly fix.

max.config:getBaseURI() is bad when URL contains spaces (caused by rest:base-uri())

:)

declare%private function max.plugin.breadcrumb:getMaxBaseURI(){

  substring-before(max.config:getReversedProxyBaseURI(),"/plugins") || "/editions"

  substring-before(max.config:getBaseURI(),"/editions") || "/editions"

};
 
 No newline at end of file

plugins/img_viewer/img_viewer.xqm

+12 −92
Original line number Diff line number Diff line 
(:

Copyright Université de Caen Normandie

Esplanade de la paix

CS 14032

14032 Caen CEDEX 5

Contributeur : Jérôme Chauveau,

2016



jerome.chauveau@unicaen.fr



Ce logiciel est un programme informatique servant à [rappeler les

caractéristiques techniques de votre logiciel]. 



Ce logiciel est régi par la licence CeCILL-B soumise au droit français et

respectant les principes de diffusion des logiciels libres. Vous pouvez

utiliser, modifier et/ou redistribuer ce programme sous les conditions

de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA 

sur le site "http://www.cecill.info".



En contrepartie de l'accessibilité au code source et des droits de copie,

de modification et de redistribution accordés par cette licence, il n'est

offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons,

seule une responsabilité restreinte pèse sur l'auteur du programme,  le

titulaire des droits patrimoniaux et les concédants successifs.



A cet égard  l'attention de l'utilisateur est attirée sur les risques

associés au chargement,  à l'utilisation,  à la modification et/ou au

développement et à la reproduction du logiciel par l'utilisateur étant 

donné sa spécificité de logiciel libre, qui peut le rendre complexe à 

manipuler et qui le réserve donc à des développeurs et des professionnels

avertis possédant  des  connaissances  informatiques approfondies.  Les

utilisateurs sont donc invités à charger  et  tester  l'adéquation  du

logiciel à leurs besoins dans des conditions permettant d'assurer la

sécurité de leurs systèmes et ou de leurs données et, plus généralement, 

à l'utiliser et l'exploiter dans les mêmes conditions de sécurité. 



Le fait que vous puissiez accéder à cet en-tête signifie que vous avez 

pris connaissance de la licence CeCILL-B, et que vous en avez accepté les

termes.

=========================================================================

Copyright Université de Caen Normandie

Esplanade de la paix

CS 14032

14032 Caen CEDEX 5

Contributor : Jérôme Chauveau,

2016



jerome.chauveau@unicaen.fr



This software is a computer program whose purpose is to [describe

functionalities and technical features of your software].



This software is governed by the CeCILL-B license under French law and

abiding by the rules of distribution of free software.  You can  use, 

modify and/ or redistribute the software under the terms of the CeCILL-B

license as circulated by CEA, CNRS and INRIA at the following URL

"http://www.cecill.info". 



As a counterpart to the access to the source code and  rights to copy,

modify and redistribute granted by the license, users are provided only

with a limited warranty  and the software's author,  the holder of the

economic rights,  and the successive licensors  have only  limited

liability. 



In this respect, the user's attention is drawn to the risks associated

with loading,  using,  modifying and/or developing or reproducing the

software by the user in light of its specific status of free software,

that may mean  that it is complicated to manipulate,  and  that  also

therefore means  that it is reserved for developers  and  experienced

professionals having in-depth computer knowledge. Users are therefore

encouraged to load and test the software's suitability as regards their

requirements in conditions enabling the security of their systems and/or 

data to be ensured and,  more generally, to use and operate it in the 

same conditions as regards security. 



The fact that you are presently reading this means that you have had

knowledge of the CeCILL-B license and that you accept its terms.

:)

(: For conditions of distribution and use, see the accompanying legal.txt file. :)



module namespace max.plugin.img_viewer = 'pddn/max/plugin/img_viewer';

import module namespace max.config = 'pddn/max/config' at '../../rxq/config.xqm';
@@ -90,17 +14,17 @@ declare 
%rest:path("/plugins/img_viewer/{$projectId}/{$path=.+}/{$img}")

function max.plugin.img_viewer:searchPage($projectId, $path, $img){



  let $tileSourcesPath := max.config:getReversedProxyBaseURI() 

  let $tileSourcesPath := max.config:getBaseURI() 

                            ||"/"|| $projectId ||"/"|| $path ||"/"|| $img ||".dzi"

  return 

  <div id='img_viewer'>

    <div id="openseadragon1" style="width: 800px; height: 600px;"></div>

    <script src="{max.config:getReversedProxyBaseURI() || '/ui/js/lib/openseadragon/built-openseadragon/openseadragon/openseadragon.min.js'}">

    <script src="{max.config:getBaseURI() || '/'||$projectId|| '/core/ui/js/lib/openseadragon/built-openseadragon/openseadragon/openseadragon.min.js'}">

    </script>

    <script type="text/javascript">{

      "var viewer = OpenSeadragon({

          id: 'openseadragon1',

          prefixUrl: '"||max.config:getReversedProxyBaseURI()||"/ui/js/lib/openseadragon/built-openseadragon/openseadragon/images/',

          prefixUrl: '"||max.config:getBaseURI()||'/'||$projectId||"/core/ui/js/lib/openseadragon/built-openseadragon/openseadragon/images/',

          tileSources: '" || $tileSourcesPath || "'

      });"}

    </script>
@@ -120,13 +44,13 @@ function max.plugin.img_viewer:simpleGallery($projectId, $path){ 
                                           

  let $tileSources :=

  for $img in doc($projectId || '/' || $path)//*:figure

    return "{type: 'image',url: '"||max.config:getReversedProxyBaseURI() ||"/"||$projectId||"/ui/images/"|| $img/*:graphic/@url||"'},"  

    return "{type: 'image',url: '"||max.config:getBaseURI() ||"/"||$projectId||"/ui/images/"|| $img/*:graphic/@url||"'},"  

  return 

  <html>

    <head>

      <script src="{max.config:getReversedProxyBaseURI() || '/ui/js/lib/jquery/dist/jquery.min.js'}">

      <script src="{max.config:getBaseURI() || '/'||$projectId||'/core/ui/js/lib/jquery/dist/jquery.min.js'}">

      </script>

      <script src="{max.config:getReversedProxyBaseURI() || '/ui/js/lib/openseadragon/built-openseadragon/openseadragon/openseadragon.min.js'}">

      <script src="{max.config:getBaseURI() || '/'||$projectId||'/core/ui/js/lib/openseadragon/built-openseadragon/openseadragon/openseadragon.min.js'}">

      </script>

    </head>

    <div id='img_viewer'>
@@ -136,7 +60,7 @@ function max.plugin.img_viewer:simpleGallery($projectId, $path){ 
        <script type="text/javascript">{

      "var viewer = OpenSeadragon({

          id: 'openseadragon',

          prefixUrl: '"||max.config:getReversedProxyBaseURI()||"/ui/js/lib/openseadragon/built-openseadragon/openseadragon/images/',

          prefixUrl: '"||max.config:getBaseURI()||'/'||$projectId||"/core/ui/js/lib/openseadragon/built-openseadragon/openseadragon/images/',

          tileSources: ["||string-join($tileSources,'')||"],

        sequenceMode: true,

        showReferenceStrip: true,
@@ -154,20 +78,16 @@ declare 
%output:method("html")

%rest:path("/plugins/img_viewer/single_image/{$projectId}/{$img=.+}")

function max.plugin.img_viewer:single_image($projectId, $img){

let $imgPath:= max.config:getReversedProxyBaseURI() 

                            ||"/"|| $projectId || "/"|| $img





let $imgPath:= max.config:getBaseURI() ||"/"|| $projectId || "/"|| $img

  return 



  <div id='img_viewer'>

    <div id="openseadragon1" style="width: 800px; height: 600px;"></div>

    <script src="{max.config:getReversedProxyBaseURI() || '/ui/js/lib/openseadragon/built-openseadragon/openseadragon/openseadragon.min.js'}">

    <script src="{max.config:getBaseURI() || '/' || $projectId ||'/core/ui/js/lib/openseadragon/built-openseadragon/openseadragon/openseadragon.min.js'}">

    </script>

    <script type="text/javascript">{

      "var viewer = OpenSeadragon({

          id: 'openseadragon1',

          prefixUrl: '"||max.config:getReversedProxyBaseURI()||"/ui/js/lib/openseadragon/built-openseadragon/openseadragon/images/',

          prefixUrl: '"||max.config:getBaseURI()||"/"|| $projectId || "/core/ui/js/lib/openseadragon/built-openseadragon/openseadragon/images/',

          tileSources: {type:'image', url:'"||$imgPath||"'}

      });"}

    </script>

plugins/search/search.xqm

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ function max.plugin.search:plap($project,$search, $docs){ 
      let $hits := 

        for $hit in ft:mark($h[.//text() contains text {$search}]) 

          let $path := replace($docPath, $dbPath||"/", '')

          let $b2txt:= max.config:getReversedProxyBaseURI() ||"/"|| $project || "/" ||$path||"/"|| string($h/@xml:id)

          let $b2txt:= max.config:getBaseURI() ||"/"|| $project || "/" ||$path||"/"|| string($h/@xml:id)

          return <div class='hit'>

                   <span class='search-b2txt'><a href='{$b2txt}'>{string($h/@xml:id)}</a></span>

                   <div>{$hit}</div>

rxq/config.xqm

+6 −11
Original line number Diff line number Diff line
@@ -71,22 +71,17 @@ declare function max.config:isIgnored( 
};



(:

Returns BaseX baseURI when behind a reverse proxy

Returns BaseX baseURI

:)

declare function max.config:getReversedProxyBaseURI() as xs:string{

  if(doc($max.config:CONFIGURATION_FILE)/configuration/basexBaseURI/text())

  then doc($max.config:CONFIGURATION_FILE)/configuration/basexBaseURI/text()

  else rest:base-uri() || $max.cons:BASE_DIR

declare function max.config:getBaseURI() as xs:string{

   rest:base-uri() || $max.cons:BASE_DIR

};



(:

Returns BaseX baseURI when behind a reverse proxy

Returns BaseX plugins baseURI 

:)

declare function max.config:getPluginsBaseURI() as xs:string{

  if(doc($max.config:CONFIGURATION_FILE)/configuration/basexBaseURI/text())

  (:then doc($max.config:CONFIGURATION_FILE)/configuration/basexBaseURI/text() || $max.cons:PLUGINS_BASE_DIR :)

  then "/" || tokenize(doc($max.config:CONFIGURATION_FILE)/configuration/basexBaseURI/text(),'/')[2] || $max.cons:PLUGINS_BASE_DIR

  else rest:base-uri() || $max.cons:PLUGINS_BASE_DIR

  rest:base-uri() || $max.cons:PLUGINS_BASE_DIR

};



(:
@@ -242,7 +237,7 @@ declare function max.config:getXSLTParams($project, $routeDoc){ 
  return map:merge(($alignParams,

                   $pluginsParams, 

                   map{

                     'baseuri' : max.config:getReversedProxyBaseURI(),

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

                     'pluginsuri' : max.config:getPluginsBaseURI(),

                     'route': if($routeDoc) then $routeDoc else '',

                     'project' : $project}))