Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --cc etc/xsl/cf.xsl
index fdf3edd,f0d6455..794454c
--- 1/etc/xsl/cf.xsl
--- 2/etc/xsl/cf.xsl
+++ b/etc/xsl/cf.xsl
@@@ -139,6 -123,26 +139,15 @@@
      </pz:metadata>
    </xsl:template>
  
+   <xsl:template match="affiliation">
+     <pz:metadata type="affiliation-person" empty="PAZPAR2_NULL_VALUE">
+       <xsl:value-of select="person"/>
+     </pz:metadata>
+     <pz:metadata type="affiliation-institution" empty="PAZPAR2_NULL_VALUE">
+       <xsl:value-of select="institution"/>
+     </pz:metadata>
+   </xsl:template>
+ 
 -  <!-- put both page and pages-number for page -->
 -  <xsl:template match="page">
 -    <pz:metadata type="pages-number">
 -      <xsl:value-of select="."/>
 -    </pz:metadata>
 -    <pz:metadata type="page">
 -      <xsl:value-of select="."/>
 -    </pz:metadata>
 -  </xsl:template>
 -  <!-- leave endpage as is -->
 -
    <xsl:template match="*" >
      <pz:metadata type="{local-name()}">
        <xsl:value-of select="."/>