X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-MARCdetail.pl;h=ffa0a6d7df3fb0eb4ee17ae9c417657fd2ae509e;hb=5e94de956610072d3d37bbbde1c8d48920414118;hp=849c56456a2b1349dac0e808a0b84f7da7e9c38a;hpb=886368370d51c9ece9fbd5bd4be0078eb1ec7f2e;p=koha_gimpoz
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index 849c56456a..ffa0a6d7df 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
@@ -59,15 +61,18 @@ my $biblionumber = $query->param('biblionumber');
my $itemtype = &GetFrameworkCode($biblionumber);
my $tagslib = &GetMarcStructure( 0, $itemtype );
my $biblio = GetBiblioData($biblionumber);
-my $record = GetMarcBiblio($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,
}
);
@@ -132,46 +137,29 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
}
else {
my @subf = $fields[$x_i]->subfields;
- my $previous;
+ 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 );
+ my $sf_def = $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] };
+ next if ( ($sf_def->{tab}||'') ne $tabloop );
+ next if ( ($sf_def->{hidden}||0) > 0 );
my %subfield_data;
- $subfield_data{marc_lib} =
- ($tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib} eq $previous) ?
- '--' :
- $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib};
- $previous = $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]);
+ 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(),
+ $subfield_data{marc_value} = GetAuthorisedValueDesc( $fields[$x_i]->tag(),
$subf[$i][0], $subf[$i][1], '', $tagslib, '', 'opac' );
}
$subfield_data{marc_subfield} = $subf[$i][0];
@@ -206,7 +194,7 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
undef @subfields_data;
}
}
- $template->param( $tabloop . "XX" => \@loop_data );
+ $template->param( "tab" . $tabloop . "XX" => \@loop_data );
}
@@ -226,23 +214,19 @@ foreach my $field (@fields) {
# loop through each subfield
for my $i ( 0 .. $#subf ) {
- next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{tab} ne 10 );
- next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{hidden} > 0 );
- $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}||'') ne 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" )
- {
+ 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],
+ $this_row{ $subf[$i][0] } = GetAuthorisedValueDesc( $field->tag(), $subf[$i][0],
$subf[$i][1], '', $tagslib, '', 'opac' );
}
}
@@ -253,7 +237,7 @@ foreach my $field (@fields) {
my ( $holdingbrtagf, $holdingbrtagsubf ) =
&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) ) {
@@ -286,6 +270,16 @@ if(C4::Context->preference("ISBD")) {
$template->param(ISBD => 1);
}
+#Search for title in links
+if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
+ $biblio->{author} ? $search_for_title =~ s/{AUTHOR}/$biblio->{author}/g : $search_for_title =~ s/{AUTHOR}//g;
+ $biblio->{title} =~ s/\/+$//; # remove trailing slash
+ $biblio->{title} =~ s/\s+$//; # remove trailing space
+ $biblio->{title} ? $search_for_title =~ s/{TITLE}/$biblio->{title}/g : $search_for_title =~ s/{TITLE}//g;
+ $biblio->{isbn} ? $search_for_title =~ s/{ISBN}/$biblio->{isbn}/g : $search_for_title =~ s/{ISBN}//g;
+ $template->param('OPACSearchForTitleIn' => $search_for_title);
+}
+
$template->param(
item_loop => \@item_value_loop,
item_header_loop => \@header_value_loop,