From 46b82e4c97dc6988c872497a05a0324ffad0aa23 Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Mon, 16 Jul 2007 09:09:19 -0400
Subject: [PATCH] Updated member list code.

---
 Makefile   | 2 +-
 cscweb.xsl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 79a0586..3a6b506 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ recurse-cow:
 members.xml:
 	echo '<?xml version='\''1.0'\''?>' > $@
 	echo '<memberlist>' >> $@
-	ceoquery memberlist | awk -F \| '{ id = $$1; name = $$2; program = $$3; gsub(/&/, "\\&amp;", name); gsub(/&/, "\\&amp;", program); gsub(/"/, "\\&quot;", name); gsub(/"/, "\\&quot;", program); print "<member id=\"" id "\" name=\"" name "\" program=\"" program "\" />"; }' >> $@
+	ceoquery memberlist | sort | awk -F \| '{ name = $$1; program = $$2; userid = $$3; gsub(/&/, "\\&amp;", name); gsub(/&/, "\\&amp;", program); gsub(/"/, "\\&quot;", name); gsub(/"/, "\\&quot;", program); print "<member name=\"" name "\" program=\"" program "\" userid=\"" userid "\" />"; }' >> $@
 	echo '</memberlist>' >> $@
 
 books.xml:
diff --git a/cscweb.xsl b/cscweb.xsl
index e85fc04..e0f3a1c 100644
--- a/cscweb.xsl
+++ b/cscweb.xsl
@@ -432,9 +432,9 @@
   select="count(document('members.xml')/memberlist/member)"/> members.</p>
   <table>
     <tr>
-      <th>Member ID</th>
       <th>Name</th>
       <th>Program</th>
+      <th>Userid</th>
     </tr>
     <xsl:for-each select="document('members.xml')/memberlist/member">
       <xsl:variable name="class">
@@ -444,9 +444,9 @@
         </xsl:choose>
       </xsl:variable>
       <tr class="{$class}">
-	    <td><xsl:value-of select="@id"/></td>
         <td><xsl:value-of select="@name"/></td>
         <td><xsl:value-of select="@program"/></td>
+        <td><xsl:value-of select="@userid"/></td>
       </tr>
     </xsl:for-each>
   </table>