The list of persons in the "By Site" ordering is now also

ordered by member status inside the site. Probably, some
more informations will be added soon (e.g. "site leader",
or "work-package leader" etc.)

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index 00377aa71d70dac43bfabde9013cacf4d85cdbbe..db2933ce61f333b241c6c33de2338b30bf89032b 100644 (file)
--- a/helm/mowgli/home/html/Makefile
+++ b/helm/mowgli/home/html/Makefile
@@ -40,8 +40,6 @@ PEOPLE = \
                people/nijmegen/wiedijk.html \
                people/trusted-logic/bolignano.html
 
-PEOPLE_SOURCE = $(PEOPLE:%.html=$(XMLROOT)/%.xml)
-
 DOCUMENTS = \
             index.html \
             home.html \
@@ -163,24 +161,9 @@ project-objectives.html: $(XMLROOT)/project-objectives.xml \
        $(XSLROOT)/xhtml-content.xsl
        $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl $<
 
-people-list.html: $(XSLROOT)/person-entry.xsl $(XSLROOT)/people-list.xsl $(PEOPLE_SOURCE)
-       ( \
-               echo "<people>" >/tmp/people-list.xml; \
-               SITES=`cd $(XMLROOT)/sites; ls *.xml | cut -d'.' -f1`; \
-               for i in $$SITES; \
-               do \
-                       echo "<from site=\"$$i\">" >>/tmp/people-list.xml; \
-                       SITE_PEOPLE=`cd $(XMLROOT)/people/$$i; ls *.xml | cut -d'.' -f1`; \
-                       for j in $$SITE_PEOPLE; \
-                       do \
-                               echo "<person file=\"$$j\"/>" >>/tmp/people-list.xml; \
-                       done; \
-                       echo "</from>" >>/tmp/people-list.xml; \
-               done; \
-               echo "</people>" >>/tmp/people-list.xml \
-       )
-       $(XSLTP) -o people-list.html $(XSLROOT)/people-list.xsl /tmp/people-list.xml
-#      rm -rf /tmp/people-list.xml
+people-list.html: $(XMLROOT)/people/index.xml $(XSLROOT)/person-entry.xsl \
+                  $(XSLROOT)/people-list.xsl 
+       $(XSLTP) -o $@ $(XSLROOT)/people-list.xsl $<
 
 consortium.html: $(XMLROOT)/consortium.xml \
                  $(XSLROOT)/consortium.xsl

diff --git a/helm/mowgli/home/xml/people/index.xml b/helm/mowgli/home/xml/people/index.xml
new file mode 100644 (file)
index 0000000..e4a0f74
--- /dev/null
+++ b/helm/mowgli/home/xml/people/index.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE people [
+ <!ELEMENT people (from*)>
+ <!ELEMENT from (person*)>
+ <!ATTLIST from
+           site CDATA #REQUIRED>
+ <!ELEMENT person EMPTY>
+ <!ATTLIST person
+           file CDATA #REQUIRED>
+]>
+
+<people>
+ <from site="aei">
+  <person file="schutz"/>
+  <person file="wegner"/>
+  <person file="kelley"/>
+  <person file="velden"/>
+ </from>
+ <from site="bologna">
+  <person file="asperti"/>
+  <person file="guidi"/>
+  <person file="padovani"/>
+  <person file="sacerdoti"/>
+  <person file="schena"/>
+ </from>
+ <from site="dfki">
+  <person file="siekmann"/>
+  <person file="kohlhase"/>
+  <person file="melis"/>
+ </from>
+ <from site="inria">
+  <person file="herbelin"/>
+  <person file="amerkad"/>
+  <person file="bertot"/>
+  <person file="chicli"/>
+  <person file="delahaye"/>
+  <person file="naciri"/>
+  <person file="pottier"/>
+  <person file="rideau"/>
+  <person file="thery"/>
+ </from>
+ <from site="nijmegen">
+  <person file="geuvers"/>
+  <person file="cohen"/>
+  <person file="barendregt"/>
+  <person file="wiedijk"/>
+  <person file="barreiro"/>
+  <person file="cruz-filipe"/>
+  <person file="niqui"/>
+  <person file="stein"/>
+  <person file="synek"/>
+ </from>
+ <from site="trusted-logic">
+  <person file="bolignano"/>
+ </from>
+</people>

diff --git a/helm/mowgli/home/xsl/people-list.xsl b/helm/mowgli/home/xsl/people-list.xsl
index a40d62272e6c56deaa4bfed47babf7b1a804e185..351ca3418a4a155c8771482f49dfeda9c4cecefb 100644 (file)
--- a/helm/mowgli/home/xsl/people-list.xsl
+++ b/helm/mowgli/home/xsl/people-list.xsl
@@ -78,9 +78,7 @@
  <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">
-  <xsl:sort select="@file"/>
- </xsl:apply-templates>
+ <xsl:apply-templates select="person"/>
 </xsl:template>
 
 </xsl:stylesheet>