X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=cataloguing%2Faddbiblio.pl;h=038878f39974a056df8f8f955382e1c9970f72e7;hb=99160747f48e591b482a3fcd7844d11b57f1e8db;hp=a93f63f93ebafd06bec4cdfe452fbd2769929a5d;hpb=5c51edc653b4d5afd3494f48e2dc0a9508169d12;p=koha_gimpoz diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index a93f63f93e..038878f399 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -2,6 +2,7 @@ # Copyright 2000-2002 Katipo Communications +# Copyright 2004-2010 BibLibre # # This file is part of Koha. # @@ -14,11 +15,12 @@ # 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; +#use warnings; FIXME - Bug 2505 use CGI; use C4::Output; use C4::Auth; @@ -32,6 +34,7 @@ use C4::Koha; # XXX subfield_is_koha_internal_p use C4::Branch; # XXX subfield_is_koha_internal_p use C4::ClassSource; use C4::ImportBatch; +use C4::Charset; use Date::Calc qw(Today); use MARC::File::USMARC; @@ -43,7 +46,9 @@ if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) { our($tagslib,$authorised_values_sth,$is_a_modif,$usedTagsLib,$mandatory_z3950); -=item MARCfindbreeding +=head1 FUNCTIONS + +=head2 MARCfindbreeding $record = MARCfindbreeding($breedingid); @@ -84,7 +89,7 @@ sub MARCfindbreeding { } } - if ( ref($record) eq undef ) { + if ( !defined(ref($record)) ) { return -1; } else { @@ -92,7 +97,7 @@ sub MARCfindbreeding { if ( C4::Context->preference("z3950NormalizeAuthor") and C4::Context->preference("z3950AuthorAuthFields") ) { - my ( $tag, $subfield ) = GetMarcFromKohaField("biblio.author"); + my ( $tag, $subfield ) = GetMarcFromKohaField("biblio.author", ''); # my $summary = C4::Context->preference("z3950authortemplate"); my $auth_fields = @@ -150,7 +155,7 @@ sub MARCfindbreeding { return -1; } -=item build_authorized_values_list +=head2 build_authorized_values_list =cut @@ -167,7 +172,7 @@ sub build_authorized_values_list ($$$$$$$) { #Use GetBranches($onlymine) my $onlymine=C4::Context->preference('IndependantBranches') && C4::Context->userenv && - C4::Context->userenv->{flags}!=1 && + C4::Context->userenv->{flags} % 2 == 0 && C4::Context->userenv->{branch}; my $branches = GetBranches($onlymine); my @branchloop; @@ -184,7 +189,7 @@ sub build_authorized_values_list ($$$$$$$) { "select itemtype,description from itemtypes order by description"); $sth->execute; push @authorised_values, "" - unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); + unless ( $tagslib->{$tag}->{$subfield}->{defaultvalue} and $tagslib->{$tag}->{$subfield}->{mandatory} ); my $itemtype; @@ -241,7 +246,7 @@ sub build_authorized_values_list ($$$$$$$) { ); } -=item CreateKey +=head2 CreateKey Create a random value to set it into the input name @@ -251,11 +256,11 @@ sub CreateKey(){ return int(rand(1000000)); } -=item GetMandatoryFieldZ3950 +=head2 GetMandatoryFieldZ3950 This function return an hashref which containts all mandatory field to search with z3950 server. - + =cut sub GetMandatoryFieldZ3950($){ @@ -275,7 +280,7 @@ sub GetMandatoryFieldZ3950($){ }; } -=item create_input +=head2 create_input builds the entry for a subfield. @@ -288,8 +293,16 @@ sub create_input { $value =~ s/"/"/g; + # determine maximum length; 9999 bytes per ISO 2709 except for leader and MARC21 008 + my $max_length = 9999; + if ($tag eq '000') { + $max_length = 24; + } elsif ($tag eq '008' and C4::Context->preference('marcflavour') eq 'MARC21') { + $max_length = 40; + } + # if there is no value provided but a default value in parameters, get it - unless ($value) { + if ( $value eq '' ) { $value = $tagslib->{$tag}->{$subfield}->{defaultvalue}; # get today date & replace YYYY, MM, DD if provided in the default value @@ -299,6 +312,9 @@ sub create_input { $value =~ s/YYYY/$year/g; $value =~ s/MM/$month/g; $value =~ s/DD/$day/g; + my $username=(C4::Context->userenv?C4::Context->userenv->{'surname'}:"superlibrarian"); + $value=~s/user/$username/g; + } my $dbh = C4::Context->dbh; @@ -339,22 +355,57 @@ sub create_input { build_authorized_values_list( $tag, $subfield, $value, $dbh, $authorised_values_sth,$index_tag,$index_subfield ); + # it's a subfield $9 linking to an authority record - see bug 2206 + } + elsif ($subfield eq "9" and + exists($tagslib->{$tag}->{'a'}->{authtypecode}) and + defined($tagslib->{$tag}->{'a'}->{authtypecode}) and + $tagslib->{$tag}->{'a'}->{authtypecode} ne '') { + + $subfield_data{marc_value} = + ""; + # it's a thesaurus / authority field } elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) { + if (C4::Context->preference("BiblioAddsAuthorities")) { $subfield_data{marc_value} = " {$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">... - "; + onclick=\"openAuth(this.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">... + "; + } else { + $subfield_data{marc_value} = + "{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">... + "; + } # it's a plugin field } elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) { @@ -380,9 +431,9 @@ sub create_input { class=\"input_marceditor\" onfocus=\"Focus$function_name($index_tag)\" size=\"67\" - maxlength=\"255\" + maxlength=\"$max_length\" onblur=\"Blur$function_name($index_tag); \" \/> - ... + ... $javascript"; } else { warn "Plugin Failed: $plugin"; @@ -394,7 +445,7 @@ sub create_input { value=\"$value\" tabindex=\"1\" size=\"67\" - maxlength=\"255\" + maxlength=\"$max_length\" class=\"input_marceditor\" \/> "; @@ -408,7 +459,7 @@ sub create_input { id=\"".$subfield_data{id}."\" name=\"".$subfield_data{id}."\" size=\"67\" - maxlength=\"255\" + maxlength=\"$max_length\" value=\"$value\" \/> "; } @@ -420,7 +471,7 @@ sub create_input { class=\"input_marceditor\" tabindex=\"1\" size=\"67\" - maxlength=\"255\" + maxlength=\"$max_length\" value=\"$value\" \/>"; @@ -455,7 +506,7 @@ sub create_input { value=\"$value\" tabindex=\"1\" size=\"67\" - maxlength=\"255\" + maxlength=\"$max_length\" class=\"input_marceditor\" \/> "; @@ -465,6 +516,22 @@ sub create_input { return \%subfield_data; } + +=head2 format_indicator + +Translate indicator value for output form - specifically, map +indicator = ' ' to ''. This is for the convenience of a cataloger +using a mouse to select an indicator input. + +=cut + +sub format_indicator { + my $ind_value = shift; + return '' if not defined $ind_value; + return '' if $ind_value eq ' '; + return $ind_value; +} + sub build_tabs ($$$$$) { my ( $template, $record, $dbh, $encoding,$input ) = @_; @@ -505,7 +572,7 @@ sub build_tabs ($$$$$) { foreach my $tag (@tab_data) { $i++; next if ! $tag; - my $indicator; + my ($indicator1, $indicator2); 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. @@ -569,8 +636,15 @@ sub build_tabs ($$$$$) { next if ( $tag < 10 ); next if ( ( $tagslib->{$tag}->{$subfield}->{hidden} <= -4 ) - or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 5 ) - ); #check for visibility flag + or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 5 ) ) + and not ( $subfield eq "9" and + exists($tagslib->{$tag}->{'a'}->{authtypecode}) and + defined($tagslib->{$tag}->{'a'}->{authtypecode}) and + $tagslib->{$tag}->{'a'}->{authtypecode} ne "" + ) + ; #check for visibility flag + # if subfield is $9 in a field whose $a is authority-controlled, + # always include in the form regardless of the hidden setting - bug 2206 next if ( defined( $field->subfield($subfield) ) ); push( @subfields_data, @@ -590,12 +664,14 @@ sub build_tabs ($$$$$) { index => $index_tag, tag_lib => $tagslib->{$tag}->{lib}, repeatable => $tagslib->{$tag}->{repeatable}, + mandatory => $tagslib->{$tag}->{mandatory}, subfield_loop => \@subfields_data, fixedfield => $tag < 10?1:0, random => CreateKey, ); - if ($tag >= 010){ # no indicator for theses tag - $tag_data{indicator} = $field->indicator(1).$field->indicator(2); + if ($tag >= 10){ # no indicator for 00x tags + $tag_data{indicator1} = format_indicator($field->indicator(1)), + $tag_data{indicator2} = format_indicator($field->indicator(2)), } push( @loop_data, \%tag_data ); } @@ -610,7 +686,14 @@ sub build_tabs ($$$$$) { next if ( ( $tagslib->{$tag}->{$subfield}->{hidden} <= -5 ) or ( $tagslib->{$tag}->{$subfield}->{hidden} >= 4 ) ) + and not ( $subfield eq "9" and + exists($tagslib->{$tag}->{'a'}->{authtypecode}) and + defined($tagslib->{$tag}->{'a'}->{authtypecode}) and + $tagslib->{$tag}->{'a'}->{authtypecode} ne "" + ) ; #check for visibility flag + # if subfield is $9 in a field whose $a is authority-controlled, + # always include in the form regardless of the hidden setting - bug 2206 next if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop ); push( @@ -627,7 +710,9 @@ sub build_tabs ($$$$$) { index => $index_tag, tag_lib => $tagslib->{$tag}->{lib}, repeatable => $tagslib->{$tag}->{repeatable}, - indicator => $indicator, + mandatory => $tagslib->{$tag}->{mandatory}, + indicator1 => $indicator1, + indicator2 => $indicator2, subfield_loop => \@subfields_data, tagfirstsubfield => $subfields_data[0], fixedfield => $tag < 10?1:0, @@ -673,12 +758,12 @@ AND (authtypecode IS NOT NULL AND authtypecode<>\"\")|); my ($countcreated,$countlinked); while (my $data=$query->fetchrow_hashref){ foreach my $field ($record->field($data->{tagfield})){ - next if ($field->subfield('3')||$field->subfield('9')); + next if ($field->subfield('3') || $field->subfield('9')); # No authorities id in the tag. # Search if there is any authorities to link to. my $query='at='.$data->{authtypecode}.' '; map {$query.= ' and he,ext="'.$_->[1].'"' if ($_->[0]=~/[A-z]/)} $field->subfields(); - my ($error,$results)=SimpleSearch( $query, undef, undef, [ "authorityserver" ] ); + my ($error, $results, $total_hits)=SimpleSearch( $query, undef, undef, [ "authorityserver" ] ); # there is only 1 result if ( $error ) { warn "BIBLIOADDSAUTHORITIES: $error"; @@ -699,11 +784,34 @@ AND (authtypecode IS NOT NULL AND authtypecode<>\"\")|); ###NOTICE : This is only valid if a subfield is linked to one and only one authtypecode ###NOTICE : This can be a problem. We should also look into other types and rejected forms. my $authtypedata=GetAuthType($data->{authtypecode}); + next unless $authtypedata; my $marcrecordauth=MARC::Record->new(); + if (C4::Context->preference('marcflavour') eq 'MARC21') { + $marcrecordauth->leader(' nz a22 o 4500'); + SetMarcUnicodeFlag($marcrecordauth, 'MARC21'); + } my $authfield=MARC::Field->new($authtypedata->{auth_tag_to_report},'','',"a"=>"".$field->subfield('a')); map { $authfield->add_subfields($_->[0]=>$_->[1]) if ($_->[0]=~/[A-z]/ && $_->[0] ne "a" )} $field->subfields(); $marcrecordauth->insert_fields_ordered($authfield); + + # bug 2317: ensure new authority knows it's using UTF-8; currently + # only need to do this for MARC21, as MARC::Record->as_xml_record() handles + # automatically for UNIMARC (by not transcoding) + # FIXME: AddAuthority() instead should simply explicitly require that the MARC::Record + # use UTF-8, but as of 2008-08-05, did not want to introduce that kind + # of change to a core API just before the 3.0 release. + + if (C4::Context->preference('marcflavour') eq 'MARC21') { + $marcrecordauth->insert_fields_ordered(MARC::Field->new('667','','','a'=>"Machine generated authority record.")); + my $cite = $record->author() . ", " . $record->title_proper() . ", " . $record->publication_date() . " "; + $cite =~ s/^[\s\,]*//; + $cite =~ s/[\s\,]*$//; + $cite = "Work cat.: (" . C4::Context->preference('MARCOrgCode') . ")". $record->subfield('999','c') . ": " . $cite; + $marcrecordauth->insert_fields_ordered(MARC::Field->new('670','','','a'=>$cite)); + } + # warn "AUTH RECORD ADDED : ".$marcrecordauth->as_formatted; + my $authid=AddAuthority($marcrecordauth,'',$data->{authtypecode}); $countcreated++; $field->add_subfields('9'=>$authid); @@ -724,8 +832,11 @@ my $z3950 = $input->param('z3950'); my $op = $input->param('op'); my $mode = $input->param('mode'); my $frameworkcode = $input->param('frameworkcode'); +my $redirect = $input->param('redirect'); my $dbh = C4::Context->dbh; +my $userflags = ($frameworkcode eq 'FA') ? "fast_cataloging" : "edit_catalogue"; + $frameworkcode = &GetFrameworkCode($biblionumber) if ( $biblionumber and not($frameworkcode) ); @@ -736,7 +847,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => { editcatalogue => 1 }, + flagsrequired => { editcatalogue => $userflags }, } ); @@ -822,13 +933,27 @@ if ( $op eq "addbiblio" ) { else { ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode ); } - - if ($mode ne "popup"){ + if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view")){ print $input->redirect( "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode" ); exit; - } else { + } + elsif($is_a_modif || $redirect eq "view"){ + my $defaultview = C4::Context->preference('IntranetBiblioDefaultView'); + my $views = { C4::Search::enabled_staff_search_views }; + if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) { + print $input->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber"); + } elsif ($defaultview eq 'marc' && $views->{can_view_MARC}) { + print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode"); + } elsif ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) { + print $input->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber"); + } else { + print $input->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber"); + } + exit; + + }else { $template->param( biblionumber => $biblionumber, done =>1, @@ -895,6 +1020,9 @@ elsif ( $op eq "delete" ) { } $template->param( title => $record->title() ) if ( $record ne "-1" ); +if (C4::Context->preference("marcflavour") eq "MARC21"){ + $template->param(MARC21 => 1); +} $template->param( popup => $mode, frameworkcode => $frameworkcode,