View | Details | Raw Unified | Return to bug 10292
Collapse All | Expand All

(-)a/C4/XSLT.pm (-4 / +21 lines)
Lines 136-141 sub getAuthorisedValues4MARCSubfields { Link Here
136
136
137
my $stylesheet;
137
my $stylesheet;
138
138
139
sub _get_best_default_xslt_filename {
140
    my ($htdocs, $theme, $lang, $base_xslfile) = @_;
141
142
    my @candidates = (
143
        "$htdocs/$theme/$lang/xslt/${base_xslfile}", # exact match
144
        "$htdocs/$theme/en/xslt/${base_xslfile}",    # if not, preferred theme in English
145
        "$htdocs/prog/$lang/xslt/${base_xslfile}",   # if not, 'prog' theme in preferred language
146
        "$htdocs/prog/en/xslt/${base_xslfile}",      # otherwise, prog theme in English; should always
147
                                                     # exist
148
    );
149
    my $xslfilename;
150
    foreach my $filename (@candidates) {
151
        $xslfilename = $filename;
152
        if (-f $filename) {
153
            last; # we have a winner!
154
        }
155
    }
156
    return $xslfilename;
157
}
158
139
sub XSLTParse4Display {
159
sub XSLTParse4Display {
140
    my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items ) = @_;
160
    my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items ) = @_;
141
    my $xslfilename = C4::Context->preference($xslsyspref);
161
    my $xslfilename = C4::Context->preference($xslsyspref);
Lines 165-174 sub XSLTParse4Display { Link Here
165
            $xslfile = C4::Context->preference('marcflavour') .
185
            $xslfile = C4::Context->preference('marcflavour') .
166
                       "slim2OPACResults.xsl";
186
                       "slim2OPACResults.xsl";
167
        }
187
        }
168
        $xslfilename = "$htdocs/$theme/$lang/xslt/$xslfile";
188
        $xslfilename = _get_best_default_xslt_filename($htdocs, $theme, $lang, $xslfile);
169
        $xslfilename = "$htdocs/$theme/en/xslt/$xslfile" unless ( $lang ne 'en' && -f $xslfilename );
170
        $xslfilename = "$htdocs/prog/$lang/xslt/$xslfile" unless ( -f $xslfilename );
171
        $xslfilename = "$htdocs/prog/en/xslt/$xslfile" unless ( $lang ne 'en' && -f $xslfilename );
172
    }
189
    }
173
190
174
    if ( $xslfilename =~ m/\{langcode\}/ ) {
191
    if ( $xslfilename =~ m/\{langcode\}/ ) {
(-)a/t/XSLT.t (-2 / +36 lines)
Lines 6-14 Link Here
6
use strict;
6
use strict;
7
use warnings;
7
use warnings;
8
8
9
use Test::More tests => 1;
9
use Test::More tests => 8;
10
use File::Temp;
11
use File::Path qw/make_path/;
10
12
11
BEGIN {
13
BEGIN {
12
        use_ok('C4::XSLT');
14
        use_ok('C4::XSLT');
13
}
15
}
14
16
15
- 
17
my $dir = File::Temp->newdir();
18
my @themes = ('prog', 'test');
19
my @langs = ('en', 'es-ES');
20
21
# create temporary files to be tested later
22
foreach my $theme (@themes) {
23
    foreach my $lang (@langs) {
24
        make_path("$dir/$theme/$lang/xslt");
25
        open my $fh, '>', "$dir/$theme/$lang/xslt/my_file.xslt";
26
        print $fh "Theme $theme, language $lang";
27
        close $fh;
28
    }
29
}
30
31
sub find_and_slurp {
32
    my ($dir, $theme, $lang) = @_;
33
34
    my $filename = C4::XSLT::_get_best_default_xslt_filename($dir, $theme, $lang, 'my_file.xslt');
35
    open my $fh, '<', $filename;
36
    my $str = <$fh>;
37
    close $fh;
38
    return $str;
39
}
40
41
# These tests verify that we're finding the right XSLT file when present,
42
# and falling back to the right XSLT file when an exact match is not present.
43
is(find_and_slurp($dir, 'test', 'en'   ), 'Theme test, language en',    'Found test/en');
44
is(find_and_slurp($dir, 'test', 'es-ES'), 'Theme test, language es-ES', 'Found test/es-ES');
45
is(find_and_slurp($dir, 'prog', 'en',  ), 'Theme prog, language en',    'Found test/en');
46
is(find_and_slurp($dir, 'prog', 'es-ES'), 'Theme prog, language es-ES', 'Found test/es-ES');
47
is(find_and_slurp($dir, 'test', 'fr-FR'), 'Theme test, language en',    'Fell back to test/en for test/fr-FR');
48
is(find_and_slurp($dir, 'nope', 'es-ES'), 'Theme prog, language es-ES', 'Fell back to prog/es-ES for nope/es-ES');
49
is(find_and_slurp($dir, 'nope', 'fr-FR'), 'Theme prog, language en',    'Fell back to prog/en for nope/fr-FR');

Return to bug 10292