Changeset 32644 for main/trunk/greenstone3

Timestamp:

2018-12-03T13:03:10+13:00 (5 years ago)

Author:

kjdon

Message:

using restful URLs for groups now too. eg library/group/MyGroup. group hierarchy is now in url, for subgroups, and for collections inside a group. eg library/group/TopGroup/SubGroup, and library/collection/MyGroup/democol.

File:

• main/trunk/greenstone3/web/interfaces/default/transform/gslib.xsl (modified) (2 diffs)

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

@@ -270 +270 @@
   <xsl:template name="groupHref">
     <xsl:param name="path"/>
-    <xsl:value-of select="$library_name"/>?a=p&amp;sa=home&amp;group=<xsl:value-of select="@path"/>
+    <xsl:value-of select="$library_name"/>/group/<xsl:value-of select="@path"/>
   </xsl:template>
 
   <xsl:template name="groupLinkWithImage">
     <xsl:variable name="desc"><xsl:value-of select="description"/></xsl:variable>
-    <xsl:variable name="group_href"><xsl:value-of select="$library_name"/>?a=p&amp;sa=home&amp;group=<xsl:value-of select="/page/pageRequest/paramList/param[@name='group']/@value"/>/<xsl:value-of select="@name"/></xsl:variable>
+    <xsl:variable name="group_href"><xsl:value-of select="$library_name"/>/group/<xsl:value-of select="@path"/></xsl:variable>
     
     <xsl:choose>
@@ -308 +308 @@
   <xsl:template name="collectionLinkWithImage">
     <xsl:variable name="desc"><xsl:value-of select="displayItemList/displayItem[@name='shortDescription']"/></xsl:variable>
-    <xsl:variable name="coll_href"><xsl:value-of select="$library_name"/>/collection/<xsl:value-of select="@name"/>/page/about<xsl:choose><xsl:when test="libraryParamList/param">?<xsl:for-each select="libraryParamList/param"><xsl:value-of select="@name"/>=<xsl:value-of select="@default"/>&amp;</xsl:for-each></xsl:when></xsl:choose></xsl:variable>
+    <xsl:variable name="coll_href"><xsl:value-of select="$library_name"/>/collection/<xsl:if test="/page/pageRequest/paramList/param[@name='group']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='group']/@value"/>/</xsl:if><xsl:value-of select="@name"/>/page/about<xsl:choose><xsl:when test="libraryParamList/param">?<xsl:for-each select="libraryParamList/param"><xsl:value-of select="@name"/>=<xsl:value-of select="@default"/>&amp;</xsl:for-each></xsl:when></xsl:choose></xsl:variable>
     <xsl:choose>
       <xsl:when test="displayItemList/displayItem[@name='smallicon']">