Changeset 26031 for main

Timestamp:

2012-07-26T20:45:17+12:00 (12 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:

• src/java/org/greenstone/gsdl3/action/Action.java (modified) (1 diff)
• web/interfaces/default/transform/config_format.xsl (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java

@@ -110 +110 @@
             String select = elem.getAttribute("select");
             String sep = elem.getAttribute("separator");
-            if (!pos.equals(""))
+
+            if(pos.equals("offset")) { // offset when requested to use mdoffset
+                metadata.append("offset");
+                metadata.append(GSConstants.META_RELATION_SEP);             
+            }
+            else if (!pos.equals(""))
             {
                 metadata.append("pos" + pos); // first, last or indexing number
                 metadata.append(GSConstants.META_RELATION_SEP);
             }
+
             if (!select.equals(""))
             {

main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl

@@ -126 +126 @@
     
   <!-- calls a template in gslib.xsl in order to avoid xsl vs xslt issue -->
-  <xsl:template match="gsf:equivlinkgs3">
+  <!--<xsl:template match="gsf:equivlinkgs3">
     <xslt:call-template name="equivDocLinks">
       <xslt:with-param name="count" select="0"/>
     </xslt:call-template>
-  </xsl:template>
+  </xsl:template>-->
 
   <!-- 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. -->
-  <!--<xsl:template match="gsf:equivlinkgs3">
+  <xsl:template match="gsf:equivlinkgs3">
     <xslt:variable name="docicon" select="metadataList/metadata[contains(@name, 'equivDocIcon')]"/> 
     <xslt:variable name="docStartlink" select="metadataList/metadata[contains(@name, 'all_*,*_equivDocLink')]"/>    
@@ -140 +140 @@
     <xslt:variable name="equivDocLinks" select="java:org.greenstone.gsdl3.util.XSLTUtil.getEquivDocLinks(',',$docicon, $docStartlink, $docEndlink, ' ')" />
     <xslt:value-of disable-output-escaping="yes" select="$equivDocLinks"/>
-  </xsl:template>-->
+  </xsl:template>
 
 <!--