X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=etc%2Fxsl%2Fprimo-pz2.xsl;h=caa6d9a23b3ce96a639088c55b5143c6eb64ccd1;hb=d96989af3aa0eb866948a3f6564e5b384a980fdf;hp=e3c5d5ac0f5d21620307cdf1509ae6903a33ba12;hpb=69b77c4fcb28db4330b68812aa68f210ec0c5d30;p=pazpar2-moved-to-github.git

diff --git a/etc/xsl/primo-pz2.xsl b/etc/xsl/primo-pz2.xsl
index e3c5d5a..caa6d9a 100644
--- a/etc/xsl/primo-pz2.xsl
+++ b/etc/xsl/primo-pz2.xsl
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:pz="http://www.indexdata.com/pazpar2/1.0"
   xmlns:tmarc="http://www.indexdata.com/turbomarc"
-  xmlns:prim="http://www.exlibrisgroup.com/xsd/primo/primo_nm_bib" 
+  xmlns:prim="http://www.exlibrisgroup.com/xsd/primo/primo_nm_bib"
   xmlns:sear="http://www.exlibrisgroup.com/xsd/jaguar/search"
->
-
+  >
   <xsl:output indent="yes" method="xml" version="1.0"
     encoding="UTF-8" />
-
   <xsl:template name="record-hook" />
-
   <xsl:variable name="type" select="/opt/prim:PrimoNMBib/prim:display/prim:type"/>
   <xsl:variable name="is_article" select="$type = 'article'" />
   <xsl:variable name="fulltext" select="/opt/prim:PrimoNMBib/prim:delivery/prim:fulltext"/>
@@ -48,8 +45,8 @@
   <xsl:template match="prim:PrimoNMBib">
     <xsl:apply-templates />
   </xsl:template>
-  
-  <xsl:template match="prim:control"> 
+
+  <xsl:template match="prim:control">
     <xsl:for-each select="prim:recordid">
       <pz:metadata type="id">
 	<xsl:value-of select="."/>
@@ -81,11 +78,34 @@
       </pz:metadata>
     </xsl:for-each>
 
-    <xsl:for-each select="prim:spage">
-      <pz:metadata type="pages-number">
-        <xsl:value-of select="." />
-      </pz:metadata>
-    </xsl:for-each>
+    <xsl:variable name="spage" select="prim:spage" />
+    <xsl:variable name="epage" select="prim:epage" />
+    <xsl:variable name="pages" select="prim:pages" />
+
+    <xsl:choose>
+      <!-- in some case primo wrongly returns a range in spage, we're done -->
+      <xsl:when test="contains($spage,'-')">
+        <pz:metadata type="pages-number">
+          <xsl:value-of select="$spage" />
+        </pz:metadata>
+      </xsl:when>
+      <!-- if there is a range in pages, we're also done -->
+      <xsl:when test="contains($pages,'-')">
+        <pz:metadata type="pages-number">
+          <xsl:value-of select="$pages" />
+        </pz:metadata>
+      </xsl:when>
+      <!-- otherwise, construct -->
+      <xsl:when test="$spage">
+        <pz:metadata type="pages-number">
+          <xsl:value-of select="$spage" />
+          <xsl:if test="string-length($epage)">
+            <xsl:text>-</xsl:text>
+            <xsl:value-of select="$epage" />
+          </xsl:if>
+        </pz:metadata>
+      </xsl:when>
+    </xsl:choose>
 
     <xsl:for-each select="prim:issn">
       <pz:metadata type="issn">
@@ -94,31 +114,21 @@
     </xsl:for-each>
 
     <xsl:for-each select="prim:jtitle">
-      <pz:metadata type="citation">
+      <pz:metadata type="journal-title">
 	<xsl:value-of select="." />
       </pz:metadata>
     </xsl:for-each>
   </xsl:template>
 
-  <xsl:template match="prim:delivery">  
-
+  <xsl:template match="prim:delivery">
     <xsl:if test="$has_fulltext">
       <pz:metadata type="has-fulltext">
         <xsl:value-of select="$has_fulltext" />
       </pz:metadata>
     </xsl:if>
-
   </xsl:template>
 
   <xsl:template match="prim:display">
-
-<!--
-    <xsl:for-each select="prim:creator">
-       <pz:metadata type="author">
-        <xsl:value-of select="." />
-      </pz:metadata>
-    </xsl:for-each>
--->
     <xsl:for-each select="prim:type">
       <xsl:variable name="type" select="."/>
       <pz:metadata type="medium">
@@ -133,25 +143,24 @@
             <xsl:value-of select="$type"/>
           </xsl:otherwise>
 	</xsl:choose>
-<!--        <xsl:value-of select="$type" /> -->
       </pz:metadata>
       <pz:metadata type="debug_isarticle"><xsl:value-of select="$is_article"/></pz:metadata>
-    </xsl:for-each>  
+    </xsl:for-each>
 
     <xsl:for-each select="prim:title">
       <pz:metadata type="title">
 	<xsl:value-of select="." />
       </pz:metadata>
-    </xsl:for-each>  
+    </xsl:for-each>
 
     <xsl:for-each select="prim:ispartof">
       <pz:metadata type="journal-subpart">
 	<xsl:value-of select="." />
       </pz:metadata>
+      <pz:metadata type="citation">
+	<xsl:value-of select="." />
+      </pz:metadata>
     </xsl:for-each>
-<!--
-    <xsl:apply-templates />
--->
   </xsl:template>
 
   <xsl:template match="prim:facets">
@@ -159,11 +168,11 @@
        <pz:metadata type="subject">
         <xsl:value-of select="." />
       </pz:metadata>
-    </xsl:for-each>  
+    </xsl:for-each>
   </xsl:template>
 
   <xsl:template match="sear:LINKS" >
-    <xsl:for-each select="sear:openurl"> 
+    <xsl:for-each select="sear:openurl">
       <pz:metadata type="electronic-url">
 	<xsl:value-of select="."/>
       </pz:metadata>
@@ -197,7 +206,7 @@
     </xsl:for-each>
     <!-- other stylesheets importing this might want to define this -->
 
-    <xsl:call-template name="record-hook" />	
+    <xsl:call-template name="record-hook" />
   </xsl:template>
 
   <xsl:template match="text()" />