Finer control over output to presenters, addresses issues with JSON output and makes some other bits more sensible

Tweaks to XSLT as some things have moved

4 files changed, 8 insertions, 8 deletions

diff --git a/gentoobrowse/xslt/base.xslt b/gentoobrowse/xslt/base.xslt
index 87bffca..e1c721f 100644
--- a/gentoobrowse/xslt/base.xslt
+++ b/gentoobrowse/xslt/base.xslt
@@ -39,7 +39,7 @@
 					<form id="search" class="popup" action="/search" method="get">
 						<h1>Site search</h1>
 						<input type="search" name="criteria" placeholder="Search criteria" required="required" autofocus="autofocus">
-							<xsl:attribute name="value"><xsl:value-of select="/gentoo/project2:params/param[@name='criteria']/@value" /></xsl:attribute>
+							<xsl:attribute name="value"><xsl:value-of select="/gentoo/project2:params/criteria" /></xsl:attribute>
 						</input>
 						<input type="submit" value="Search" class="submit" />
 						<input type="submit" value="Cancel" class="submit" onclick="return hideForm('#search');" />
diff --git a/gentoobrowse/xslt/category.xslt b/gentoobrowse/xslt/category.xslt
index ef16965..0f69260 100644
--- a/gentoobrowse/xslt/category.xslt
+++ b/gentoobrowse/xslt/category.xslt
@@ -4,9 +4,9 @@
 	<xsl:import href="base.xslt" />
   <xsl:output encoding="utf-8" method="html" media-type="text/html" indent="yes" />
   <xsl:template name="head">
-		<title><xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]/@text" /> Package List - Gentoo Browse</title>
+		<title><xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]" /> Package List - Gentoo Browse</title>
 		<meta name="description">
-			<xsl:attribute name="content">Complete list of Gentoo Linux packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]/@text" /> category</xsl:attribute>
+			<xsl:attribute name="content">Complete list of Gentoo Linux packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]" /> category</xsl:attribute>
 		</meta>
 		<link rel="contents" href="/categories" />
   </xsl:template>
diff --git a/gentoobrowse/xslt/herd.xslt b/gentoobrowse/xslt/herd.xslt
index 4f39112..058eb14 100644
--- a/gentoobrowse/xslt/herd.xslt
+++ b/gentoobrowse/xslt/herd.xslt
@@ -4,16 +4,16 @@
 	<xsl:import href="base.xslt" />
   <xsl:output encoding="utf-8" method="html" media-type="text/html" indent="yes" />
   <xsl:template name="head">
-	<title>Packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]/@text" /> herd - Gentoo Browse</title>
+	<title>Packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]" /> herd - Gentoo Browse</title>
 	<meta name="description">
-		<xsl:attribute name="content">Packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]/@text" /> herd</xsl:attribute>
+		<xsl:attribute name="content">Packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]" /> herd</xsl:attribute>
 	</meta>
   </xsl:template>
   <xsl:template name="content">
 	<xsl:apply-templates select="/gentoo/packages" />
   </xsl:template>
   <xsl:template match="/gentoo/packages">
-  	<h2>Packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]/@text" /> herd</h2>
+  	<h2>Packages in the <xsl:value-of select="/gentoo/project2:uriElems/uriElem[2]" /> herd</h2>
 	<ul>
 		<xsl:apply-templates select="/gentoo/packages/package" />
 	</ul>
diff --git a/gentoobrowse/xslt/search.xslt b/gentoobrowse/xslt/search.xslt
index d37f45e..5a3227a 100644
--- a/gentoobrowse/xslt/search.xslt
+++ b/gentoobrowse/xslt/search.xslt
@@ -4,7 +4,7 @@
   <xsl:import href="base.xslt" />
   <xsl:output encoding="utf-8" method="html" media-type="text/html" indent="yes" />
   <xsl:template name="head">
-		<title>Search results for &quot;<xsl:value-of select="/gentoo/project2:params/param[@name='criteria']/@value"/>&quot; - Gentoo Browse</title>
+		<title>Search results for &quot;<xsl:value-of select="/gentoo/project2:params/criteria"/>&quot; - Gentoo Browse</title>
 		<script type="text/javascript">
 			$(function() {
 				$("article#content").accordion({ autoHeight: false, header: 'h3', collapsible: true });
@@ -12,7 +12,7 @@
 		</script>
   </xsl:template>
   <xsl:template name="content">
-		<h2>Search results for &quot;<xsl:value-of select="/gentoo/project2:params/param[@name='criteria']/@value"/>&quot;</h2>
+		<h2>Search results for &quot;<xsl:value-of select="/gentoo/project2:params/criteria"/>&quot;</h2>
 		<xsl:apply-templates select="/gentoo/searchResults" />
 		<xsl:apply-templates select="/gentoo/bugSearchResults" />
   </xsl:template>