X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-MARCdetail.pl;h=2a69244228f84f774459b5358fa19b436606ea32;hb=815a6b62bd4ce34ea791ca795a62227c462d53ed;hp=7ab35798fa271daaa823a5cf84d86ef5d7f37193;hpb=fc1342f73df868410e0ab670981f25ba2e1acd74;p=koha_fer
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index 7ab35798fa..2a69244228 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -1,6 +1,7 @@
#!/usr/bin/perl
# Copyright 2000-2002 Katipo Communications
+# Parts copyright 2010 BibLibre
#
# This file is part of Koha.
#
@@ -13,9 +14,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.
=head1 NAME
@@ -23,6 +24,7 @@ MARCdetail.pl : script to show a biblio in MARC format
=head1 SYNOPSIS
+=cut
=head1 DESCRIPTION
@@ -40,11 +42,11 @@ the items attached to the biblio
=cut
use strict;
-require Exporter;
+use warnings;
+
use C4::Auth;
use C4::Context;
use C4::Output;
-use C4::Interface::CGI::Output;
use CGI;
use MARC::Record;
use C4::Biblio;
@@ -56,21 +58,44 @@ my $query = new CGI;
my $dbh = C4::Context->dbh;
my $biblionumber = $query->param('biblionumber');
-my $itemtype = &MARCfind_frameworkcode($biblionumber);
-my $tagslib = &MARCgettagslib( $dbh, 0, $itemtype );
-
-my $record = GetMarcBiblio($biblionumber);
-
+my $itemtype = &GetFrameworkCode($biblionumber);
+my $tagslib = &GetMarcStructure( 0, $itemtype );
+my $biblio = GetBiblioData($biblionumber);
+$biblionumber = $biblio->{biblionumber};
+my $record = GetMarcBiblio($biblionumber, 1);
+if ( ! $record ) {
+ print $query->redirect("/cgi-bin/koha/errors/404.pl");
+ exit;
+}
# open template
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "opac-MARCdetail.tmpl",
query => $query,
type => "opac",
- authnotrequired => 1,
+ authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
debug => 1,
}
);
+
+$template->param(
+ bibliotitle => $biblio->{title},
+);
+
+# get biblionumbers stored in the cart
+my @cart_list;
+
+if($query->cookie("bib_list")){
+ my $cart_list = $query->cookie("bib_list");
+ @cart_list = split(/\//, $cart_list);
+ if ( grep {$_ eq $biblionumber} @cart_list) {
+ $template->param( incart => 1 );
+ }
+}
+
+$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
+$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
+
# adding the $RequestOnOpac param
my $RequestOnOpac;
if (C4::Context->preference("RequestOnOpac")) {
@@ -82,7 +107,7 @@ my @loop_data = ();
my $tag;
# loop through each tab 0 through 9
-for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
+for ( my $tabloop = 0 ; $tabloop <= 9 ; $tabloop++ ) {
# loop through each tag
my @loop_data = ();
@@ -124,45 +149,30 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
}
else {
my @subf = $fields[$x_i]->subfields;
-
+ my $previous = '';
# loop through each subfield
for my $i ( 0 .. $#subf ) {
- $subf[$i][0] = "@" unless $subf[$i][0];
- next
- if (
- $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{tab}
- ne $tabloop );
- next
- if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
- ->{hidden} > 0 );
+ $subf[$i][0] = "@" unless defined($subf[$i][0]);
+ my $sf_def = $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] };
+ next if ( ($sf_def->{tab}||0) != $tabloop );
+ next if ( ($sf_def->{hidden}||0) > 0 );
my %subfield_data;
- $subfield_data{marc_lib} =
- $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib};
- $subfield_data{link} =
- $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{link};
+ $subfield_data{marc_lib} = ($sf_def->{lib} eq $previous) ? '--' : $sf_def->{lib};
+ $previous = $sf_def->{lib};
+ $subfield_data{link} = $sf_def->{link};
$subf[$i][1] =~ s/\n//g;
- if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
- ->{isurl} )
- {
- $subfield_data{marc_value} =
- "$subf[$i][1]";
+ if ( $sf_def->{isurl} ) {
+ $subfield_data{marc_value} = "$subf[$i][1]";
}
- elsif ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
- ->{kohafield} eq "biblioitems.isbn" )
- {
-
-# warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
- $subfield_data{marc_value} = DisplayISBN( $subf[$i][1] );
+ elsif ( defined($sf_def->{kohafield}) && $sf_def->{kohafield} eq "biblioitems.isbn" ) {
+ $subfield_data{marc_value} = $subf[$i][1];
}
else {
- if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
- ->{authtypecode} )
- {
+ if ( $sf_def->{authtypecode} ) {
$subfield_data{authority} = $fields[$x_i]->subfield(9);
}
- $subfield_data{marc_value} =
- GetAuthorisedValueDesc( $fields[$x_i]->tag(),
- $subf[$i][0], $subf[$i][1], '', $tagslib );
+ $subfield_data{marc_value} = GetAuthorisedValueDesc( $fields[$x_i]->tag(),
+ $subf[$i][0], $subf[$i][1], '', $tagslib, '', 'opac' );
}
$subfield_data{marc_subfield} = $subf[$i][0];
$subfield_data{marc_tag} = $fields[$x_i]->tag();
@@ -183,7 +193,10 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
}
else {
$tag_data{tag} =
- $fields[$x_i]->tag() . ' -'
+ $fields[$x_i]->tag()
+ . ' '
+ . C4::Koha::display_marc_indicators($fields[$x_i])
+ . ' - '
. $tagslib->{ $fields[$x_i]->tag() }->{lib};
}
}
@@ -193,7 +206,7 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
undef @subfields_data;
}
}
- $template->param( $tabloop . "XX" => \@loop_data );
+ $template->param( "tab" . $tabloop . "XX" => \@loop_data );
}
@@ -213,22 +226,20 @@ foreach my $field (@fields) {
# loop through each subfield
for my $i ( 0 .. $#subf ) {
- next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{tab} ne 10 );
- $witness{ $subf[$i][0] } =
- $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{lib};
- if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{isurl} ) {
- $this_row{ $subf[$i][0] } =
- "$subf[$i][1]";
+ my $sf_def = $tagslib->{ $field->tag() }->{ $subf[$i][0] };
+ next if ( ($sf_def->{tab}||0) != 10 );
+ next if ( ($sf_def->{hidden}||0) > 0 );
+ $witness{ $subf[$i][0] } = $sf_def->{lib};
+
+ if ( $sf_def->{isurl} ) {
+ $this_row{ $subf[$i][0] } = "$subf[$i][1]";
}
- elsif ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{kohafield} eq
- "biblioitems.isbn" )
- {
- $this_row{ $subf[$i][0] } = DisplayISBN( $subf[$i][1] );
+ elsif ( $sf_def->{kohafield} eq "biblioitems.isbn" ) {
+ $this_row{ $subf[$i][0] } = $subf[$i][1];
}
else {
- $this_row{ $subf[$i][0] } =
- GetAuthorisedValueDesc( $field->tag(), $subf[$i][0],
- $subf[$i][1], '', $tagslib );
+ $this_row{ $subf[$i][0] } = GetAuthorisedValueDesc( $field->tag(), $subf[$i][0],
+ $subf[$i][1], '', $tagslib, '', 'opac' );
}
}
if (%this_row) {
@@ -236,9 +247,9 @@ foreach my $field (@fields) {
}
}
my ( $holdingbrtagf, $holdingbrtagsubf ) =
- &MARCfind_marc_from_kohafield( $dbh, "items.holdingbranch", $itemtype );
+ &GetMarcFromKohaField( "items.holdingbranch", $itemtype );
@big_array =
- sort { $a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf} } @big_array;
+ sort { ($a->{$holdingbrtagsubf}||'') cmp ($b->{$holdingbrtagsubf}||'') } @big_array;
#fill big_row with missing datas
foreach my $subfield_code ( keys(%witness) ) {
@@ -271,6 +282,36 @@ if(C4::Context->preference("ISBD")) {
$template->param(ISBD => 1);
}
+#Export options
+my $OpacExportOptions=C4::Context->preference("OpacExportOptions");
+my @export_options = split(/\|/,$OpacExportOptions);
+$template->{VARS}->{'export_options'} = \@export_options;
+
+#Search for title in links
+my $marcflavour = C4::Context->preference("marcflavour");
+my $dat = TransformMarcToKoha( $dbh, $record );
+my $isbn = GetNormalizedISBN(undef,$record,$marcflavour);
+my $marccontrolnumber = GetMarcControlnumber ($record, $marcflavour);
+my $marcissns = GetMarcISSN( $record, $marcflavour );
+my $issn = $marcissns->[0] || '';
+
+if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
+ $dat->{title} =~ s/\/+$//; # remove trailing slash
+ $dat->{title} =~ s/\s+$//; # remove trailing space
+ $search_for_title = parametrized_url(
+ $search_for_title,
+ {
+ TITLE => $dat->{title},
+ AUTHOR => $dat->{author},
+ ISBN => $isbn,
+ ISSN => $issn,
+ CONTROLNUMBER => $marccontrolnumber,
+ BIBLIONUMBER => $biblionumber,
+ }
+ );
+ $template->param('OPACSearchForTitleIn' => $search_for_title);
+}
+
$template->param(
item_loop => \@item_value_loop,
item_header_loop => \@header_value_loop,