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

(-)a/C4/Search.pm (-8 / +8 lines)
Lines 1819-1826 sub searchResults { Link Here
1819
                $item->{'branchname'} = $branches{$item->{$otherbranch}};
1819
                $item->{'branchname'} = $branches{$item->{$otherbranch}};
1820
            }
1820
            }
1821
1821
1822
			my $prefix = $item->{$hbranch} . '--' . $item->{location} . $item->{itype} . $item->{itemcallnumber};
1822
            my $prefix = $item->{$hbranch} . '--' . $item->{location} . $item->{itype} . $item->{itemcallnumber};
1823
# For each grouping of items (onloan, available, unavailable), we build a key to store relevant info about that item
1823
            # For each grouping of items (onloan, available, unavailable), we build a key to store relevant info about that item
1824
            my $userenv = C4::Context->userenv;
1824
            my $userenv = C4::Context->userenv;
1825
            if ( $item->{onloan} && !(C4::Members::GetHideLostItemsPreference($userenv->{'number'}) && $item->{itemlost}) ) {
1825
            if ( $item->{onloan} && !(C4::Members::GetHideLostItemsPreference($userenv->{'number'}) && $item->{itemlost}) ) {
1826
                $onloan_count++;
1826
                $onloan_count++;
Lines 1930-1941 sub searchResults { Link Here
1930
                else {
1930
                else {
1931
                    $can_place_holds = 1;
1931
                    $can_place_holds = 1;
1932
                    $available_count++;
1932
                    $available_count++;
1933
					$available_items->{$prefix}->{count}++ if $item->{$hbranch};
1933
                    $available_items->{$prefix}->{count}++ if $item->{$hbranch};
1934
					foreach (qw(branchname itemcallnumber description)) {
1934
                    foreach (qw(branchname itemcallnumber description homebranch holdingbranch)) {
1935
                    	$available_items->{$prefix}->{$_} = $item->{$_};
1935
                        $available_items->{$prefix}->{$_} = $item->{$_};
1936
					}
1936
                    }
1937
					$available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} };
1937
                    $available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} };
1938
					$available_items->{$prefix}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
1938
                    $available_items->{$prefix}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
1939
                }
1939
                }
1940
            }
1940
            }
1941
        }    # notforloan, item level and biblioitem level
1941
        }    # notforloan, item level and biblioitem level
(-)a/C4/XSLT.pm (-1 / +1 lines)
Lines 188-194 sub XSLTParse4Display { Link Here
188
                              UseAuthoritiesForTracings TraceSubjectSubdivisions
188
                              UseAuthoritiesForTracings TraceSubjectSubdivisions
189
                              Display856uAsImage OPACDisplay856uAsImage 
189
                              Display856uAsImage OPACDisplay856uAsImage 
190
                              UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
190
                              UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
191
                              singleBranchMode OPACResultsBranchXSLT
191
                              singleBranchMode OPACResultsBranch
192
                              AlternateHoldingsField AlternateHoldingsSeparator / )
192
                              AlternateHoldingsField AlternateHoldingsSeparator / )
193
    {
193
    {
194
        my $sp = C4::Context->preference( $syspref );
194
        my $sp = C4::Context->preference( $syspref );
(-)a/Koha/Template/Plugin/Koha.pm (+49 lines)
Line 0 Link Here
1
package Koha::Template::Plugin::Koha;
2
3
# Copyright ByWater Solutions 2013
4
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Template::Plugin;
23
use base qw( Template::Plugin );
24
25
use C4::Koha;
26
use C4::Context;
27
28
=pod
29
30
This plugin contains various Koha replated Template Toolkit functions
31
to help streamline Koha and to move logic from the Perl code into the
32
Templates when it makes sense to do so.
33
34
To use, first, include the line '[% USE Koha %]' at the top
35
of the template to enable the plugin.
36
37
For example: [% IF Koha.Preference( 'MyPreference ) == 'SettingA' %]
38
removes the necessity of setting a template variable in Perl code for
39
each and every system preference, even if no evaluation of the setting
40
is necessary.
41
42
=cut
43
44
sub Preference {
45
    my ( $self, $pref ) = @_;
46
    return C4::Context->preference( $pref );
47
}
48
49
1;
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 408-411 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
408
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('NotesBlacklist','','List of notes fields that should not appear in the title notes/description separator of details',NULL,'free');
408
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('NotesBlacklist','','List of notes fields that should not appear in the title notes/description separator of details',NULL,'free');
409
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserCSS', '', NULL, 'Add CSS to be included in the SCO module in an embedded <style> tag.', 'free');
409
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserCSS', '', NULL, 'Add CSS to be included in the SCO module in an embedded <style> tag.', 'free');
410
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserJS', '', NULL, 'Define custom javascript for inclusion in the SCO module', 'free');
410
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserJS', '', NULL, 'Define custom javascript for inclusion in the SCO module', 'free');
411
INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('OPACResultsBranchXSLT', 'homebranch', 'homebranch|holdingbranch', 'Defines whether the OPAC displays the holding or home branch in search results when using XSLT', 'Choice');
411
INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('OPACResultsBranch', 'homebranch', 'homebranch|holdingbranch', 'Defines whether the OPAC displays the holding or home branch in search results when using XSLT', 'Choice');
(-)a/installer/data/mysql/updatedatabase.pl (-2 / +2 lines)
Lines 6349-6356 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
6349
6349
6350
$DBversion = "3.11.00.XXX";
6350
$DBversion = "3.11.00.XXX";
6351
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6351
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6352
    $dbh->do("INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('OPACResultsBranchXSLT', 'homebranch', 'homebranch|holdingbranch', 'Defines whether the OPAC displays the holding or home branch in search results when using XSLT', 'Choice')");
6352
    $dbh->do("INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('OPACResultsBranch', 'homebranch', 'homebranch|holdingbranch', 'Defines whether the OPAC displays the holding or home branch in search results when using XSLT', 'Choice')");
6353
    print "Upgrade to $DBversion done (Add syspref OPACResultsBranchXSLT)\n";
6353
    print "Upgrade to $DBversion done (Add syspref OPACResultsBranch)\n";
6354
    SetVersion($DBversion);
6354
    SetVersion($DBversion);
6355
}
6355
}
6356
6356
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-2 / +1 lines)
Lines 74-84 OPAC: Link Here
74
            - icons for itemtype and authorized values.
74
            - icons for itemtype and authorized values.
75
        -
75
        -
76
            - On search result pages displayed with XSLT stylesheets on the OPAC, show the item's
76
            - On search result pages displayed with XSLT stylesheets on the OPAC, show the item's
77
            - pref: OPACResultsBranchXSLT
77
            - pref: OPACResultsBranch
78
              choices:
78
              choices:
79
                  holdingbranch: "holding branch"
79
                  holdingbranch: "holding branch"
80
                  homebranch: "home branch"
80
                  homebranch: "home branch"
81
            - icons for itemtype and authorized values.
82
        -
81
        -
83
            - pref: COinSinOPACResults
82
            - pref: COinSinOPACResults
84
              choices:
83
              choices:
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt (-2 / +7 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
2
[% USE KohaBranchName %]
1
[% SET TagsShowEnabled = ( TagsEnabled && TagsShowOnList ) %]
3
[% SET TagsShowEnabled = ( TagsEnabled && TagsShowOnList ) %]
2
[% SET TagsInputEnabled = ( opacuserlogin && TagsEnabled && TagsInputOnList ) %]
4
[% SET TagsInputEnabled = ( opacuserlogin && TagsEnabled && TagsInputOnList ) %]
3
5
Lines 498-506 $(document).ready(function(){ Link Here
498
                    [% IF ( singleBranchMode ) %]
500
                    [% IF ( singleBranchMode ) %]
499
                        [% available_items_loo.location %]
501
                        [% available_items_loo.location %]
500
                    [% ELSE %]
502
                    [% ELSE %]
501
                        [% available_items_loo.branchname %]
503
                        [% IF Koha.Preference('OPACResultsBranch') == 'homebranch' %]
504
                            [% available_items_loo.homebranch | $KohaBranchName %]
505
                        [% ELSE %]
506
                            [% available_items_loo.holdingbranch | $KohaBranchName %]
507
                        [% END %]
502
                    [% END %]
508
                    [% END %]
503
504
                    [% IF ( OPACItemsResultsDisplay ) %]
509
                    [% IF ( OPACItemsResultsDisplay ) %]
505
                        [% UNLESS ( singleBranchMode ) %][% available_items_loo.location %][% END %]
510
                        [% UNLESS ( singleBranchMode ) %][% available_items_loo.location %][% END %]
506
                        [% IF ( available_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/opac-search.pl?q=callnum:[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% END %]
511
                        [% IF ( available_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/opac-search.pl?q=callnum:[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl (-5 / +5 lines)
Lines 20-26 Link Here
20
        <!-- Option: Display Alternate Graphic Representation (MARC 880)  -->
20
        <!-- Option: Display Alternate Graphic Representation (MARC 880)  -->
21
        <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
21
        <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
22
22
23
    <xsl:variable name="OPACResultsBranchXSLT" select="marc:sysprefs/marc:syspref[@name='OPACResultsBranchXSLT']"/>
23
    <xsl:variable name="OPACResultsBranch" select="marc:sysprefs/marc:syspref[@name='OPACResultsBranch']"/>
24
    <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
24
    <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
25
    <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
25
    <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
26
    <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>
26
    <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>
Lines 1040-1046 Link Here
1040
                   </xsl:when>
1040
                   </xsl:when>
1041
                   <xsl:otherwise>
1041
                   <xsl:otherwise>
1042
                        <xsl:choose>
1042
                        <xsl:choose>
1043
                            <xsl:when test="$OPACResultsBranchXSLT='homebranch'">
1043
                            <xsl:when test="$OPACResultsBranch='homebranch'">
1044
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1044
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1045
                                   <xsl:value-of select="items:homebranch"/>
1045
                                   <xsl:value-of select="items:homebranch"/>
1046
                                   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
1046
                                   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
Lines 1050-1056 Link Here
1050
                                   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1050
                                   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1051
                               </xsl:for-each>
1051
                               </xsl:for-each>
1052
                            </xsl:when>
1052
                            </xsl:when>
1053
                            <xsl:when test="$OPACResultsBranchXSLT='holdingbranch'">
1053
                            <xsl:when test="$OPACResultsBranch='holdingbranch'">
1054
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
1054
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
1055
                                   <xsl:value-of select="items:holdingbranch"/>
1055
                                   <xsl:value-of select="items:holdingbranch"/>
1056
                                   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
1056
                                   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
Lines 1081-1087 Link Here
1081
                       <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/>
1081
                       <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/>
1082
1082
1083
                      <xsl:choose>
1083
                      <xsl:choose>
1084
                          <xsl:when test="$OPACResultsBranchXSLT='homebranch'">
1084
                          <xsl:when test="$OPACResultsBranch='homebranch'">
1085
                              <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1085
                              <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1086
                                  <xsl:value-of select="items:homebranch"/>
1086
                                  <xsl:value-of select="items:homebranch"/>
1087
                                  <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
1087
                                  <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
Lines 1091-1097 Link Here
1091
                                  <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1091
                                  <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1092
                              </xsl:for-each>
1092
                              </xsl:for-each>
1093
                          </xsl:when>
1093
                          </xsl:when>
1094
                          <xsl:when test="$OPACResultsBranchXSLT='holdingbranch'">
1094
                          <xsl:when test="$OPACResultsBranch='holdingbranch'">
1095
                              <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
1095
                              <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
1096
                                  <xsl:value-of select="items:holdingbranch"/>
1096
                                  <xsl:value-of select="items:holdingbranch"/>
1097
                                  <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
1097
                                  <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl (-5 / +5 lines)
Lines 28-34 Link Here
28
  <xsl:variable name="isbn"
28
  <xsl:variable name="isbn"
29
   select="marc:datafield[@tag=010]/marc:subfield[@code='a']"/>
29
   select="marc:datafield[@tag=010]/marc:subfield[@code='a']"/>
30
30
31
  <xsl:variable name="OPACResultsBranchXSLT" select="marc:sysprefs/marc:syspref[@name='OPACResultsBranchXSLT']"/>
31
  <xsl:variable name="OPACResultsBranch" select="marc:sysprefs/marc:syspref[@name='OPACResultsBranch']"/>
32
  <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
32
  <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
33
  <xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>
33
  <xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>
34
34
Lines 147-153 Link Here
147
        </xsl:when>
147
        </xsl:when>
148
        <xsl:otherwise>
148
        <xsl:otherwise>
149
          <xsl:choose>
149
          <xsl:choose>
150
            <xsl:when test="$OPACResultsBranchXSLT='homebranch'">
150
            <xsl:when test="$OPACResultsBranch='homebranch'">
151
              <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
151
              <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
152
                <xsl:value-of select="items:homebranch"/>
152
                <xsl:value-of select="items:homebranch"/>
153
                <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
153
                <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
Lines 157-163 Link Here
157
                <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
157
                <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
158
              </xsl:for-each>
158
              </xsl:for-each>
159
            </xsl:when>
159
            </xsl:when>
160
            <xsl:when test="$OPACResultsBranchXSLT='holdingbranch'">
160
            <xsl:when test="$OPACResultsBranch='holdingbranch'">
161
              <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
161
              <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
162
                <xsl:value-of select="items:holdingbranch"/>
162
                <xsl:value-of select="items:holdingbranch"/>
163
                <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
163
                <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
Lines 180-186 Link Here
180
          <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/>
180
          <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/>
181
181
182
          <xsl:choose>
182
          <xsl:choose>
183
              <xsl:when test="$OPACResultsBranchXSLT='homebranch'">
183
              <xsl:when test="$OPACResultsBranch='homebranch'">
184
                  <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
184
                  <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
185
                      <xsl:value-of select="items:homebranch"/>
185
                      <xsl:value-of select="items:homebranch"/>
186
                      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
186
                      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
Lines 190-196 Link Here
190
                      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
190
                      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
191
                  </xsl:for-each>
191
                  </xsl:for-each>
192
              </xsl:when>
192
              </xsl:when>
193
              <xsl:when test="$OPACResultsBranchXSLT='holdingbranch'">
193
              <xsl:when test="$OPACResultsBranch='holdingbranch'">
194
                  <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
194
                  <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
195
                      <xsl:value-of select="items:holdingbranch"/>
195
                      <xsl:value-of select="items:holdingbranch"/>
196
                      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
196
                      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
(-)a/opac/opac-search.pl (-3 / +1 lines)
Lines 833-838 if (C4::Context->preference('GoogleIndicTransliteration')) { Link Here
833
}
833
}
834
834
835
$template->{VARS}->{DidYouMean} = C4::Context->preference('OPACdidyoumean') =~ m/enable/;
835
$template->{VARS}->{DidYouMean} = C4::Context->preference('OPACdidyoumean') =~ m/enable/;
836
836
$template->param( borrowernumber    => $borrowernumber);
837
    $template->param( borrowernumber    => $borrowernumber);
838
output_with_http_headers $cgi, $cookie, $template->output, $content_type;
837
output_with_http_headers $cgi, $cookie, $template->output, $content_type;
839
- 

Return to bug 7441