View | Details | Raw Unified | Return to bug 42140
Collapse All | Expand All

(-)src/modules/resource/sitemap.xmap (+2 lines)
Lines 62-67 Link Here
62 
            <map:parameter name="mimeType" value="{doc-info:mimeType}"/>
 62 
            <map:parameter name="mimeType" value="{doc-info:mimeType}"/>
63 
            <map:parameter name="contentLength" value="{doc-info:contentLength}"/>
 63 
            <map:parameter name="contentLength" value="{doc-info:contentLength}"/>
64 
            <map:parameter name="pubid" value="{page-envelope:publication-id}"/>
 64 
            <map:parameter name="pubid" value="{page-envelope:publication-id}"/>
65 
            <map:parameter name="lenyaPrefix" value="{global:lenyaPrefix}"/>
65 
          </map:transform>
 66 
          </map:transform>
66 
          <map:transform type="i18n"/>
 67 
          <map:transform type="i18n"/>
67 
          <map:serialize type="xml"/>
 68 
          <map:serialize type="xml"/>
Lines 87-92 Link Here
87 
          <map:parameter name="documentUrl" value="{doc-info:{page-envelope:publication-id}:{page-envelope:area}:{page-envelope:document-id}:{page-envelope:document-language}:documentUrl}"/>
 88 
          <map:parameter name="documentUrl" value="{doc-info:{page-envelope:publication-id}:{page-envelope:area}:{page-envelope:document-id}:{page-envelope:document-language}:documentUrl}"/>
88 
          <map:parameter name="sourceExtension" value="{doc-info:{page-envelope:publication-id}:{page-envelope:area}:{page-envelope:document-id}:{page-envelope:document-language}:sourceExtension}"/>
 89 
          <map:parameter name="sourceExtension" value="{doc-info:{page-envelope:publication-id}:{page-envelope:area}:{page-envelope:document-id}:{page-envelope:document-language}:sourceExtension}"/>
89 
          <map:parameter name="pubid" value="{page-envelope:publication-id}"/>
 90 
          <map:parameter name="pubid" value="{page-envelope:publication-id}"/>
91 
          <map:parameter name="lenyaPrefix" value="{global:lenyaPrefix}"/>
90 
        </map:transform>
 92 
        </map:transform>
91 
        <map:transform type="i18n"/>
 93 
        <map:transform type="i18n"/>
92 
        <map:serialize type="xml"/>
 94 
        <map:serialize type="xml"/>
(-)src/modules/resource/xslt/resource2xhtml.xsl (-2 / +2 lines)
Lines 28-38 Link Here
28 
  <xsl:param name="mimeType"/>
 28 
  <xsl:param name="mimeType"/>
29 
  <xsl:param name="documentUrl"/>
 29 
  <xsl:param name="documentUrl"/>
30 
  <xsl:param name="sourceExtension"/>
 30 
  <xsl:param name="sourceExtension"/>
31 
  <xsl:param name="lenyaPrefix"/>
31
32
32 
  <xsl:variable name="mediaUrl" select="concat(substring-before($documentUrl, '.html'), '.', $sourceExtension)"/>
 33 
  <xsl:variable name="mediaUrl" select="concat(substring-before($documentUrl, '.html'), '.', $sourceExtension)"/>
33
34
34 
  <xsl:variable name="imageprefix"
 35 
  <xsl:variable name="imageprefix" select="concat($root, '/', $lenyaPrefix, '/modules/resource')"/>
35 
    select="concat($context-prefix,'/',$pubid,'/modules/resource')"/>
36 
  <xsl:variable name="nodeid"
 36 
  <xsl:variable name="nodeid"
37 
    select="concat($context-prefix,$root,$documentParent)"/>
 37 
    select="concat($context-prefix,$root,$documentParent)"/>
38
38
(-)src/webapp/global-sitemap.xmap (+21 lines)
Lines 83-88 Link Here
83 
           | These values are inherited into sub-sitemaps and can
 83 
           | These values are inherited into sub-sitemaps and can
84 
           | be extended there.
 84 
           | be extended there.
85 
           +-->
 85 
           +-->
86 
      <lenyaPrefix>lenya</lenyaPrefix>
86 
    </global-variables>
 87 
    </global-variables>
87 
  </map:component-configurations>
 88 
  </map:component-configurations>
88 

          89
          

        

  

    
      
            Lines 289-294
          
      
      
        Link Here
      
    
  

        

          289
          
        <map:mount uri-prefix="{1}/modules/{2}/" src="fallback://lenya/modules/{2}/sitemap.xmap" check-reload="true" reload-method="synchron"/>

          290
          
        <map:mount uri-prefix="{1}/modules/{2}/" src="fallback://lenya/modules/{2}/sitemap.xmap" check-reload="true" reload-method="synchron"/>

        

        

          290
          
        

          291
          
        

        

        

          291
          
      </map:match>      

          292
          
      </map:match>      

        

            

              
              
              293
              

            

            

              294
              
      <!-- {pub-id}/{area}/{lenyaPrefix}/modules/{module-id}/... -->

            

            

              295
              
      <map:match pattern="*/*/*/modules/*/**">

            

            

              296
              
        

            

            

              297
              
        <map:select type="parameter">

            

            

              298
              
          <map:parameter name="parameter-selector-test" value="{3}"/>

            

            

              299
              
          <map:when test="{global:lenyaPrefix}">

            

            

              300
              
            <map:select type="resource-exists">

            

            

              301
              
              <!-- resource exists - serve statically -->

            

            

              302
              
              <map:when test="fallback://lenya/modules/{4}/resources/{5}">

            

            

              303
              
                <map:mount uri-prefix="{1}/{2}/{3}/modules/" src="fallback://lenya/module-resources.xmap" check-reload="true" reload-method="synchron" pass-through="true"/>

            

            

              304
              
              </map:when>

            

            

              305
              
            </map:select>

            

            

              306
              
            <!-- resource doesn't exist or not handled by lenya/module-resources.xmap - delegate to module -->

            

            

              307
              
            <map:mount uri-prefix="{1}/{2}/{3}/modules/{4}/" src="fallback://lenya/modules/{4}/sitemap.xmap" check-reload="true" reload-method="synchron"/>

            

            

              308
              
          </map:when>

            

            

              309
              
        </map:select>

            

            

              310
              
        

            

            

              311
              
      </map:match>      

            

            

              312
              
      

            

        

          292
          
    </map:pipeline>

          313
          
    </map:pipeline>

        

        

          293
          
    

          314
          
    

        

        

          294
          
   <!-- Internal usecases -->

          315
          
   <!-- Internal usecases -->

        






  

  Return to bug 42140