Remove now-unnecessary debian-specific patch.

[koha.git] / opac / opac-detail.pl

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 9af15a8..db4939e 100755 (executable)
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -13,9 +13,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 use strict;
@@ -72,7 +72,7 @@ if ( ! $record ) {
 }
 $template->param( biblionumber => $biblionumber );
 # XSLT processing of some stuff
-if (C4::Context->preference("XSLTDetailsDisplay") ) {
+if (C4::Context->preference("OPACXSLTDetailsDisplay") ) {
     $template->param(
         'XSLTBloc' => XSLTParse4Display($biblionumber, $record, 'Detail'),'opac' );
 }
@@ -204,7 +204,7 @@ my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour);
 my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour);
 my $marcseriesarray  = GetMarcSeries  ($record,$marcflavour);
 my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
-my $subtitle         = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $record, '');
+my $subtitle         = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));
 
     $template->param(
                      MARCNOTES               => $marcnotesarray,
@@ -364,9 +364,11 @@ if ( C4::Context->preference("OPACAmazonEnabled") ) {
 my $syndetics_elements;
 
 if ( C4::Context->preference("SyndeticsEnabled") ) {
+    $template->param("SyndeticsEnabled" => 1);
+    $template->param("SyndeticsClientCode" => C4::Context->preference("SyndeticsClientCode"));
        eval {
-    $syndetics_elements = &get_syndetics_index($isbn,$upc,$oclc);
-       for my $element (values %$syndetics_elements) {
+           $syndetics_elements = &get_syndetics_index($isbn,$upc,$oclc);
+           for my $element (values %$syndetics_elements) {
                $template->param("Syndetics$element"."Exists" => 1 );
                #warn "Exists: "."Syndetics$element"."Exists";
        }
@@ -378,8 +380,8 @@ if ( C4::Context->preference("SyndeticsEnabled")
         && C4::Context->preference("SyndeticsSummary")
         && ( exists($syndetics_elements->{'SUMMARY'}) || exists($syndetics_elements->{'AVSUMMARY'}) ) ) {
        eval {
-       my $syndetics_summary = &get_syndetics_summary($isbn,$upc,$oclc, $syndetics_elements);
-       $template->param( SYNDETICS_SUMMARY => $syndetics_summary );
+           my $syndetics_summary = &get_syndetics_summary($isbn,$upc,$oclc, $syndetics_elements);
+           $template->param( SYNDETICS_SUMMARY => $syndetics_summary );
        };
        warn $@ if $@;
 
@@ -586,6 +588,8 @@ if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->pref
 #Search for title in links
 if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
     $dat->{author} ? $search_for_title =~ s/{AUTHOR}/$dat->{author}/g : $search_for_title =~ s/{AUTHOR}//g;
+    $dat->{title} =~ s/\/+$//; # remove trailing slash
+    $dat->{title} =~ s/\s+$//; # remove trailing space
     $dat->{title} ? $search_for_title =~ s/{TITLE}/$dat->{title}/g : $search_for_title =~ s/{TITLE}//g;
     $isbn ? $search_for_title =~ s/{ISBN}/$isbn/g : $search_for_title =~ s/{ISBN}//g;
  $template->param('OPACSearchForTitleIn' => $search_for_title);