Changeset 26031

Show
Ignore:
Timestamp:
26.07.2012 20:45:17 (7 years ago)
Author:
ak19
Message:

1. Trying to reintroduce use of mdoffset when pos=offset, for when using associated files. 2. The alternative for expanding gsf:equivlinkgs3 is shorter and less involved. As this worked equally well when trying out the DSpace tutorial with GS3, the simpler equivlinkgs3 template is now active and the more complicated one is commented out. Once I try the associated files tutorial with GS3, this change may become more definite.

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java

    r26026 r26031  
    110110            String select = elem.getAttribute("select"); 
    111111            String sep = elem.getAttribute("separator"); 
    112             if (!pos.equals("")) 
     112 
     113            if(pos.equals("offset")) { // offset when requested to use mdoffset 
     114                metadata.append("offset"); 
     115                metadata.append(GSConstants.META_RELATION_SEP);              
     116            } 
     117            else if (!pos.equals("")) 
    113118            { 
    114119                metadata.append("pos" + pos); // first, last or indexing number 
    115120                metadata.append(GSConstants.META_RELATION_SEP); 
    116121            } 
     122 
    117123            if (!select.equals("")) 
    118124            { 
  • main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl

    r26023 r26031  
    126126     
    127127  <!-- calls a template in gslib.xsl in order to avoid xsl vs xslt issue --> 
    128   <xsl:template match="gsf:equivlinkgs3"> 
     128  <!--<xsl:template match="gsf:equivlinkgs3"> 
    129129    <xslt:call-template name="equivDocLinks"> 
    130130      <xslt:with-param name="count" select="0"/> 
    131131    </xslt:call-template> 
    132   </xsl:template> 
     132  </xsl:template>--> 
    133133 
    134134  <!-- Another way (also works with DSpace tutorial): build all the equivalent document links for the current document in one go. No looping necessary: handled in function call. --> 
    135   <!--<xsl:template match="gsf:equivlinkgs3"> 
     135  <xsl:template match="gsf:equivlinkgs3"> 
    136136    <xslt:variable name="docicon" select="metadataList/metadata[contains(@name, 'equivDocIcon')]"/>  
    137137    <xslt:variable name="docStartlink" select="metadataList/metadata[contains(@name, 'all_*,*_equivDocLink')]"/>     
     
    140140    <xslt:variable name="equivDocLinks" select="java:org.greenstone.gsdl3.util.XSLTUtil.getEquivDocLinks(',',$docicon, $docStartlink, $docEndlink, ' ')" /> 
    141141    <xslt:value-of disable-output-escaping="yes" select="$equivDocLinks"/> 
    142   </xsl:template>--> 
     142  </xsl:template> 
    143143 
    144144<!--