From 1b555e1fa84bd1f6cf84c1055ac553684a5290c1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= <f.demians@tamil.fr>
Date: Sat, 5 Sep 2009 09:45:50 +0200
Subject: [PATCH] UNIMARC XSLT enhancement

Improve UNIMARC XSL for result and detail page:

  * Add fields
  * Consolidation
  * Support RTL language display using $7 UNIMARC standard
    for Arabic and Hebrew
  * Fix bug #2773 via XSL at field level, removing NSB and
    NSE characters in biblio records, and avoiding to do
    it at application level in C4::Output.pm

Note for RM: There will be some tweaking coming next week.
If I see you don't push this patch, I will resubmit a
completed version later.

Sponsored by BULAC, www.bulac.fr
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css      |   6 +
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl   | 346 ++++++++----------
 .../prog/en/xslt/UNIMARCslim2OPACResults.xsl  |  60 +--
 .../prog/en/xslt/UNIMARCslimUtils.xsl         | 287 +++++++++++----
 4 files changed, 417 insertions(+), 282 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index d7b04c36a6..9e302708af 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1873,3 +1873,9 @@ a.p1:active {
 .copies_row > td:first-child {
     border-left-style : none;
 }
+
+.rtl {
+  unicode-bidi: embed;
+  direction: rtl;
+  text-align: right;
+}
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
index 0e4837edb3..87d48fefdb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:items="http://www.koha.org/items"
@@ -22,10 +21,16 @@
   <xsl:if test="marc:datafield[@tag=200]">
     <xsl:for-each select="marc:datafield[@tag=200]">
       <h1>
-        <xsl:value-of select="marc:subfield[@code='a']"/>
+        <xsl:call-template name="addClassRtl" />
+        <xsl:variable name="title" select="marc:subfield[@code='a']"/>
+        <xsl:variable name="ntitle"
+         select="translate($title, '&#x0098;&#x009C;','')"/>
+        <xsl:value-of select="$ntitle" />
         <xsl:if test="marc:subfield[@code='e']">
           <xsl:text> : </xsl:text>
-          <xsl:value-of select="marc:subfield[@code='e']"/>
+          <xsl:for-each select="marc:subfield[@code='e']">
+            <xsl:value-of select="."/>
+          </xsl:for-each>
         </xsl:if>
         <xsl:if test="marc:subfield[@code='b']">
           <xsl:text> [</xsl:text>
@@ -61,171 +66,35 @@
   
   <xsl:call-template name="tag_4xx" />
 
-  <xsl:if test="marc:datafield[@tag=700]">
-    <xsl:for-each select="marc:datafield[@tag=700]">
-  	  <span class="results_summary">
-        <span class="label">Auteur principal: </span>
-        <a>
-          <xsl:choose>
-            <xsl:when test="marc:subfield[@code=9]">
-              <xsl:attribute name="href">
-                /cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/>
-              </xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='b']"/></xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:if test="marc:subfield[@code='a']">
-            <xsl:value-of select="marc:subfield[@code='a']"/>
-          </xsl:if>
-          <xsl:if test="marc:subfield[@code='b']">,
-            <xsl:value-of select="marc:subfield[@code='b']"/>
-          </xsl:if>
-          <xsl:if test="marc:subfield[@code='f']">
-            (<xsl:value-of select="marc:subfield[@code='f']"/>)
-          </xsl:if>
-        </a>
-      </span>
-    </xsl:for-each>
-  </xsl:if>
+  <xsl:call-template name="tag_7xx">
+    <xsl:with-param name="tag">700</xsl:with-param>
+    <xsl:with-param name="label">Auteur principal</xsl:with-param>
+  </xsl:call-template>
 
-  <xsl:if test="marc:datafield[@tag=710]">
-    <xsl:for-each select="marc:datafield[@tag=710]">
-  	  <span class="results_summary">
-        <span class="label">Collectivité principale: </span>
-        <a>
-          <xsl:choose>
-            <xsl:when test="marc:subfield[@code=9]">
-              <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='b']"/></xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:if test="marc:subfield[@code='a']">
-            <xsl:value-of select="marc:subfield[@code='a']"/>
-          </xsl:if>
-          <xsl:if test="marc:subfield[@code='b']">,
-            <xsl:value-of select="marc:subfield[@code='b']"/>
-          </xsl:if>
-          <xsl:if test="marc:subfield[@code='d']">,
-            <xsl:value-of select="marc:subfield[@code='d']"/>
-          </xsl:if>
-          <xsl:if test="marc:subfield[@code='e']">,
-            <xsl:value-of select="marc:subfield[@code='e']"/>
-          </xsl:if>
-          <xsl:if test="marc:subfield[@code='f']">
-            (<xsl:value-of select="marc:subfield[@code='f']"/>)
-          </xsl:if>
-        </a>
-      </span>
-    </xsl:for-each>
-  </xsl:if>
+  <xsl:call-template name="tag_7xx">
+    <xsl:with-param name="tag">710</xsl:with-param>
+    <xsl:with-param name="label">Collectivité principale</xsl:with-param>
+  </xsl:call-template>
 
-  <xsl:if test="marc:datafield[@tag=701]">
-	  <span class="results_summary">
-      <span class="label">Co-auteur: </span>
-      <xsl:for-each select="marc:datafield[@tag=701]">
-          <a>
-            <xsl:choose>
-              <xsl:when test="marc:subfield[@code=9]">
-                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='b']"/></xsl:attribute>
-              </xsl:otherwise>
-            </xsl:choose>
-            <xsl:if test="marc:subfield[@code='a']">
-              <xsl:value-of select="marc:subfield[@code='a']"/>
-            </xsl:if>
-            <xsl:if test="marc:subfield[@code='b']">,
-              <xsl:value-of select="marc:subfield[@code='b']"/>
-            </xsl:if>
-            <xsl:if test="marc:subfield[@code='f']">
-              (<xsl:value-of select="marc:subfield[@code='f']"/>)
-            </xsl:if>
-          </a>
-          <xsl:value-of select="marc:subfield[@code='4']"/>
-          <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text> ; </xsl:text></xsl:otherwise></xsl:choose>
-      </xsl:for-each>
-    </span>
-  </xsl:if>
+  <xsl:call-template name="tag_7xx">
+    <xsl:with-param name="tag">701</xsl:with-param>
+    <xsl:with-param name="label">Co-auteur</xsl:with-param>
+  </xsl:call-template>
 
-  <xsl:if test="marc:datafield[@tag=702]">
-  	  <span class="results_summary">
-      <span class="label">Auteur: </span>
-      <xsl:for-each select="marc:datafield[@tag=702]">
-        <a>
-          <xsl:choose>
-            <xsl:when test="marc:subfield[@code=9]">
-              <xsl:attribute name="href">
-                /cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/>
-              </xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="href">
-                /cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/><xsl:text>
-              </xsl:text><xsl:value-of select="marc:subfield[@code='b']"/></xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:if test="marc:subfield[@code='a']">
-            <xsl:value-of select="marc:subfield[@code='a']"/>
-          </xsl:if>
-          <xsl:if test="marc:subfield[@code='b']">,
-            <xsl:value-of select="marc:subfield[@code='b']"/>
-          </xsl:if>
-          <xsl:if test="marc:subfield[@code='f']">
-            (<xsl:value-of select="marc:subfield[@code='f']"/>)
-          </xsl:if>
-        </a>.
-        <xsl:value-of select="marc:subfield[@code='4']"/>
-        <xsl:choose>
-          <xsl:when test="position()=last()">
-            <xsl:text>.</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text> ; </xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-    </span>
-  </xsl:if>
+  <xsl:call-template name="tag_7xx">
+    <xsl:with-param name="tag">702</xsl:with-param>
+    <xsl:with-param name="label">Auteur</xsl:with-param>
+  </xsl:call-template>
 
-  <xsl:if test="marc:datafield[@tag=711]">
-	  <span class="results_summary">
-      <span class="label">Collectivité co-auteur: </span>
-      <xsl:for-each select="marc:datafield[@tag=711]">
-          <a>
-            <xsl:choose>
-              <xsl:when test="marc:subfield[@code=9]">
-                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='b']"/></xsl:attribute>
-              </xsl:otherwise>
-            </xsl:choose>
-            <xsl:if test="marc:subfield[@code='a']">
-              <xsl:value-of select="marc:subfield[@code='a']"/>
-            </xsl:if>
-            <xsl:if test="marc:subfield[@code='b']">,
-              <xsl:value-of select="marc:subfield[@code='b']"/>
-            </xsl:if>
-            <xsl:if test="marc:subfield[@code='d']">,
-              <xsl:value-of select="marc:subfield[@code='d']"/>
-            </xsl:if>
-            <xsl:if test="marc:subfield[@code='e']">,
-              <xsl:value-of select="marc:subfield[@code='e']"/>
-            </xsl:if>
-            <xsl:if test="marc:subfield[@code='f']">
-              (<xsl:value-of select="marc:subfield[@code='f']"/>)
-            </xsl:if>
-          </a>
-          <xsl:value-of select="marc:subfield[@code='4']"/>
-          <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text> ; </xsl:text></xsl:otherwise></xsl:choose>
-      </xsl:for-each>
-    </span>
-  </xsl:if>
+  <xsl:call-template name="tag_7xx">
+    <xsl:with-param name="tag">711</xsl:with-param>
+    <xsl:with-param name="label">Collectivité co-auteur</xsl:with-param>
+  </xsl:call-template>
+
+  <xsl:call-template name="tag_7xx">
+    <xsl:with-param name="tag">712</xsl:with-param>
+    <xsl:with-param name="label">Collectivité secondaire</xsl:with-param>
+  </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=101]">
 	  <span class="results_summary">
@@ -303,17 +172,74 @@
       <span class="label">ISSN: </span>
       <xsl:for-each select="marc:datafield[@tag=011]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
-        <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+        <xsl:choose>
+          <xsl:when test="position()=last()">
+            <xsl:text>.</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>; </xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:for-each>
     </span>
   </xsl:if>
 
+  <xsl:call-template name="tag_title">
+    <xsl:with-param name="tag">225</xsl:with-param>
+    <xsl:with-param name="label">Collection</xsl:with-param>
+  </xsl:call-template>
+
   <xsl:if test="marc:datafield[@tag=676]">
     <span class="results_summary">
     <span class="label">Dewey: </span>
       <xsl:for-each select="marc:datafield[@tag=676]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
-        <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+        <xsl:if test="marc:subfield[@code='v']">
+          <xsl:text>, </xsl:text>
+          <xsl:value-of select="marc:subfield[@code='v']"/>
+        </xsl:if>
+        <xsl:if test="marc:subfield[@code='z']">
+          <xsl:text>, </xsl:text>
+          <xsl:value-of select="marc:subfield[@code='z']"/>
+        </xsl:if>
+        <xsl:if test="not (position()=last())">
+          <xsl:text> ; </xsl:text>
+        </xsl:if>
+      </xsl:for-each>
+    </span>
+  </xsl:if>
+
+  <xsl:if test="marc:datafield[@tag=686]">
+    <span class="results_summary">
+    <span class="label">Classification: </span>
+      <xsl:for-each select="marc:datafield[@tag=686]">
+        <xsl:value-of select="marc:subfield[@code='a']"/>
+        <xsl:if test="marc:subfield[@code='b']">
+          <xsl:text>, </xsl:text>
+          <xsl:value-of select="marc:subfield[@code='b']"/>
+        </xsl:if>
+        <xsl:if test="marc:subfield[@code='c']">
+          <xsl:text>, </xsl:text>
+          <xsl:value-of select="marc:subfield[@code='c']"/>
+        </xsl:if>
+        <xsl:if test="not (position()=last())"><xsl:text> ; </xsl:text></xsl:if>
+      </xsl:for-each>
+    </span>
+  </xsl:if>
+
+  <xsl:if test="marc:datafield[@tag=327]">
+    <span class="results_summary">
+      <span class="label">Note de contenu: </span>
+      <xsl:for-each select="marc:datafield[@tag=327]">
+        <xsl:call-template name="chopPunctuation">
+          <xsl:with-param name="chopString">
+            <xsl:call-template name="subfieldSelect">
+                <xsl:with-param name="codes">abcdjpvxyz</xsl:with-param>
+                <xsl:with-param name="subdivCodes">jpxyz</xsl:with-param>
+                <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
+            </xsl:call-template>
+          </xsl:with-param>
+        </xsl:call-template>
       </xsl:for-each>
     </span>
   </xsl:if>
@@ -323,7 +249,14 @@
       <span class="label">Résumé: </span>
       <xsl:for-each select="marc:datafield[@tag=330]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
-        <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+        <xsl:choose>
+          <xsl:when test="position()=last()">
+            <xsl:text>.</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>; </xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:for-each>
     </span>
   </xsl:if>
@@ -367,35 +300,55 @@
     </span>
   </xsl:if>
 
-  <xsl:if test="marc:datafield[@tag=600 or @tag=606]">
-    <span class="results_summary"><span class="label">Sujets: </span>
-      <xsl:for-each select="marc:datafield[@tag=606]">
-        <a>
-          <xsl:choose>
-            <xsl:when test="marc:subfield[@code=9]">
-              <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:call-template name="chopPunctuation">
-            <xsl:with-param name="chopString">
-              <xsl:call-template name="subfieldSelect">
-                  <xsl:with-param name="codes">abcdjpvxyz</xsl:with-param>
-                  <xsl:with-param name="subdivCodes">jpxyz</xsl:with-param>
-                  <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </a>
-        <xsl:choose>
-          <xsl:when test="position()=last()"></xsl:when>
-          <xsl:otherwise> | </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-    </span>
-  </xsl:if>
+  <xsl:call-template name="tag_subject">
+    <xsl:with-param name="tag">600</xsl:with-param>
+    <xsl:with-param name="label">Sujet - Nom de personne</xsl:with-param>
+  </xsl:call-template>
+
+  <xsl:call-template name="tag_subject">
+    <xsl:with-param name="tag">601</xsl:with-param>
+    <xsl:with-param name="label">Sujet - Collectivité</xsl:with-param>
+  </xsl:call-template>
+
+  <xsl:call-template name="tag_subject">
+    <xsl:with-param name="tag">602</xsl:with-param>
+    <xsl:with-param name="label">Sujet - Famille</xsl:with-param>
+  </xsl:call-template>
+
+  <xsl:call-template name="tag_subject">
+    <xsl:with-param name="tag">604</xsl:with-param>
+    <xsl:with-param name="label">Sujet - Auteur/titre</xsl:with-param>
+  </xsl:call-template>
+
+  <xsl:call-template name="tag_subject">
+    <xsl:with-param name="tag">606</xsl:with-param>
+    <xsl:with-param name="label">Sujet - Nom commun</xsl:with-param>
+  </xsl:call-template>
+
+  <xsl:call-template name="tag_subject">
+    <xsl:with-param name="tag">607</xsl:with-param>
+    <xsl:with-param name="label">Sujet - Nom géographique</xsl:with-param>
+  </xsl:call-template>
+
+  <xsl:call-template name="tag_subject">
+    <xsl:with-param name="tag">608</xsl:with-param>
+    <xsl:with-param name="label">Sujet - Forme</xsl:with-param>
+  </xsl:call-template>
+
+  <xsl:call-template name="tag_subject">
+    <xsl:with-param name="tag">610</xsl:with-param>
+    <xsl:with-param name="label">Sujet</xsl:with-param>
+  </xsl:call-template>
+
+  <xsl:call-template name="tag_subject">
+    <xsl:with-param name="tag">615</xsl:with-param>
+    <xsl:with-param name="label">Catégorie sujet</xsl:with-param>
+  </xsl:call-template>
+
+  <xsl:call-template name="tag_subject">
+    <xsl:with-param name="tag">616</xsl:with-param>
+    <xsl:with-param name="label">Marque déposée</xsl:with-param>
+  </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=856]">
     <span class="results_summary">
@@ -614,4 +567,5 @@
         </xsl:variable>
         <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
     </xsl:template>
+
 </xsl:stylesheet>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
index ea104f6548..612295eb60 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
@@ -19,31 +19,45 @@
   <xsl:variable name="leader" select="marc:leader"/>
   <xsl:variable name="leader6" select="substring($leader,7,1)"/>
   <xsl:variable name="leader7" select="substring($leader,8,1)"/>
-  <xsl:variable name="biblionumber" select="marc:datafield[@tag=090]/marc:subfield[@code='a']"/>
-  <xsl:variable name="isbn" select="marc:datafield[@tag=010]/marc:subfield[@code='a']"/>
-     	
+  <xsl:variable name="biblionumber"
+   select="marc:datafield[@tag=090]/marc:subfield[@code='a']"/>
+  <xsl:variable name="isbn"
+   select="marc:datafield[@tag=010]/marc:subfield[@code='a']"/>
+
   <xsl:if test="marc:datafield[@tag=200]">
     <xsl:for-each select="marc:datafield[@tag=200]">
-      	<a><xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
-        <xsl:value-of select="marc:subfield[@code='a']"/>
-      </a>
-      <xsl:if test="marc:subfield[@code='e']">
-        <xsl:text> : </xsl:text>
-        <xsl:value-of select="marc:subfield[@code='e']"/>
-      </xsl:if>
-      <xsl:if test="marc:subfield[@code='b']">
-        <xsl:text> [</xsl:text>
-        <xsl:value-of select="marc:subfield[@code='b']"/>
-        <xsl:text>]</xsl:text>
-      </xsl:if>
-      <xsl:if test="marc:subfield[@code='f']">
-        <xsl:text> / </xsl:text>
-        <xsl:value-of select="marc:subfield[@code='f']"/>
-      </xsl:if>
-      <xsl:if test="marc:subfield[@code='g']">
-        <xsl:text> ; </xsl:text>
-        <xsl:value-of select="marc:subfield[@code='g']"/>
-      </xsl:if>
+      <xsl:variable name="title" select="marc:subfield[@code='a']"/>
+      <xsl:variable name="ntitle"
+       select="translate($title, '&#x0098;&#x009C;','')"/>
+      <div>
+        <xsl:call-template name="addClassRtl" />
+        <span class="results_summary">
+          <span class="label"/>
+          <a>
+            <xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
+            <xsl:value-of select="$ntitle" />
+          </a>
+          <xsl:if test="marc:subfield[@code='e']">
+            <xsl:text> : </xsl:text>
+            <xsl:for-each select="marc:subfield[@code='e']">
+              <xsl:value-of select="."/>
+            </xsl:for-each>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='b']">
+            <xsl:text> [</xsl:text>
+            <xsl:value-of select="marc:subfield[@code='b']"/>
+            <xsl:text>]</xsl:text>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='f']">
+            <xsl:text> / </xsl:text>
+            <xsl:value-of select="marc:subfield[@code='f']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='g']">
+            <xsl:text> ; </xsl:text>
+            <xsl:value-of select="marc:subfield[@code='g']"/>
+          </xsl:if>
+        </span>
+      </div>
     </xsl:for-each>
   </xsl:if>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index 296b21cb70..7f73e92b29 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -1,55 +1,68 @@
 <?xml version='1.0'?>
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-	<xsl:template name="datafield">
-		<xsl:param name="tag"/>
-		<xsl:param name="ind1"><xsl:text> </xsl:text></xsl:param>
-		<xsl:param name="ind2"><xsl:text> </xsl:text></xsl:param>
-		<xsl:param name="subfields"/>
-		<xsl:element name="datafield">
-			<xsl:attribute name="tag">
-				<xsl:value-of select="$tag"/>
-			</xsl:attribute>
-			<xsl:attribute name="ind1">
-				<xsl:value-of select="$ind1"/>
-			</xsl:attribute>
-			<xsl:attribute name="ind2">
-				<xsl:value-of select="$ind2"/>
-			</xsl:attribute>
-			<xsl:copy-of select="$subfields"/>
-		</xsl:element>
-	</xsl:template>
+  <xsl:template name="datafield">
+    <xsl:param name="tag"/>
+    <xsl:param name="ind1"><xsl:text> </xsl:text></xsl:param>
+    <xsl:param name="ind2"><xsl:text> </xsl:text></xsl:param>
+    <xsl:param name="subfields"/>
+    <xsl:element name="datafield">
+      <xsl:attribute name="tag">
+        <xsl:value-of select="$tag"/>
+      </xsl:attribute>
+      <xsl:attribute name="ind1">
+        <xsl:value-of select="$ind1"/>
+      </xsl:attribute>
+      <xsl:attribute name="ind2">
+       <xsl:value-of select="$ind2"/>
+         </xsl:attribute>
+       <xsl:copy-of select="$subfields"/>
+    </xsl:element>
+  </xsl:template>
 
-	<xsl:template name="tag_210">
-    <xsl:for-each select="marc:datafield[@tag=210]">
-  	    <span class="results_summary">
-        <span class="label">Édition: </span> 
-        <xsl:value-of select="marc:subfield[@code='a']"/>
-        <xsl:if test="marc:subfield[@code='c']">
-          <xsl:if test="marc:subfield[@code='a']"> : </xsl:if>
-          <xsl:value-of select="marc:subfield[@code='c']"/>
-        </xsl:if>
-        <xsl:if test="marc:subfield[@code='d']">
-          <xsl:if test="marc:subfield[@code='a' or @code='c']">, </xsl:if>        
-          <xsl:value-of select="marc:subfield[@code='d']"/>
-        </xsl:if>
-        <xsl:value-of select="marc:subfield[@code='e']"/>
-        <xsl:if test="marc:subfield[@code='g']">
-          <xsl:if test="marc:subfield[@code='e']"> : </xsl:if>
-          <xsl:value-of select="marc:subfield[@code='g']"/>
-        </xsl:if>
-        <xsl:if test="marc:subfield[@code='h']">
-          <xsl:if test="marc:subfield[@code='e' or @code='g']">, </xsl:if>        
-          <xsl:value-of select="marc:subfield[@code='h']"/>
-        </xsl:if>
-      </span>
-    </xsl:for-each>
+  <xsl:template name="tag_210">
+    <span class="results_summary">
+      <span class="label">Édition: </span>
+      <xsl:for-each select="marc:datafield[@tag=210]">
+        <span>
+          <xsl:call-template name="addClassRtl" />
+          <xsl:value-of select="marc:subfield[@code='a']"/>
+          <xsl:if test="marc:subfield[@code='b']">
+            <xsl:if test="marc:subfield[@code='a']">, </xsl:if>
+            <xsl:value-of select="marc:subfield[@code='b']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='a' or @code='b']">
+            <xsl:if test="marc:subfield[@code='a']"> : </xsl:if>
+            <xsl:value-of select="marc:subfield[@code='c']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='d']">
+            <xsl:if test="marc:subfield[@code='a' or @code='c']">, </xsl:if>
+            <xsl:value-of select="marc:subfield[@code='d']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='e']">
+            <xsl:if test="marc:subfield[@code='a' or @code='c' or @code='d']"> — </xsl:if>
+            <xsl:value-of select="marc:subfield[@code='e']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='g']">
+            <xsl:if test="marc:subfield[@code='e']"> : </xsl:if>
+            <xsl:value-of select="marc:subfield[@code='g']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='h']">
+            <xsl:if test="marc:subfield[@code='e' or @code='g']">, </xsl:if>
+            <xsl:value-of select="marc:subfield[@code='h']"/>
+          </xsl:if>
+          <xsl:if test="not (position() = last())">
+            <xsl:text> • </xsl:text>
+          </xsl:if>
+        </span>
+      </xsl:for-each>
+    </span>
   </xsl:template>
 
 	<xsl:template name="tag_215">
     <xsl:for-each select="marc:datafield[@tag=215]">
   	  <span class="results_summary">
-        <span class="label">Description: </span> 
+        <span class="label">Description: </span>
         <xsl:if test="marc:subfield[@code='a']">
           <xsl:value-of select="marc:subfield[@code='a']"/>
         </xsl:if>
@@ -66,23 +79,25 @@
     </xsl:for-each>
   </xsl:template>
 
-
 	<xsl:template name="tag_4xx">
     <xsl:for-each select="marc:datafield[@tag=464 or @tag=461]">
     	  <span class="results_summary">
-        <span class="label">Extrait de: </span> 
-        <xsl:if test="marc:subfield[@code='t']">
-          <xsl:value-of select="marc:subfield[@code='t']"/>
-        </xsl:if>
-        <xsl:if test="marc:subfield[@code='e']"> :
-          <xsl:value-of select="marc:subfield[@code='e']"/>
-        </xsl:if>
-        <xsl:if test="marc:subfield[@code='f']"> /
-          <xsl:value-of select="marc:subfield[@code='f']"/>
-        </xsl:if>
-        <xsl:if test="marc:subfield[@code='v']">,
-          <xsl:value-of select="marc:subfield[@code='v']"/>
-        </xsl:if>
+        <span class="label">Extrait de: </span>
+        <span>
+          <xsl:call-template name="addClassRtl" />
+          <xsl:if test="marc:subfield[@code='t']">
+            <xsl:value-of select="marc:subfield[@code='t']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='e']"> :
+            <xsl:value-of select="marc:subfield[@code='e']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='f']"> /
+            <xsl:value-of select="marc:subfield[@code='f']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='v']">,
+            <xsl:value-of select="marc:subfield[@code='v']"/>
+          </xsl:if>
+        </span>
       </span>
     </xsl:for-each>
   </xsl:template>
@@ -130,10 +145,156 @@
 			<xsl:when test="not($chopString)"/>
 			<xsl:otherwise><xsl:value-of select="$chopString"/></xsl:otherwise>
 		</xsl:choose>
-<xsl:text> </xsl:text>
+    <xsl:text> </xsl:text>
 	</xsl:template>
-</xsl:stylesheet><!-- Stylus Studio meta-information - (c)1998-2002 eXcelon Corp.
-<metaInformation>
-<scenarios/><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
-</metaInformation>
--->
+
+	<xsl:template name="addClassRtl">
+    <xsl:variable name="lang" select="marc:subfield[@code='7']" />
+    <xsl:if test="$lang = 'ha' or $lang = 'Hebrew' or $lang = 'fa' or $lang = 'Arabe'">
+      <xsl:attribute name="class">rtl</xsl:attribute>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="tag_title">
+    <xsl:param name="tag" />
+    <xsl:param name="label" />
+    <xsl:if test="marc:datafield[@tag=$tag]">
+      <span class="results_summary">
+        <span class="label"><xsl:value-of select="$label"/>: </span>
+        <xsl:for-each select="marc:datafield[@tag=$tag]">
+          <xsl:value-of select="marc:subfield[@code='a']" />
+          <xsl:if test="marc:subfield[@code='d']">
+            <xsl:text> : </xsl:text>
+            <xsl:value-of select="marc:subfield[@code='e']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='e']">
+            <xsl:for-each select="marc:subfield[@code='e']">
+              <xsl:text> </xsl:text>
+              <xsl:value-of select="."/>
+            </xsl:for-each>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='f']">
+            <xsl:text> / </xsl:text>
+            <xsl:value-of select="marc:subfield[@code='f']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='h']">
+            <xsl:text>, </xsl:text>
+            <xsl:value-of select="marc:subfield[@code='h']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='i']">
+            <xsl:text>, </xsl:text>
+            <xsl:value-of select="marc:subfield[@code='i']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='v']">
+            <xsl:text>, </xsl:text>
+            <xsl:value-of select="marc:subfield[@code='v']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='x']">
+            <xsl:text>, </xsl:text>
+            <xsl:value-of select="marc:subfield[@code='x']"/>
+          </xsl:if>
+          <xsl:if test="marc:subfield[@code='z']">
+            <xsl:text>, </xsl:text>
+            <xsl:value-of select="marc:subfield[@code='z']"/>
+          </xsl:if>
+        </xsl:for-each>
+      </span>
+    </xsl:if>
+  </xsl:template>
+
+
+  <xsl:template name="tag_subject">
+    <xsl:param name="tag" />
+    <xsl:param name="label" />
+    <xsl:if test="marc:datafield[@tag=$tag]">
+      <span class="results_summary">
+        <span class="label"><xsl:value-of select="$label"/>: </span>
+        <xsl:for-each select="marc:datafield[@tag=$tag]">
+          <a>
+            <xsl:choose>
+              <xsl:when test="marc:subfield[@code=9]">
+                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
+              </xsl:otherwise>
+            </xsl:choose>
+            <xsl:call-template name="chopPunctuation">
+              <xsl:with-param name="chopString">
+                <xsl:call-template name="subfieldSelect">
+                    <xsl:with-param name="codes">abcdjpvxyz</xsl:with-param>
+                    <xsl:with-param name="subdivCodes">jpxyz</xsl:with-param>
+                    <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
+                </xsl:call-template>
+              </xsl:with-param>
+            </xsl:call-template>
+          </a>
+          <xsl:if test="not (position()=last())">
+            <xsl:text> | </xsl:text>
+          </xsl:if>
+        </xsl:for-each>
+      </span>
+    </xsl:if>
+  </xsl:template>
+
+
+  <xsl:template name="tag_7xx">
+    <xsl:param name="tag" />
+    <xsl:param name="label" />
+    <xsl:if test="marc:datafield[@tag=$tag]">
+      <span class="results_summary">
+        <span class="label"><xsl:value-of select="$label" />: </span>
+        <xsl:for-each select="marc:datafield[@tag=$tag]">
+          <span>
+            <xsl:call-template name="addClassRtl" />
+            <a>
+              <xsl:choose>
+                <xsl:when test="marc:subfield[@code=9]">
+                  <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='b']"/></xsl:attribute>
+                </xsl:otherwise>
+              </xsl:choose>
+              <xsl:if test="marc:subfield[@code='a']">
+                <xsl:value-of select="marc:subfield[@code='a']"/>
+              </xsl:if>
+              <xsl:if test="marc:subfield[@code='b']">
+                <xsl:text>, </xsl:text>
+                <xsl:value-of select="marc:subfield[@code='b']"/>
+              </xsl:if>
+              <xsl:if test="marc:subfield[@code='c']">
+                <xsl:text>, </xsl:text>
+                <xsl:value-of select="marc:subfield[@code='c']"/>
+              </xsl:if>
+              <xsl:if test="marc:subfield[@code='d']">
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="marc:subfield[@code='d']"/>
+              </xsl:if>
+              <xsl:if test="marc:subfield[@code='f']">
+                <span dir="ltr">
+                <xsl:text> (</xsl:text>
+                <xsl:value-of select="marc:subfield[@code='f']"/>
+                <xsl:text>)</xsl:text>
+                </span>
+              </xsl:if>
+              <xsl:if test="marc:subfield[@code='g']">
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="marc:subfield[@code='g']"/>
+              </xsl:if>
+              <xsl:if test="marc:subfield[@code='p']">
+                <xsl:text> </xsl:text>
+                <xsl:value-of select="marc:subfield[@code='p']"/>
+              </xsl:if>
+            </a>
+          </span>
+          <xsl:if test="not (position() = last())">
+            <xsl:text> ; </xsl:text>
+          </xsl:if>
+        </xsl:for-each>
+      </span>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
+
\ No newline at end of file
-- 
2.39.5