Changeset 16600


Ignore:
Timestamp:
2008-07-30T15:10:27+12:00 (13 years ago)
Author:
max
Message:

Solve the url issues after extracted gslib statements. URLs creation process easier to read.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/web/ui/xslt/util.xsl

    r16501 r16600  
    9292    <xsl:param name="name"/>
    9393    <xsl:value-of select="$librarian" />
    94     ?a=p&amp;sa=about&amp;c=
     94?a=p&amp;sa=about&amp;c=
    9595    <xsl:value-of select="$name" />
    9696</xsl:template>
     
    9898<xsl:variable name="site_homeUrl">
    9999    <xsl:value-of select="$librarian" />
    100     ?a=p&amp;sa=home
     100?a=p&amp;sa=home
    101101</xsl:variable>
    102102
     
    133133    </xsl:variable>
    134134   
    135     <xsl:value-of select="$librarian"/>?a=
    136     <xsl:value-of select="$serviceAction"/>&amp;rt=d&amp;s=
    137     <xsl:value-of select="$serviceName"/>&amp;c=
    138     <xsl:value-of select="$collection"/>
     135<xsl:value-of select="$librarian"/>?
     136a=<xsl:value-of select="$serviceAction"/>&amp;rt=d&amp;
     137s=<xsl:value-of select="$serviceName"/>&amp;
     138c=<xsl:value-of select="$collection"/>
    139139</xsl:template>
    140140
     
    152152
    153153<xsl:template name="classifier_url">
    154     <xsl:param name="clsName"/>
    155     <xsl:value-of select="$librarian"/>
    156     ?a=b&amp;rt=r&amp;s=
    157     <xsl:value-of select="/page/pageResponse/collection/serviceList//classifier[@name=$clsName]/../../@name"/>
    158     &amp;c=
    159     <xsl:value-of select="$collection"/>
    160     &amp;cl=
    161     <xsl:value-of select="$clsName"/>
     154<xsl:param name="clsName"/>
     155<xsl:value-of select="$librarian"/>?a=b&amp;rt=r&amp;
     156s=<xsl:value-of select="/page/pageResponse/collection/serviceList//classifier[@name=$clsName]/../../@name"/>&amp;
     157c=<xsl:value-of select="$collection"/>&amp;
     158cl=<xsl:value-of select="$clsName"/>
    162159</xsl:template>
    163160
     
    241238    <xsl:param name="id"/>
    242239
    243 <xsl:value-of select="$librarian"/>
    244 ?a=b&amp;rt=r&amp;s=
    245 <xsl:value-of select="/page/pageResponse/service/@name"/>
    246 &amp;c=
    247 <xsl:value-of select="$collection"/>
    248 &amp;cl=
    249 <xsl:value-of select="$id" /><xsl:if test="classifierNode|documentNode">.pr</xsl:if>
     240<xsl:value-of select="$librarian"/>?a=b&amp;rt=r&amp;
     241s=<xsl:value-of select="/page/pageResponse/service/@name"/>&amp;
     242c=<xsl:value-of select="$collection"/>&amp;
     243cl=<xsl:value-of select="$id" /><xsl:if test="classifierNode|documentNode">.pr</xsl:if>
    250244
    251245</xsl:template>
     
    328322
    329323<xsl:variable name="document_expanded_url">
    330     <xsl:value-of select="$librarian"/>?a=d&amp;
    331     c=<xsl:value-of select="$collection"/>&amp;
    332     d=<xsl:value-of select="$document_hash"/>&amp;
    333     ed=1
     324<xsl:value-of select="$librarian"/>?a=d&amp;
     325c=<xsl:value-of select="$collection"/>&amp;
     326d=<xsl:value-of select="$document_hash"/>&amp;
     327ed=1
    334328</xsl:variable>
    335329
    336330<xsl:variable name="document_collapsed_url">
    337     <xsl:value-of select="$librarian"/>?a=d&amp;
    338     c=<xsl:value-of select="$collection"/>&amp;
    339     d=<xsl:value-of select="$document_hash"/>
     331<xsl:value-of select="$librarian"/>?a=d&amp;
     332c=<xsl:value-of select="$collection"/>&amp;
     333d=<xsl:value-of select="$document_hash"/>
    340334</xsl:variable>
    341335
     
    392386
    393387<xsl:variable name="document_previousSection_url">
    394     <xsl:value-of select="$librarian"/>?a=d&amp;
    395     c=<xsl:value-of select="$collection"/>&amp;
    396     d=<xsl:value-of select="$document_previousSection/@nodeID"/>&amp;
    397     sib=1&amp;ec=1
     388<xsl:value-of select="$librarian"/>?a=d&amp;
     389c=<xsl:value-of select="$collection"/>&amp;
     390d=<xsl:value-of select="$document_previousSection/@nodeID"/>&amp;
     391sib=1&amp;ec=1
    398392</xsl:variable>
    399393
     
    403397
    404398<xsl:variable name="document_nextSection_url">
    405     <xsl:value-of select="$librarian"/>?a=d&amp;
    406     c=<xsl:value-of select="$collection"/>&amp;
    407     d=<xsl:value-of select="$document_nextSection/@nodeID"/>&amp;
    408     sib=1&amp;ec=1
     399<xsl:value-of select="$librarian"/>?a=d&amp;
     400c=<xsl:value-of select="$collection"/>&amp;
     401d=<xsl:value-of select="$document_nextSection/@nodeID"/>&amp;
     402sib=1&amp;ec=1
    409403</xsl:variable>
    410404
Note: See TracChangeset for help on using the changeset viewer.