Changeset 16600 for greenstone3/trunk/web

Timestamp:

2008-07-30T15:10:27+12:00 (16 years ago)

Author:

max

Message:

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

File:

• greenstone3/trunk/web/ui/xslt/util.xsl (modified) (8 diffs)

greenstone3/trunk/web/ui/xslt/util.xsl

@@ -92 +92 @@
     <xsl:param name="name"/>
     <xsl:value-of select="$librarian" />
-    ?a=p&amp;sa=about&amp;c=
+?a=p&amp;sa=about&amp;c=
     <xsl:value-of select="$name" />
 </xsl:template>
@@ -98 +98 @@
 <xsl:variable name="site_homeUrl">
     <xsl:value-of select="$librarian" />
-    ?a=p&amp;sa=home
+?a=p&amp;sa=home
 </xsl:variable>
 
@@ -133 +133 @@
     </xsl:variable>
     
-    <xsl:value-of select="$librarian"/>?a=
-    <xsl:value-of select="$serviceAction"/>&amp;rt=d&amp;s=
-    <xsl:value-of select="$serviceName"/>&amp;c=
-    <xsl:value-of select="$collection"/>
+<xsl:value-of select="$librarian"/>?
+a=<xsl:value-of select="$serviceAction"/>&amp;rt=d&amp;
+s=<xsl:value-of select="$serviceName"/>&amp;
+c=<xsl:value-of select="$collection"/>
 </xsl:template>
 
@@ -152 +152 @@
 
 <xsl:template name="classifier_url">
-    <xsl:param name="clsName"/>
-    <xsl:value-of select="$librarian"/>
-    ?a=b&amp;rt=r&amp;s=
-    <xsl:value-of select="/page/pageResponse/collection/serviceList//classifier[@name=$clsName]/../../@name"/>
-    &amp;c=
-    <xsl:value-of select="$collection"/>
-    &amp;cl=
-    <xsl:value-of select="$clsName"/>
+<xsl:param name="clsName"/>
+<xsl:value-of select="$librarian"/>?a=b&amp;rt=r&amp;
+s=<xsl:value-of select="/page/pageResponse/collection/serviceList//classifier[@name=$clsName]/../../@name"/>&amp;
+c=<xsl:value-of select="$collection"/>&amp;
+cl=<xsl:value-of select="$clsName"/>
 </xsl:template>
 
@@ -241 +238 @@
     <xsl:param name="id"/>
 
-<xsl:value-of select="$librarian"/>
-?a=b&amp;rt=r&amp;s=
-<xsl:value-of select="/page/pageResponse/service/@name"/>
-&amp;c=
-<xsl:value-of select="$collection"/>
-&amp;cl=
-<xsl:value-of select="$id" /><xsl:if test="classifierNode|documentNode">.pr</xsl:if>
+<xsl:value-of select="$librarian"/>?a=b&amp;rt=r&amp;
+s=<xsl:value-of select="/page/pageResponse/service/@name"/>&amp;
+c=<xsl:value-of select="$collection"/>&amp;
+cl=<xsl:value-of select="$id" /><xsl:if test="classifierNode|documentNode">.pr</xsl:if>
 
 </xsl:template>
@@ -328 +322 @@
 
 <xsl:variable name="document_expanded_url">
-    <xsl:value-of select="$librarian"/>?a=d&amp;
-    c=<xsl:value-of select="$collection"/>&amp;
-    d=<xsl:value-of select="$document_hash"/>&amp;
-    ed=1
+<xsl:value-of select="$librarian"/>?a=d&amp;
+c=<xsl:value-of select="$collection"/>&amp;
+d=<xsl:value-of select="$document_hash"/>&amp;
+ed=1
 </xsl:variable>
 
 <xsl:variable name="document_collapsed_url">
-    <xsl:value-of select="$librarian"/>?a=d&amp;
-    c=<xsl:value-of select="$collection"/>&amp;
-    d=<xsl:value-of select="$document_hash"/>
+<xsl:value-of select="$librarian"/>?a=d&amp;
+c=<xsl:value-of select="$collection"/>&amp;
+d=<xsl:value-of select="$document_hash"/>
 </xsl:variable>
 
@@ -392 +386 @@
 
 <xsl:variable name="document_previousSection_url">
-    <xsl:value-of select="$librarian"/>?a=d&amp;
-    c=<xsl:value-of select="$collection"/>&amp;
-    d=<xsl:value-of select="$document_previousSection/@nodeID"/>&amp;
-    sib=1&amp;ec=1
+<xsl:value-of select="$librarian"/>?a=d&amp;
+c=<xsl:value-of select="$collection"/>&amp;
+d=<xsl:value-of select="$document_previousSection/@nodeID"/>&amp;
+sib=1&amp;ec=1
 </xsl:variable>
 
@@ -403 +397 @@
 
 <xsl:variable name="document_nextSection_url">
-    <xsl:value-of select="$librarian"/>?a=d&amp;
-    c=<xsl:value-of select="$collection"/>&amp;
-    d=<xsl:value-of select="$document_nextSection/@nodeID"/>&amp;
-    sib=1&amp;ec=1
+<xsl:value-of select="$librarian"/>?a=d&amp;
+c=<xsl:value-of select="$collection"/>&amp;
+d=<xsl:value-of select="$document_nextSection/@nodeID"/>&amp;
+sib=1&amp;ec=1
 </xsl:variable>