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

(-)a/C4/Search.pm (-2 / +2 lines)
Lines 1867-1873 sub searchResults { Link Here
1867
    my $xslsyspref = $interface . "XSLTResultsDisplay";
1867
    my $xslsyspref = $interface . "XSLTResultsDisplay";
1868
    my $xslfile = C4::Context->preference($xslsyspref);
1868
    my $xslfile = C4::Context->preference($xslsyspref);
1869
    my $lang = C4::Languages::getlanguage();
1869
    my $lang = C4::Languages::getlanguage();
1870
    my ($sysxml) = C4::XSLT::_get_xslt_sysprefs();
1870
    my $sysxml = C4::XSLT::get_xslt_sysprefs();
1871
1871
1872
    # loop through all of the records we've retrieved
1872
    # loop through all of the records we've retrieved
1873
    for ( my $i = $offset ; $i <= $times - 1 ; $i++ ) {
1873
    for ( my $i = $offset ; $i <= $times - 1 ; $i++ ) {
Lines 2199-2205 sub searchResults { Link Here
2199
        # XSLT processing of some stuff
2199
        # XSLT processing of some stuff
2200
        # we fetched the sysprefs already before the loop through all retrieved record!
2200
        # we fetched the sysprefs already before the loop through all retrieved record!
2201
        if (!$scan && $xslfile) {
2201
        if (!$scan && $xslfile) {
2202
            $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, $xslsyspref, 1, \@hiddenitems, $sysxml, $xslfile);
2202
            $oldbiblio->{XSLTResultsRecord} = XSLTParse4Display($oldbiblio->{biblionumber}, $marcrecord, $xslsyspref, 1, \@hiddenitems, $sysxml, $xslfile, $lang);
2203
        # the last parameter tells Koha to clean up the problematic ampersand entities that Zebra outputs
2203
        # the last parameter tells Koha to clean up the problematic ampersand entities that Zebra outputs
2204
        }
2204
        }
2205
2205
(-)a/C4/XSLT.pm (-5 / +6 lines)
Lines 157-163 sub _get_best_default_xslt_filename { Link Here
157
    return $xslfilename;
157
    return $xslfilename;
158
}
158
}
159
159
160
sub _get_xslt_sysprefs {
160
sub get_xslt_sysprefs {
161
    my $sysxml = "<sysprefs>\n";
161
    my $sysxml = "<sysprefs>\n";
162
    foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow
162
    foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow
163
                              DisplayOPACiconsXSLT URLLinkText viewISBD
163
                              DisplayOPACiconsXSLT URLLinkText viewISBD
Lines 185-195 sub _get_xslt_sysprefs { Link Here
185
185
186
sub XSLTParse4Display {
186
sub XSLTParse4Display {
187
    my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items, $sysxml, $xslfilename, $lang ) = @_;
187
    my ( $biblionumber, $orig_record, $xslsyspref, $fixamps, $hidden_items, $sysxml, $xslfilename, $lang ) = @_;
188
    #my $xslfilename = C4::Context->preference($xslsyspref);
188
189
    $sysxml ||= C4::Context->preference($xslsyspref);
190
    $xslfilename ||= C4::Context->preference($xslsyspref);
191
    $lang ||= C4::Languages::getlanguage();
192
189
    if ( $xslfilename =~ /^\s*"?default"?\s*$/i ) {
193
    if ( $xslfilename =~ /^\s*"?default"?\s*$/i ) {
190
        my $htdocs;
194
        my $htdocs;
191
        my $theme;
195
        my $theme;
192
        # my $lang = C4::Languages::getlanguage();
193
        my $xslfile;
196
        my $xslfile;
194
        if ($xslsyspref eq "XSLTDetailsDisplay") {
197
        if ($xslsyspref eq "XSLTDetailsDisplay") {
195
            $htdocs  = C4::Context->config('intrahtdocs');
198
            $htdocs  = C4::Context->config('intrahtdocs');
Lines 216-222 sub XSLTParse4Display { Link Here
216
    }
219
    }
217
220
218
    if ( $xslfilename =~ m/\{langcode\}/ ) {
221
    if ( $xslfilename =~ m/\{langcode\}/ ) {
219
        my $lang = C4::Languages::getlanguage();
220
        $xslfilename =~ s/\{langcode\}/$lang/;
222
        $xslfilename =~ s/\{langcode\}/$lang/;
221
    }
223
    }
222
224
223
- 

Return to bug 15263