X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=cataloguing%2Faddbiblio.pl;h=bfb62f04b32f527dd94831430b402b4c9efa0a86;hb=08382876306cfda839637c5f72a107b304458a8e;hp=3db1a65526ce519a950f5ba98b5ded378a990fcb;hpb=3ce542ce2668770a5669d2fb98b666f42a5bd388;p=koha.git diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index 3db1a65526..bfb62f04b3 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -39,6 +39,7 @@ use C4::Charset; use Date::Calc qw(Today); use MARC::File::USMARC; use MARC::File::XML; +use URI::Escape; if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) { MARC::File::XML->default_record_format('UNIMARC'); @@ -93,9 +94,10 @@ sub MARCfindbreeding { return -1; } else { - # normalize author : probably UNIMARC specific... + # normalize author : UNIMARC specific... if ( C4::Context->preference("z3950NormalizeAuthor") - and C4::Context->preference("z3950AuthorAuthFields") ) + and C4::Context->preference("z3950AuthorAuthFields") + and C4::Context->preference("marcflavour") eq 'UNIMARC' ) { my ( $tag, $subfield ) = GetMarcFromKohaField("biblio.author", ''); @@ -170,7 +172,7 @@ sub build_authorized_values_list { #---- branch if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) { #Use GetBranches($onlymine) - my $onlymine=C4::Context->preference('IndependantBranches') && + my $onlymine=C4::Context->preference('IndependentBranches') && C4::Context->userenv && C4::Context->userenv->{flags} % 2 == 0 && C4::Context->userenv->{branch}; @@ -219,8 +221,11 @@ sub build_authorized_values_list { $value = $default_source unless $value; } else { + my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : ""; $authorised_values_sth->execute( - $tagslib->{$tag}->{$subfield}->{authorised_value} ); + $tagslib->{$tag}->{$subfield}->{authorised_value}, + $branch_limit ? $branch_limit : (), + ); push @authorised_values, "" unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); @@ -230,6 +235,7 @@ sub build_authorized_values_list { $authorised_lib{$value} = $lib; } } + $authorised_values_sth->finish; return CGI::scrolling_list( -name => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield, -values => \@authorised_values, @@ -372,7 +378,8 @@ sub create_input { # it's a thesaurus / authority field } elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) { - if (C4::Context->preference("BiblioAddsAuthorities")) { + # when authorities auto-creation is allowed, do not set readonly + my $is_readonly = !C4::Context->preference("BiblioAddsAuthorities"); $subfield_data{marc_value} = " - {$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">\"Tag + maxlength=\"".$subfield_data{maxlength}."\"". + ($is_readonly ? "readonly=\"readonly\"" : ""). + "\/> + {$tag}->{$subfield}->{authtypecode}."','biblio'); return false;\" tabindex=\"1\">Tag editor "; - } else { - $subfield_data{marc_value} = - "{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">\"Tag - "; - } # it's a plugin field } elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) { @@ -428,7 +421,7 @@ sub create_input { size=\"67\" maxlength=\"".$subfield_data{maxlength}."\" onblur=\"Blur$function_name($index_tag); \" \/> - \"Tag + Tag editor $javascript"; } else { warn "Plugin Failed: $plugin"; @@ -521,12 +514,15 @@ sub build_tabs { my @loop_data = (); my $tag; - my $authorised_values_sth = $dbh->prepare( - "select authorised_value,lib - from authorised_values - where category=? order by lib" - ); - + my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : ""; + my $query = "SELECT authorised_value, lib + FROM authorised_values"; + $query .= qq{ LEFT JOIN authorised_values_branches ON ( id = av_id )} if $branch_limit; + $query .= " WHERE category = ?"; + $query .= " AND ( branchcode = ? OR branchcode IS NULL )" if $branch_limit; + $query .= " GROUP BY lib ORDER BY lib, lib_opac"; + my $authorised_values_sth = $dbh->prepare( $query ); + # 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; @@ -711,6 +707,7 @@ sub build_tabs { }; } } + $authorised_values_sth->finish; $template->param( BIG_LOOP => \@BIG_LOOP ); } @@ -727,16 +724,23 @@ my $op = $input->param('op'); my $mode = $input->param('mode'); my $frameworkcode = $input->param('frameworkcode'); my $redirect = $input->param('redirect'); +my $searchid = $input->param('searchid'); my $dbh = C4::Context->dbh; my $hostbiblionumber = $input->param('hostbiblionumber'); my $hostitemnumber = $input->param('hostitemnumber'); +# fast cataloguing datas in transit +my $fa_circborrowernumber = $input->param('circborrowernumber'); +my $fa_barcode = $input->param('barcode'); +my $fa_branch = $input->param('branch'); +my $fa_stickyduedate = $input->param('stickyduedate'); +my $fa_duedatespec = $input->param('duedatespec'); - my $userflags = 'edit_catalogue'; if ($frameworkcode eq 'FA'){ $userflags = 'fast_cataloging'; } +my $changed_framework = $input->param('changed_framework'); $frameworkcode = &GetFrameworkCode($biblionumber) if ( $biblionumber and not($frameworkcode) and $op ne 'addbiblio' ); @@ -753,11 +757,13 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( if ($frameworkcode eq 'FA'){ # We need to grab and set some variables in the template for use on the additems screen - $template->{VARS}->{'circborrowernumber'} = $input->param('borrowernumber'); - $template->{VARS}->{'barcode'} = $input->param('barcode'); - $template->{VARS}->{'branch'} = $input->param('branch'); - $template->{VARS}->{'stickyduedate'} = $input->param('stickyduedate'); - $template->{VARS}->{'duedatespec'} = $input->param('duedatespec'); + $template->param( + 'circborrowernumber' => $fa_circborrowernumber, + 'barcode' => $fa_barcode, + 'branch' => $fa_branch, + 'stickyduedate' => $fa_stickyduedate, + 'duedatespec' => $fa_duedatespec, + ); } # Getting the list of all frameworks @@ -859,7 +865,7 @@ if ( $op eq "addbiblio" ) { my $oldbibnum; my $oldbibitemnum; if (C4::Context->preference("BiblioAddsAuthorities")){ - my ($countlinked,$countcreated)=BiblioAutoLink($record,$frameworkcode); + BiblioAutoLink( $record, $frameworkcode ); } if ( $is_a_modif ) { ModBiblioframework( $biblionumber, $frameworkcode ); @@ -868,41 +874,47 @@ if ( $op eq "addbiblio" ) { else { ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode ); } - if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view")){ + if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){ if ($frameworkcode eq 'FA'){ - my $borrowernumber = $input->param('circborrowernumber'); - my $barcode = $input->param('barcode'); - my $branch = $input->param('branch'); - my $stickyduedate = $input->param('stickyduedate'); - my $duedatespec = $input->param('duedatespec'); print $input->redirect( - "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&borrowernumber=$borrowernumber&branch=$branch&barcode=$barcode&stickyduedate=$stickyduedate&duedatespec=$duedatespec" + '/cgi-bin/koha/cataloguing/additem.pl?' + .'biblionumber='.$biblionumber + .'&frameworkcode='.$frameworkcode + .'&circborrowernumber='.$fa_circborrowernumber + .'&branch='.$fa_branch + .'&barcode='.uri_escape($fa_barcode) + .'&stickyduedate='.$fa_stickyduedate + .'&duedatespec='.$fa_duedatespec ); exit; } else { print $input->redirect( - "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode" + "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&searchid=$searchid" ); exit; } } - elsif($is_a_modif || $redirect eq "view"){ + elsif(($is_a_modif || $redirect eq "view") && $redirect ne "just_save"){ 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"); + print $input->redirect("/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=$biblionumber&searchid=$searchid"); } elsif ($defaultview eq 'marc' && $views->{can_view_MARC}) { - print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode"); + print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&searchid=$searchid"); } elsif ($defaultview eq 'labeled_marc' && $views->{can_view_labeledMARC}) { - print $input->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber"); + print $input->redirect("/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=$biblionumber&searchid=$searchid"); } else { - print $input->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber"); + print $input->redirect("/cgi-bin/koha/catalogue/detail.pl?biblionumber=$biblionumber&searchid=$searchid"); } exit; - } - else { + } + elsif ($redirect eq "just_save"){ + my $tab = $input->param('current_tab'); + print $input->redirect("/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=$biblionumber&framework=$frameworkcode&tab=$tab&searchid=$searchid"); + } + else { $template->param( biblionumber => $biblionumber, done =>1, @@ -953,7 +965,10 @@ elsif ( $op eq "delete" ) { $biblionumber = ""; } - if ( $record ne -1 ) { + if($changed_framework eq "changed"){ + $record = TransformHtmlToMarc( $input ); + } + elsif( $record ne -1 ) { #FIXME: it's kind of silly to go from MARC::Record to MARC::File::XML and then back again just to fix the encoding eval { my $uxml = $record->as_xml; @@ -981,7 +996,9 @@ $template->param( popup => $mode, frameworkcode => $frameworkcode, itemtype => $frameworkcode, - borrowernumber => $loggedinuser, + borrowernumber => $loggedinuser, + tab => $input->param('tab') ); +$template->{'VARS'}->{'searchid'} = $searchid; output_html_with_http_headers $input, $cookie, $template->output;