X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=authorities%2Fdetail.pl;h=d4f2c6730c76f19fb0aeefebdfd7fe5558066eff;hb=refs%2Fheads%2Fffzg-1059-zebra_spine_label;hp=e2849ba56ec17beb5fabfdfe6b8a826e15166e23;hpb=8b7085a8abd9226f5dbb3cb5b295e4bc9e4b9cba;p=koha.git
diff --git a/authorities/detail.pl b/authorities/detail.pl
index e2849ba56e..d4f2c6730c 100755
--- a/authorities/detail.pl
+++ b/authorities/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.
=head1 NAME
@@ -23,6 +23,7 @@ detail.pl : script to show an authority in MARC format
=head1 SYNOPSIS
+=cut
=head1 DESCRIPTION
@@ -33,13 +34,12 @@ parameters tables.
=head1 FUNCTIONS
-=over 2
-
=cut
use strict;
-require Exporter;
+use warnings;
+
use C4::AuthoritiesMarc;
use C4::Auth;
use C4::Context;
@@ -47,299 +47,16 @@ use C4::Output;
use CGI;
use MARC::Record;
use C4::Koha;
-# use C4::Biblio;
-# use C4::Catalogue;
our ($tagslib);
-=item find_value
-
- ($indicators, $value) = find_value($tag, $subfield, $record,$encoding);
-
-Find the given $subfield in the given $tag in the given
-MARC::Record $record. If the subfield is found, returns
-the (indicators, value) pair; otherwise, (undef, undef) is
-returned.
-
-=cut
-
-sub find_value {
- my ($tagfield,$insubfield,$record,$encoding) = @_;
- my @result;
- my $indicator;
- if ($tagfield <10) {
- if ($record->field($tagfield)) {
- push @result, $record->field($tagfield)->data();
- } else {
- push @result,"";
- }
- } else {
- foreach my $field ($record->field($tagfield)) {
- my @subfields = $field->subfields();
- foreach my $subfield (@subfields) {
- if (@$subfield[0] eq $insubfield) {
- push @result,@$subfield[1];
- $indicator = $field->indicator(1).$field->indicator(2);
- }
- }
- }
- }
- return($indicator,@result);
-}
-
-
-=item build_authorized_values_list
-
-=cut
-
-sub build_authorized_values_list ($$$$$$$) {
- my ( $tag, $subfield, $value, $dbh, $authorised_values_sth,$index_tag,$index_subfield ) = @_;
-
- my @authorised_values;
- my %authorised_lib;
-
- # builds list, depending on authorised value...
-
- #---- branch
- if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
- my $sth =
- $dbh->prepare(
- "select branchcode,branchname from branches order by branchname");
- $sth->execute;
- push @authorised_values, ""
- unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
-
- while ( my ( $branchcode, $branchname ) = $sth->fetchrow_array ) {
- push @authorised_values, $branchcode;
- $authorised_lib{$branchcode} = $branchname;
- }
-
- #----- itemtypes
- }
- elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
- my $sth =
- $dbh->prepare(
- "select itemtype,description from itemtypes order by description");
- $sth->execute;
- push @authorised_values, ""
- unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
-
- my $itemtype;
-
- while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) {
- push @authorised_values, $itemtype;
- $authorised_lib{$itemtype} = $description;
- }
- $value = $itemtype unless ($value);
-
- #---- "true" authorised value
- }
- else {
- $authorised_values_sth->execute(
- $tagslib->{$tag}->{$subfield}->{authorised_value} );
-
- push @authorised_values, ""
- unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
-
- while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
- push @authorised_values, $value;
- $authorised_lib{$value} = $lib;
- }
- }
- return CGI::scrolling_list(
- -name => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
- -values => \@authorised_values,
- -default => $value,
- -labels => \%authorised_lib,
- -override => 1,
- -size => 1,
- -multiple => 0,
- -tabindex => 1,
- -id => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
- -class => "input_marceditor",
- );
-}
-
-
-=item create_input
- builds the entry for a subfield.
-=cut
-
-sub create_input {
- my ( $tag, $subfield, $value, $index_tag, $tabloop, $rec, $authorised_values_sth,$cgi ) = @_;
-
- my $index_subfield = CreateKey(); # create a specifique key for each subfield
-
- $value =~ s/"/"/g;
-
- # if there is no value provided but a default value in parameters, get it
- unless ($value) {
- $value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
- # get today date & replace YYYY, MM, DD if provided in the default value
- my ( $year, $month, $day ) = Today();
- $month = sprintf( "%02d", $month );
- $day = sprintf( "%02d", $day );
- $value =~ s/YYYY/$year/g;
- $value =~ s/MM/$month/g;
- $value =~ s/DD/$day/g;
- }
- my $dbh = C4::Context->dbh;
- my %subfield_data = (
- tag => $tag,
- subfield => $subfield,
- marc_lib => substr( $tagslib->{$tag}->{$subfield}->{lib}, 0, 22 ),
- marc_lib_plain => $tagslib->{$tag}->{$subfield}->{lib},
- tag_mandatory => $tagslib->{$tag}->{mandatory},
- mandatory => $tagslib->{$tag}->{$subfield}->{mandatory},
- repeatable => $tagslib->{$tag}->{$subfield}->{repeatable},
- kohafield => $tagslib->{$tag}->{$subfield}->{kohafield},
- index => $index_tag,
- id => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
- value => $value,
- );
- if($subfield eq '@'){
- $subfield_data{id} = "tag_".$tag."_subfield_00_".$index_tag."_".$index_subfield;
- } else {
- $subfield_data{id} = "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield;
- }
-
-
- $subfield_data{visibility} = "display:none;"
- if ( ($tagslib->{$tag}->{$subfield}->{hidden} % 2 == 1) and $value ne ''
- or ($value eq '' and !$tagslib->{$tag}->{$subfield}->{mandatory})
- );
-
- # it's an authorised field
- if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) {
- $subfield_data{marc_value} =
- build_authorized_values_list( $tag, $subfield, $value, $dbh,
- $authorised_values_sth,$index_tag,$index_subfield );
-
- # it's a thesaurus / authority field
- }
- elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
- $subfield_data{marc_value} =
- "
- {$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}')\">...
- ";
- # it's a plugin field
- }
- elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) {
-
- # opening plugin. Just check wether we are on a developper computer on a production one
- # (the cgidir differs)
- my $cgidir = C4::Context->intranetdir . "/cgi-bin/cataloguing/value_builder";
- unless ( opendir( DIR, "$cgidir" ) ) {
- $cgidir = C4::Context->intranetdir . "/cataloguing/value_builder";
- }
- my $plugin = $cgidir . "/" . $tagslib->{$tag}->{$subfield}->{'value_builder'};
- do $plugin || die "Plugin Failed: ".$plugin;
- my $extended_param = plugin_parameters( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
- my ( $function_name, $javascript ) = plugin_javascript( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
-# my ( $function_name, $javascript,$extended_param );
-
- $subfield_data{marc_value} =
- "
- ...
- $javascript";
- # it's an hidden field
- }
- elsif ( $tag eq '' ) {
- $subfield_data{marc_value} =
- "
- ";
- }
- elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) {
- $subfield_data{marc_value} =
- "";
-
- # it's a standard field
- }
- else {
- if (
- length($value) > 100
- or
- ( C4::Context->preference("marcflavour") eq "UNIMARC" && $tag >= 300
- and $tag < 400 && $subfield eq 'a' )
- or ( $tag >= 500
- and $tag < 600
- && C4::Context->preference("marcflavour") eq "MARC21" )
- )
- {
- $subfield_data{marc_value} =
- "
- ";
- }
- else {
- $subfield_data{marc_value} =
- "
- ";
- }
- }
- $subfield_data{'index_subfield'} = $index_subfield;
- return \%subfield_data;
-}
-
-=item CreateKey
-
- Create a random value to set it into the input name
-
-=cut
-
-sub CreateKey(){
- return int(rand(1000000));
-}
-
-sub build_tabs ($$$$$) {
+sub build_tabs {
my ( $template, $record, $dbh, $encoding,$input ) = @_;
# fill arrays
my @loop_data = ();
my $tag;
- my $authorised_values_sth = $dbh->prepare(
- "select authorised_value,lib
- from authorised_values
- where category=? order by lib"
- );
-
# in this array, we will push all the 10 tabs
# to avoid having 10 tabs in the template : they will all be in the same BIG_LOOP
my @BIG_LOOP;
@@ -359,18 +76,16 @@ sub build_tabs ($$$$$) {
foreach my $tag (sort @tab_data) {
$i++;
next if ! $tag;
- my $indicator;
- my $index_tag = CreateKey;
# if MARC::Record is not empty =>use it as master loop, then add missing subfields that should be in the tab.
# if MARC::Record is empty => use tab as master loop.
- if ( $record ne -1 && ( $record->field($tag) || $tag eq '000' ) ) {
+ if ( $record != -1 && ( $record->field($tag) || $tag eq '000' ) ) {
my @fields;
if ( $tag ne '000' ) {
@fields = $record->field($tag);
}
else {
- push @fields, $record->leader(); # if tag == 000
+ push @fields, MARC::Field->new('000', $record->leader()); # if tag == 000
}
# loop through each field
foreach my $field (@fields) {
@@ -419,7 +134,10 @@ sub build_tabs ($$$$$) {
}
if ($#subfields_data>=0) {
my %tag_data;
- $tag_data{tag}=$field->tag().' - '. $tagslib->{$field->tag()}->{lib};
+ $tag_data{tag}=$field->tag(). ' '
+ . C4::Koha::display_marc_indicators($field)
+ . ' - '
+ . $tagslib->{$field->tag()}->{lib};
$tag_data{subfield} = \@subfields_data;
push (@loop_data, \%tag_data);
}
@@ -427,7 +145,6 @@ sub build_tabs ($$$$$) {
}
}
if ( $#loop_data >= 0 ) {
- warn "pushing : $tabloop = ".Data::Dumper::Dumper(@loop_data);
push @BIG_LOOP, {
number => $tabloop,
innerloop => \@loop_data,
@@ -455,12 +172,33 @@ my ($template, $loggedinuser, $cookie)
my $authid = $query->param('authid');
+# Using default authtypecode, so all fields are seen
+my $authtypecode = '';
+$tagslib = &GetTagsLabels(1,$authtypecode);
+# Build list of authtypes for showing them
+my $authtypes = getauthtypes;
+my @authtypesloop;
-my $authtypecode = &GetAuthTypeCode($authid);
-$tagslib = &GetTagsLabels(1,$authtypecode);
+foreach my $thisauthtype (sort { $authtypes->{$b} cmp $authtypes->{$a} } keys %$authtypes) {
+ my %row =(value => $thisauthtype,
+ selected => $thisauthtype eq $authtypecode,
+ authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+ );
+ push @authtypesloop, \%row;
+}
+
+my $record=GetAuthority($authid);
+
+if (not defined $record) {
+ # authid invalid
+ $template->param ( errauthid => $authid,
+ unknownauthid => 1,
+ authtypesloop => \@authtypesloop );
+ output_html_with_http_headers $query, $cookie, $template->output;
+ exit;
+}
-my $record;
if (C4::Context->preference("AuthDisplayHierarchy")){
my $trees=BuildUnimarcHierarchies($authid);
my @trees = split /;/,$trees ;
@@ -472,7 +210,6 @@ if (C4::Context->preference("AuthDisplayHierarchy")){
my $cnt=0;
my @loophierarchy;
foreach my $element (@tree){
- my $cell;
my $elementdata = GetAuthority($element);
$record= $elementdata if ($authid==$element);
push @loophierarchy, BuildUnimarcHierarchy($elementdata,"child".$cnt, $authid);
@@ -484,9 +221,8 @@ if (C4::Context->preference("AuthDisplayHierarchy")){
'displayhierarchy' =>C4::Context->preference("AuthDisplayHierarchy"),
'loophierarchies' =>\@loophierarchies,
);
-} else {
- $record=GetAuthority($authid);
}
+
my $count = CountUsage($authid);
# find the marc field/subfield used in biblio by this authority
@@ -498,25 +234,7 @@ while (my ($tagfield) = $sth->fetchrow) {
}
chop $biblio_fields;
-
-# fill arrays
-my @loop_data =();
-my $tag;
-# loop through each tab 0 through 9
-# for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
-# loop through each tag
- build_tabs ($template, $record, $dbh,"",$query);
-
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
- my $selected = 1 if $thisauthtype eq $authtypecode;
- my %row =(value => $thisauthtype,
- selected => $selected,
- authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
- );
- push @authtypesloop, \%row;
-}
+build_tabs ($template, $record, $dbh,"",$query);
$template->param(authid => $authid,
count => $count,