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

diff --combined etc/xsl/cf.xsl
index fdf3edd,f0d6455..794454c
--- 1/etc/xsl/cf.xsl
--- 2/etc/xsl/cf.xsl
+++ b/etc/xsl/cf.xsl
@@@ -14,10 -14,7 +14,10 @@@
          version="1.0"
          encoding="UTF-8"/>
  
 -  <xsl:param name="medium" />
 +    <xsl:param name="medium" />
 +
 +    <xsl:variable name="startpage" select="/record/page" />
 +    <xsl:variable name="endpage" select="/record/endpage" />
  
    <!-- Use medium parameter if given. Default to medium from connector -->
    <xsl:template match="/record">
@@@ -34,20 -31,7 +34,20 @@@
            </xsl:otherwise>
          </xsl:choose>
        </pz:metadata>
 +
 +      <!-- calculate md-pages-number for startpage/endpage -->
 +      <xsl:if test="string-length($startpage)">
 +        <pz:metadata type="pages-number">
 +          <xsl:value-of select="$startpage" />
 +          <xsl:if test="string-length($endpage)">
 +            <xsl:text>-</xsl:text>
 +            <xsl:value-of select="$endpage" />
 +          </xsl:if>
 +        </pz:metadata>
 +      </xsl:if>
 +
        <xsl:apply-templates/>
 +
      </pz:record>
    </xsl:template>
  
@@@ -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="."/>