From 84be3e77091b99c60b244d8981301f18a73c0995 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Mon, 15 Sep 2014 10:16:31 -0300
Subject: [PATCH] Bug 12900: IntranetBiblioDefaultView doesn't do anything with
 NORMARC or UNIMARC XSLT

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../en/xslt/NORMARCslim2intranetResults.xsl   | 12 ++++++++++-
 .../prog/en/xslt/NORMARCslimUtils.xsl         | 21 +++++++++++++++++++
 .../en/xslt/UNIMARCslim2intranetResults.xsl   | 16 +++++++++++---
 .../prog/en/xslt/UNIMARCslimUtils.xsl         | 21 +++++++++++++++++++
 4 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl
index b4893b0ec3..b41c95b5da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl
@@ -23,6 +23,7 @@
         <xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/>
         <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
         <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
+        <xsl:variable name="IntranetBiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='IntranetBiblioDefaultView']"/>
         <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
         <xsl:variable name="leader" select="marc:leader"/>
         <xsl:variable name="leader6" select="substring($leader,7,1)"/>
@@ -243,7 +244,16 @@
 
         </xsl:variable>
 
-	<a><xsl:attribute name="href">/cgi-bin/koha/catalogue/detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute><xsl:attribute name="class">title</xsl:attribute>
+	<a>
+        <xsl:attribute name="href">
+            <xsl:call-template name="buildBiblioDefaultViewURL">
+                <xsl:with-param name="IntranetBiblioDefaultView">
+                    <xsl:value-of select="$IntranetBiblioDefaultView"/>
+                </xsl:with-param>
+            </xsl:call-template>
+            <xsl:value-of select="$biblionumber"/>
+        </xsl:attribute>
+        <xsl:attribute name="class">title</xsl:attribute>
 
         <xsl:if test="marc:datafield[@tag=245]">
         <xsl:for-each select="marc:datafield[@tag=245]">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
index eb0b2ba966..293f4cf887 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
@@ -51,6 +51,27 @@
 		</xsl:if>
 	</xsl:template>
 
+    <xsl:template name="buildBiblioDefaultViewURL">
+        <xsl:param name="IntranetBiblioDefaultView"/>
+        <xsl:choose>
+            <xsl:when test="$IntranetBiblioDefaultView='normal'">
+                <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text>
+            </xsl:when>
+            <xsl:when test="$IntranetBiblioDefaultView='isbd'">
+                <xsl:text>/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=</xsl:text>
+            </xsl:when>
+            <xsl:when test="$IntranetBiblioDefaultView='labeled_marc'">
+                <xsl:text>/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=</xsl:text>
+            </xsl:when>
+            <xsl:when test="$IntranetBiblioDefaultView='marc'">
+                <xsl:text>/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
 	<xsl:template name="chopPunctuation">
 		<xsl:param name="chopString"/>
 		<xsl:variable name="length" select="string-length($chopString)"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
index 62b6b7f260..fcc45103e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
@@ -15,6 +15,7 @@
 </xsl:template>
 
 <xsl:template match="marc:record">
+  <xsl:variable name="IntranetBiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='IntranetBiblioDefaultView']"/>
   <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)"/>
@@ -23,11 +24,20 @@
 
   <xsl:if test="marc:datafield[@tag=200]">
     <xsl:for-each select="marc:datafield[@tag=200]">
-	<a><xsl:attribute name="href">/cgi-bin/koha/catalogue/detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/>
-           </xsl:attribute>
+      <a>
+        <xsl:attribute name="href">
+          <xsl:call-template name="buildBiblioDefaultViewURL">
+            <xsl:with-param name="IntranetBiblioDefaultView">
+              <xsl:value-of select="$IntranetBiblioDefaultView"/>
+            </xsl:with-param>
+          </xsl:call-template>
+          <xsl:value-of select="$biblionumber"/>
+        </xsl:attribute>
+        <xsl:attribute name="class">title</xsl:attribute>
+
         <xsl:variable name="title" select="marc:subfield[@code='a']"/>
         <xsl:variable name="ntitle"
-             select="translate($title, '&#x0098;&#x009C;&#xC29C;&#xC29B;&#xC298;&#xC288;&#xC289;','')"/>
+            select="translate($title, '&#x0098;&#x009C;&#xC29C;&#xC29B;&#xC298;&#xC288;&#xC289;','')"/>
         <xsl:value-of select="$ntitle" />
       </a>
       <xsl:if test="marc:subfield[@code='e']">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index 7a92d2d796..65ec30683e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -139,6 +139,27 @@
 		</xsl:if>
 	</xsl:template>
 
+  <xsl:template name="buildBiblioDefaultViewURL">
+      <xsl:param name="IntranetBiblioDefaultView"/>
+      <xsl:choose>
+          <xsl:when test="$IntranetBiblioDefaultView='normal'">
+              <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text>
+          </xsl:when>
+          <xsl:when test="$IntranetBiblioDefaultView='isbd'">
+              <xsl:text>/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=</xsl:text>
+          </xsl:when>
+          <xsl:when test="$IntranetBiblioDefaultView='labeled_marc'">
+              <xsl:text>/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=</xsl:text>
+          </xsl:when>
+          <xsl:when test="$IntranetBiblioDefaultView='marc'">
+              <xsl:text>/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+              <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text>
+          </xsl:otherwise>
+      </xsl:choose>
+  </xsl:template>
+
 	<xsl:template name="chopSpecialCharacters">
         <xsl:param name="title" />
         <xsl:variable name="ntitle"
-- 
2.39.5