@@ -, +, @@
filename for compact xsl is now based on marcflavour
---
catalogue/cardview.pl | 3 ++-
catalogue/showmarc.pl | 3 ++-
.../intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl | 19 ++++++-------------
3 files changed, 10 insertions(+), 15 deletions(-)
--- a/catalogue/cardview.pl
+++ a/catalogue/cardview.pl
@@ -32,7 +32,8 @@ $template->param(biblionumber => $biblionumber);
my $xmlrecord = GetXmlBiblio($biblionumber);
#my $xslfile = "/home/kohacat/etc/xslt/MARC21slim2HTML.xsl";
#my $xslfile = "/home/kohacat/etc/xslt/MARC21slim2English.xsl";
-my $xslfile = C4::Context->config('intranetdir')."/koha-tmpl/intranet-tmpl/prog/en/xslt/compact.xsl";
+my $filename=(C4::Context->preference('marcflavour') ne "MARC21"?C4::Context->preference('marcflavour')."_":"").'compact.xsl';
+my $xslfile = C4::Context->config('intranetdir')."/koha-tmpl/intranet-tmpl/prog/en/xslt/$filename";
my $parser = XML::LibXML->new();
my $xslt = XML::LibXSLT->new();
my $source = $parser->parse_string($xmlrecord);
--- a/catalogue/showmarc.pl
+++ a/catalogue/showmarc.pl
@@ -69,7 +69,8 @@ if($importid) {
if($view eq 'card') {
$xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord;
-my $xslfile = C4::Context->config('intrahtdocs')."/prog/en/xslt/compact.xsl";
+my $filename=(C4::Context->preference('marcflavour') ne "MARC21"?C4::Context->preference('marcflavour')."_":"").'compact.xsl';
+my $xslfile = C4::Context->config('intrahtdocs')."/prog/en/xslt/$filename";
my $parser = XML::LibXML->new();
my $xslt = XML::LibXSLT->new();
my $source = $parser->parse_string($xmlrecord);
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl
+++ a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl
@@ -34,28 +34,21 @@
-
+
-
-
-
-
-
-
-
- .
-
-
- .
+
+
+ .
+
@@ -78,7 +71,7 @@
-
+
--
--