Changeset 37086 for gs3-installations


Ignore:
Timestamp:
2023-01-02T00:42:00+13:00 (16 months ago)
Author:
davidb
Message:

After a further round of culling

File:
1 edited

Legend:

Unmodified
Added
Removed

  • gs3-installations/intermuse/trunk/sites/intermuse/collect/programmes/transform/pages/document-iiif-manifest.xsl

    r37085 r37086  
    3030  <xsl:strip-space elements="*"/>
    3131  -->
    32  
    33   <!-- **** is this variable used anymore in thie file???? -->
    34   <xsl:variable name="httpDocument">
    35     <xsl:value-of select="$library_name"/>
    36     <xsl:text>/collection/</xsl:text>
    37     <xsl:value-of select="/page/pageResponse/collection/@name"/>
    38     <xsl:text>/document/</xsl:text>
    39     <xsl:value-of select="/page/pageRequest/paramList/param[@name = 'd']/@value"/> <!-- or use $docID from default/transform/pages/document.xsl ???? -->
    40   </xsl:variable>
    41  
    42  
     32   
    4333  <xsl:variable name="iiifPresentationRootIdentifier">http-greenstone://<xsl:value-of select="$site_name"/>/<xsl:value-of select="$collNameChecked"/>/<xsl:value-of select="$docID"/></xsl:variable>
    4434
     35  <!-- **** should be able to get rid of this, however at the moment it seems to be used in some supporting file !!!! -->
     36 
    4537  <xsl:variable name="bookswitch">mirador</xsl:variable>
    4638   
    … …  
    174166
    175167  <xsl:template name="sectionImage">
    176     <!-- OBSOLETE when removing forced bookswith = mirador -->
    177     <!-- make it do nothing !! -->
    178     <xsl:if test="$bookswitch != 'mirador'">
    179       <gsf:image type="screen"/>
    180     </xsl:if>
     168    <!-- don't need this template to generate anything in the IIIF-Manifest JSON case -->
    181169  </xsl:template>
    182170
    … …  
    238226    <xsl:call-template name="documentContentSimpleIIIFImage"/>
    239227    <xsl:call-template name="documentPost"/>
    240     <xsl:call-template name="documentPostMirador3"/>
     228    <!--
     229    <xsl:call-template name="documentPostMirador3OLD"/>
     230    -->
    241231  </xsl:template>
    242232
    … …  
    253243 
    254244
    255   <!-- **** improve name !!!! -->
    256   <xsl:template name="documentPostMirador3">
     245  <xsl:template name="documentPostMirador3OLD">
    257246
    258247    <!-- Container element of Mirador whose id should be passed to the instantiating call as "id" -->   
    … …  
    265254  <xsl:template name="wrappedDocumentTopLevel">
    266255
    267     <xsl:choose>
    268       <xsl:when test="$bookswitch = 'mirador'">
    269     <!-- <xsl:call-template name="documentPre"/> -->
    270     <div style="display:block;"> <!-- For embedded mirador3 viewer, used to be none  **** -->
    271       <xsl:call-template name="wrappedDocument"/> <!-- without ed=1, this template misses the binds in of documentPre and documentPost -->
    272     </div>
    273     <!-- <xsl:call-template name="documentPost"/> -->
    274       <xsl:call-template name="documentPostMirador3"/>
    275       </xsl:when>
    276 
    277       <!-- OBSOLETE when removing forced bookswith = mirador -->
    278       <xsl:otherwise>
    279     <xsl:call-template name="wrappedDocument"/> <!-- without ed=1, this template misses the binds in of documentPre and documentPost -->
    280       </xsl:otherwise>
    281 
    282     </xsl:choose>
     256    <!-- <xsl:call-template name="documentPre"/> -->
     257    <xsl:call-template name="wrappedDocument"/> <!-- without ed=1, this template misses the binds in of documentPre and documentPost -->
     258    <!-- <xsl:call-template name="documentPost"/> -->
     259    <!--
     260    <xsl:call-template name="documentPostMirador3OLD"/>
     261    -->
     262
    283263  </xsl:template>
    284264
    … …  
    286266  <!-- **** see about eliminating the following => shouldn't be needed! !!!! -->
    287267    <!-- content of a simple document. Will not be used for editing mode -->
    288     <xsl:template name="documentPostInProgress">
     268    <xsl:template name="documentPostInProgressOLD">
    289269
    290270
    … …  
    350330
    351331    <xsl:template name="wrappedSectionImage">
     332      <!-- don't need this template to generate anything in the IIIF-Manifest JSON case -->
     333    </xsl:template>
     334   
     335    <xsl:template name="wrappedSectionImageOLD">
    352336        <xsl:variable name="screenImageWidth"><gsf:metadata name="ScreenWidth"/></xsl:variable>
    353337        <xsl:variable name="screenImageHeight"><gsf:metadata name="ScreenHeight"/></xsl:variable>
    … …  
    399383
    400384    <xsl:template match="/page/pageResponse/document">
    401         <xsl:if test="$bookswitch = 'off' or ($bookswitch != 'on' and $bookswitch != 'flashxml')">
    402             <div id="bookdiv" style="visibility:hidden; height:0px; display:inline;"><xsl:text> </xsl:text></div>
    403        
    404             <div id="float-anchor" style="width: 30%; min-width:180px; float:right; margin: 0 0 10px 20px;">       
    405 
    406             <!-- add in some text just in case nothing has been added to this div-->
    407             <xsl:text> </xsl:text>
    408             </div>
    409         </xsl:if>
    410        
    411385        <!-- display the document -->
    412386        <xsl:choose>
Note: See TracChangeset for help on using the changeset viewer.