The list of persons in alphabetical order is now in the form Surname, Name.

The list ordered by site now also uses qualifications. But the output is
still not satisying to me because alphabetical order + qualifications is
quite bad. I will commit manually generated XML index files with a meaningful
order (from boss to slaves ;-)

diff --git a/helm/mowgli/home/xsl/people-list.xsl b/helm/mowgli/home/xsl/people-list.xsl
index 60a5c940ba01dcc2fddee5508f5294cd0502d6a2..a40d62272e6c56deaa4bfed47babf7b1a804e185 100644 (file)
--- a/helm/mowgli/home/xsl/people-list.xsl
+++ b/helm/mowgli/home/xsl/people-list.xsl
@@ -33,7 +33,7 @@
     <td valign="top">
 
     <h3><a name="#alpha">Alphabetical</a></h3>
-    <xsl:apply-templates select="from/person">
+    <xsl:apply-templates select="from/person" mode="alphabetical">
       <xsl:sort select="@file"/>
     </xsl:apply-templates>
 
@@ -48,36 +48,26 @@
  </html>
 </xsl:template>
 
-<xsl:template name="qualified-name">
- <xsl:param name="qualification" select="/.."/>
- <xsl:param name="name"/>
- <xsl:param name="surname"/>
- <!--
- <xsl:if test="qualification">
-  <xsl:value-of select="$qualification"/>
-  <xsl:text> </xsl:text>
- </xsl:if>
- -->
- <xsl:value-of select="$name"/>
- <xsl:text> </xsl:text>
- <xsl:value-of select="$surname"/>
-</xsl:template>
-
 <xsl:template match="person">
  <xsl:variable name="person" select="document(concat('../xml/people/',../@site,'/',@file,'.xml'))/person"/>
  <a href="people/{../@site}/{@file}.html">
-  <xsl:call-template name="qualified-name">
-   <xsl:with-param name="qualification"
-                   select="$person/qualification"/>
-   <xsl:with-param name="name"
-                   select="$person/name"/>
-   <xsl:with-param name="surname"
-                   select="$person/surname"/>
+  <xsl:call-template name="person-name">
+   <xsl:with-param name="file" select="concat(../@site,'/',@file)"/>
   </xsl:call-template>
  </a>
  <br />
 </xsl:template>
 
+<xsl:template match="person" mode="alphabetical">
+ <xsl:variable name="person" select="document(concat('../xml/people/',../@site,'/',@file,'.xml'))/person"/>
+ <a href="people/{../@site}/{@file}.html">
+  <xsl:value-of select="$person/surname"/>
+  <xsl:text>, </xsl:text>
+  <xsl:value-of select="$person/name"/>
+ </a>
+ <br />
+</xsl:template>
+
 <xsl:template match="name">
  <xsl:param name="file" select="''"/>
  <h4><a href="sites/{$file}.html"><xsl:value-of select="."/></a></h4>
@@ -85,7 +75,7 @@
 
 <xsl:template match="from">
  <xsl:variable name="site" select="document(concat('../xml/sites/',@site,'.xml'))/site"/>
- <xsl:apply-templates select="$site/name">
+ <xsl:apply-templates select="$site/name | $site/subsite[1]/name">
   <xsl:with-param name="file" select="@site"/>
  </xsl:apply-templates>
  <xsl:apply-templates select="person">