X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=cataloguing%2Fadditem.pl;h=86bcac76e9fd655d9be6e011ff4fe06c1d39b600;hb=cc0329508ac46461705c9184bb752a5d7fa84cad;hp=79a717c54ff59e42bba7803b0ca0c3723030ca84;hpb=239a5f76cb9082c0b7653e37449f5ea5a13ed3ad;p=koha.git diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 79a717c54f..86bcac76e9 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -6,36 +6,37 @@ # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use strict; #use warnings; FIXME - Bug 2505 -use CGI; +use CGI qw ( -utf8 ); use C4::Auth; use C4::Output; use C4::Biblio; use C4::Items; use C4::Context; +use C4::Circulation; use C4::Koha; # XXX subfield_is_koha_internal_p use C4::Branch; # XXX subfield_is_koha_internal_p use C4::ClassSource; -use C4::Dates; +use Koha::DateUtils; use List::MoreUtils qw/any/; use C4::Search; use Storable qw(thaw freeze); use URI::Escape; - +use C4::Members; use MARC::File::XML; use URI::Escape; @@ -103,12 +104,12 @@ sub _increment_barcode { sub generate_subfield_form { - my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $today_iso, $biblionumber, $temp, $loop_data, $i) = @_; + my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $loop_data, $i, $restrictededition) = @_; - my $frameworkcode = &GetFrameworkCode($biblionumber); + my $frameworkcode = &GetFrameworkCode($biblionumber); + my %subfield_data; - my $dbh = C4::Context->dbh; - my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib"); + my $dbh = C4::Context->dbh; my $index_subfield = int(rand(1000000)); if ($subfieldtag eq '@'){ @@ -119,7 +120,6 @@ sub generate_subfield_form { $subfield_data{tag} = $tag; $subfield_data{subfield} = $subfieldtag; - $subfield_data{random} = int(rand(1000000)); # why do we need 2 different randoms? $subfield_data{marc_lib} ="{lib}."\">".$subfieldlib->{lib}.""; $subfield_data{mandatory} = $subfieldlib->{mandatory}; $subfield_data{repeatable} = $subfieldlib->{repeatable}; @@ -129,13 +129,14 @@ sub generate_subfield_form { if ( ! defined( $value ) || $value eq '') { $value = $subfieldlib->{defaultvalue}; # get today date & replace YYYY, MM, DD if provided in the default value - my ( $year, $month, $day ) = split ',', $today_iso; # FIXME: iso dates don't have commas! + my $today_iso = output_pref( { dt=>dt_from_string, dateonly => 1, dateformat => 'iso' } ); + my ( $year, $month, $day ) = split ('-', $today_iso); $value =~ s/YYYY/$year/g; $value =~ s/MM/$month/g; $value =~ s/DD/$day/g; } - $subfield_data{visibility} = "display:none;" if (($subfieldlib->{hidden} > 4) || ($subfieldlib->{hidden} < -4)); + $subfield_data{visibility} = "display:none;" if (($subfieldlib->{hidden} > 4) || ($subfieldlib->{hidden} <= -4)); my $pref_itemcallnumber = C4::Context->preference('itemcallnumber'); if (!$value && $subfieldlib->{kohafield} eq 'items.itemcallnumber' && $pref_itemcallnumber) { @@ -154,9 +155,15 @@ sub generate_subfield_form { my $input = new CGI; $value = $input->param('barcode'); } - my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="$subfield_data{maxlength}" ); - my $attributes = qq($attributes_no_value value="$value" ); - + + # Getting list of subfields to keep when restricted editing is enabled + my $subfieldsToAllowForRestrictedEditing = C4::Context->preference('SubfieldsToAllowForRestrictedEditing'); + my $allowAllSubfields = ( + not defined $subfieldsToAllowForRestrictedEditing + or $subfieldsToAllowForRestrictedEditing == q|| + ) ? 1 : 0; + my @subfieldsToAllow = split(/ /, $subfieldsToAllowForRestrictedEditing); + if ( $subfieldlib->{authorised_value} ) { my @authorised_values; my %authorised_lib; @@ -170,13 +177,12 @@ sub generate_subfield_form { } elsif ( $subfieldlib->{authorised_value} eq "itemtypes" ) { push @authorised_values, "" unless ( $subfieldlib->{mandatory} ); - my $sth = $dbh->prepare("SELECT itemtype,description FROM itemtypes ORDER BY description"); - $sth->execute; - while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) { - push @authorised_values, $itemtype; - $authorised_lib{$itemtype} = $description; + my $itemtypes = GetItemTypes( style => 'array' ); + for my $itemtype ( @$itemtypes ) { + push @authorised_values, $itemtype->{itemtype}; + $authorised_lib{$itemtype->{itemtype}} = $itemtype->{translated_description}; } - + unless ( $value ) { my $itype_sth = $dbh->prepare("SELECT itemtype FROM biblioitems WHERE biblionumber = ?"); $itype_sth->execute( $biblionumber ); @@ -203,78 +209,121 @@ sub generate_subfield_form { #---- "true" authorised value } else { - push @authorised_values, "" unless ( $subfieldlib->{mandatory} ); - $authorised_values_sth->execute( $subfieldlib->{authorised_value} ); - while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) { - push @authorised_values, $value; - $authorised_lib{$value} = $lib; + push @authorised_values, qq{} unless ( $subfieldlib->{mandatory} ); + my $av = GetAuthorisedValues( $subfieldlib->{authorised_value} ); + for my $r ( @$av ) { + push @authorised_values, $r->{authorised_value}; + $authorised_lib{$r->{authorised_value}} = $r->{lib}; } } - if ($subfieldlib->{'hidden'}) { - $subfield_data{marc_value} = qq( $authorised_lib{$value}); + if ( $subfieldlib->{hidden} > 4 or $subfieldlib->{hidden} <= -4 ) { + $subfield_data{marc_value} = { + type => 'hidden', + id => $subfield_data{id}, + maxlength => $subfield_data{max_length}, + value => $value, + }; } else { - $subfield_data{marc_value} =CGI::scrolling_list( # FIXME: factor out scrolling_list - -name => "field_value", - -values => \@authorised_values, - -default => $value, - -labels => \%authorised_lib, - -override => 1, - -size => 1, - -multiple => 0, - -tabindex => 1, - -id => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield, - -class => "input_marceditor", - ); + $subfield_data{marc_value} = { + type => 'select', + id => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield, + values => \@authorised_values, + labels => \%authorised_lib, + default => $value, + }; + # If we're on restricted editing, and our field is not in the list of subfields to allow, + # then it is read-only + $subfield_data{marc_value}->{readonlyselect} = ( + not $allowAllSubfields + and $restrictededition + and !grep { $tag . '$' . $subfieldtag eq $_ } @subfieldsToAllow + ) ? 1: 0; } - } # it's a thesaurus / authority field elsif ( $subfieldlib->{authtypecode} ) { - $subfield_data{marc_value} = " - {authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">... - "; + $subfield_data{marc_value} = { + type => 'text_auth', + id => $subfield_data{id}, + maxlength => $subfield_data{max_length}, + value => $value, + authtypecode => $subfieldlib->{authtypecode}, + }; } # it's a plugin field - elsif ( $subfieldlib->{value_builder} ) { - # opening plugin - my $plugin = C4::Context->intranetdir . "/cataloguing/value_builder/" . $subfieldlib->{'value_builder'}; - if (do $plugin) { - my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, $loop_data ); - my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, $loop_data ); - my $change = index($javascript, 'function Change') > -1 ? - "return Change$function_name($subfield_data{random}, '$subfield_data{id}');" : - 'return 1;'; - $subfield_data{marc_value} = qq[ - ... - $javascript]; - } else { - warn "Plugin Failed: $plugin"; - $subfield_data{marc_value} = ""; # supply default input form - } + elsif ( $subfieldlib->{value_builder} ) { # plugin + require Koha::FrameworkPlugin; + my $plugin = Koha::FrameworkPlugin->new({ + name => $subfieldlib->{'value_builder'}, + item_style => 1, + }); + my $pars= { dbh => $dbh, record => $temp, tagslib =>$tagslib, + id => $subfield_data{id}, tabloop => $loop_data }; + $plugin->build( $pars ); + if( !$plugin->errstr ) { + my $class= 'buttonDot'. ( $plugin->noclick? ' disabled': '' ); + $subfield_data{marc_value} = { + type => 'text_plugin', + id => $subfield_data{id}, + maxlength => $subfield_data{max_length}, + value => $value, + class => $class, + nopopup => $plugin->noclick, + javascript => $plugin->javascript, + }; + } else { + warn $plugin->errstr; + $subfield_data{marc_value} = { + type => 'text', + id => $subfield_data{id}, + maxlength => $subfield_data{max_length}, + value => $value, + }; # supply default input form + } } elsif ( $tag eq '' ) { # it's an hidden field - $subfield_data{marc_value} = qq(); + $subfield_data{marc_value} = { + type => 'hidden', + id => $subfield_data{id}, + maxlength => $subfield_data{max_length}, + value => $value, + }; } elsif ( $subfieldlib->{'hidden'} ) { # FIXME: shouldn't input type be "hidden" ? - $subfield_data{marc_value} = qq(); + $subfield_data{marc_value} = { + type => 'text', + id => $subfield_data{id}, + maxlength => $subfield_data{max_length}, + value => $value, + }; } - elsif ( length($value) > 100 - or (C4::Context->preference("marcflavour") eq "UNIMARC" and - 300 <= $tag && $tag < 400 && $subfieldtag eq 'a' ) - or (C4::Context->preference("marcflavour") eq "MARC21" and - 500 <= $tag && $tag < 600 ) - ) { + elsif ( + length($value) > 100 + or ( + C4::Context->preference("marcflavour") eq "UNIMARC" + and 300 <= $tag && $tag < 400 && $subfieldtag eq 'a' + ) + or ( + C4::Context->preference("marcflavour") eq "MARC21" + and 500 <= $tag && $tag < 600 + ) + ) { # oversize field (textarea) - $subfield_data{marc_value} = "\n"; + $subfield_data{marc_value} = { + type => 'textarea', + id => $subfield_data{id}, + value => $value, + }; } else { - # it's a standard field - $subfield_data{marc_value} = ""; + # it's a standard field + $subfield_data{marc_value} = { + type => 'text', + id => $subfield_data{id}, + maxlength => $subfield_data{max_length}, + value => $value, + }; } return \%subfield_data; @@ -315,6 +364,13 @@ my $itemnumber = $input->param('itemnumber'); my $op = $input->param('op'); my $hostitemnumber = $input->param('hostitemnumber'); my $marcflavour = C4::Context->preference("marcflavour"); +my $searchid = $input->param('searchid'); +# fast cataloguing datas +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 $frameworkcode = &GetFrameworkCode($biblionumber); @@ -338,7 +394,41 @@ my ($template, $loggedinuser, $cookie) }); -my $today_iso = C4::Dates->today('iso'); +# XXX dpavlin -- signatura zatvorenog spremista +sub ffzg_zs_callnumber { + my ($record) = @_; + my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.itemcallnumber",$frameworkcode); + if ($record->field($tagfield)->subfield($tagsubfield) =~ m/^ZS#(\w\w)\s(\d+)-(\d+)$/ ) { + my ( $prefix, $min, $max ) = ( $1, $2, $3 ); + + $dbh->begin_work; + my $sth = $dbh->prepare(qq{ update ffzg_zs_seq set current = current + 1 where name = ? }); + $sth->execute( $prefix ); + $sth = $dbh->prepare(qq{ select current from ffzg_zs_seq where name = ? }); + $sth->execute( $prefix ); + my ($itemcallnumber) = $sth->fetchrow; + $dbh->commit; + +warn "ZS: $prefix $min - $max => $itemcallnumber\n"; + + if ( $itemcallnumber < $min || $itemcallnumber > $max ) { + die "can't find next itemcallnumber for $prefix $min-$max, got: $itemcallnumber"; + } + my $fieldItem = $record->field($tagfield); + $fieldItem->update($tagsubfield => $prefix . ' ' . $itemcallnumber); + } + return $record; +} + + +# Does the user have a restricted item editing permission? +my $uid = $loggedinuser ? GetMember( borrowernumber => $loggedinuser )->{userid} : undef; +my $restrictededition = $uid ? haspermission($uid, {'editcatalogue' => 'edit_items_restricted'}) : undef; +# In case user is a superlibrarian, editing is not restricted +$restrictededition = 0 if ($restrictededition != 0 && C4::Context->IsSuperLibrarian()); +# In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted +$restrictededition = 0 if ($restrictededition != 0 && $frameworkcode eq 'FA' && haspermission($uid, {'editcatalogue' => 'fast_cataloging'})); + my $tagslib = &GetMarcStructure(1,$frameworkcode); my $record = GetMarcBiblio($biblionumber); my $oldrecord = TransformMarcToKoha($dbh,$record); @@ -394,13 +484,10 @@ if ($op eq "additem") { $record = _increment_barcode($record, $frameworkcode); } - - if (C4::Context->preference('autoBarcode') eq 'incremental') { - $record = _increment_barcode($record, $frameworkcode); - } - my $addedolditem = TransformMarcToKoha( $dbh, $record ); + $record = ffzg_zs_callnumber( $record ); # XXX dpavlin + # If we have to add or add & duplicate, we add the item if ( $add_submit || $add_duplicate_submit ) { @@ -419,6 +506,7 @@ if ($op eq "additem") { -name => 'LastCreatedItem', # We uri_escape the whole freezed structure so we're sure we won't have any encoding problems -value => uri_escape_utf8( freeze( $record ) ), + -HttpOnly => 1, -expires => '' ); @@ -507,13 +595,15 @@ if ($op eq "additem") { undef($itemrecord); } } - if ($frameworkcode eq 'FA' && $input->param('borrowernumber')){ - my $redirect_string = 'borrowernumber=' . uri_escape($input->param('borrowernumber')) . - '&barcode=' . uri_escape($input->param('barcode')); - $redirect_string .= '&duedatespec=' . uri_escape($input->param('duedatespec')) . - '&stickyduedate=1'; - print $input->redirect("/cgi-bin/koha/circ/circulation.pl?" . $redirect_string); - exit; + if ($frameworkcode eq 'FA' && $fa_circborrowernumber){ + print $input->redirect( + '/cgi-bin/koha/circ/circulation.pl?' + .'borrowernumber='.$fa_circborrowernumber + .'&barcode='.uri_escape_utf8($fa_barcode) + .'&duedatespec='.$fa_duedatespec + .'&stickyduedate=1' + ); + exit; } @@ -524,12 +614,46 @@ if ($op eq "additem") { $itemrecord = C4::Items::GetMarcItem($biblionumber,$itemnumber); $nextop = "saveitem"; #------------------------------------------------------------------------------- +} elsif ($op eq "dupeitem") { +#------------------------------------------------------------------------------- +# retrieve item if exist => then, it's a modif + $itemrecord = C4::Items::GetMarcItem($biblionumber,$itemnumber); + if (C4::Context->preference('autoBarcode') eq 'incremental') { + $itemrecord = _increment_barcode($itemrecord, $frameworkcode); + } + else { + # we have to clear the barcode field in the duplicate item record to make way for the new one generated by the javascript plugin + my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode); + my $fieldItem = $itemrecord->field($tagfield); + $itemrecord->delete_field($fieldItem); + $fieldItem->delete_subfields($tagsubfield); + $itemrecord->insert_fields_ordered($fieldItem); + } + + #check for hidden subfield and remove them for the duplicated item + foreach my $field ($itemrecord->fields()){ + my $tag = $field->{_tag}; + foreach my $subfield ($field->subfields()){ + my $subfieldtag = $subfield->[0]; + if (subfield_is_koha_internal_p($subfieldtag) || $tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10" + || abs($tagslib->{$tag}->{$subfieldtag}->{hidden})>4 ){ + my $fieldItem = $itemrecord->field($tag); + $itemrecord->delete_field($fieldItem); + $fieldItem->delete_subfields($subfieldtag); + $itemrecord->insert_fields_ordered($fieldItem); + } + } + } + + $itemrecord = removeFieldsForPrefill($itemrecord) if ($prefillitem); + $nextop = "additem"; +#------------------------------------------------------------------------------- } elsif ($op eq "delitem") { #------------------------------------------------------------------------------- # check that there is no issue on this item before deletion. $error = &DelItemCheck($dbh,$biblionumber,$itemnumber); if($error == 1){ - print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode"); + print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode&searchid=$searchid"); }else{ push @errors,$error; $nextop="additem"; @@ -561,13 +685,13 @@ if ($op eq "additem") { 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"); + print $input->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=$biblionumber&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; } @@ -588,6 +712,9 @@ if ($op eq "additem") { # MARC::Record builded => now, record in DB # warn "R: ".$record->as_formatted; # check that the barcode don't exist already + + $itemtosave = ffzg_zs_callnumber( $itemtosave ); # XXX dpavlin + my $addedolditem = TransformMarcToKoha($dbh,$itemtosave); my $exist_itemnumber = get_item_from_barcode($addedolditem->{'barcode'}); if ($exist_itemnumber && $exist_itemnumber != $itemnumber) { @@ -596,6 +723,15 @@ if ($op eq "additem") { ModItemFromMarc($itemtosave,$biblionumber,$itemnumber); $itemnumber=""; } + my $item = GetItem( $itemnumber ); + my $olditemlost = $item->{'itemlost'}; + + my ($lost_tag,$lost_subfield) = GetMarcFromKohaField("items.itemlost",''); + + my $newitemlost = $itemtosave->subfield( $lost_tag, $lost_subfield ); + if (($olditemlost eq '0' or $olditemlost eq '' ) and $newitemlost ge '1'){ + LostItem($itemnumber,'MARK RETURNED'); + } $nextop="additem"; } elsif ($op eq "delinkitem"){ my $analyticfield = '773'; @@ -680,10 +816,10 @@ foreach my $field (@fields) { || $subfieldvalue; } - if (($field->tag eq $branchtagfield) && ($subfieldcode eq $branchtagsubfield) && C4::Context->preference("IndependantBranches")) { + if (($field->tag eq $branchtagfield) && ($subfieldcode eq $branchtagsubfield) && C4::Context->preference("IndependentBranches")) { #verifying rights my $userenv = C4::Context->userenv(); - unless (($userenv->{'flags'} == 1) or (($userenv->{'branch'} eq $subfieldvalue))){ + unless (C4::Context->IsSuperLibrarian() or (($userenv->{'branch'} eq $subfieldvalue))){ $this_row{'nomod'} = 1; } } @@ -732,6 +868,13 @@ for my $row ( @big_array ) { foreach my $subfield_code (sort keys(%witness)) { my %header_value; $header_value{header_value} = $witness{$subfield_code}; + + my $subfieldlib = $tagslib->{$itemtagfield}->{$subfield_code}; + my $kohafield = $subfieldlib->{kohafield}; + if ( $kohafield && $kohafield =~ /items.(.+)/ ) { + $header_value{column_name} = $1; + } + push(@header_value_loop, \%header_value); } @@ -741,10 +884,11 @@ my $i=0; my $pref_itemcallnumber = C4::Context->preference('itemcallnumber'); -my $onlymine = C4::Context->preference('IndependantBranches') && - C4::Context->userenv && - C4::Context->userenv->{flags}!=1 && - C4::Context->userenv->{branch}; +my $onlymine = + C4::Context->preference('IndependentBranches') + && C4::Context->userenv + && !C4::Context->IsSuperLibrarian() + && C4::Context->userenv->{branch}; my $branch = $input->param('branch') || C4::Context->userenv->{branch}; my $branches = GetBranchesLoop($branch,$onlymine); # build once ahead of time, instead of multiple times later. @@ -762,8 +906,7 @@ if($itemrecord){ next if subfield_is_koha_internal_p($subfieldtag); next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10"); - my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i); - + my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $biblionumber, $temp, \@loop_data, $i, $restrictededition); push @fields, "$tag$subfieldtag"; push (@loop_data, $subfield_data); $i++; @@ -785,18 +928,17 @@ foreach my $tag ( keys %{$tagslib}){ next if any { /^$tag$subtag$/ } @fields; my @values = (undef); - @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)->subfield($subtag))); + @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag))); for my $value (@values){ - my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i); + my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $biblionumber, $temp, \@loop_data, $i, $restrictededition); push (@loop_data, $subfield_data); $i++; - } + } } } @loop_data = sort {$a->{subfield} cmp $b->{subfield} } @loop_data; # what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit. -$template->param( title => $record->title() ) if ($record ne "-1"); $template->param( biblionumber => $biblionumber, title => $oldrecord->{title}, @@ -813,13 +955,18 @@ $template->param( popup => $input->param('popup') ? 1: 0, C4::Search::enabled_staff_search_views, ); +$template->{'VARS'}->{'searchid'} = $searchid; if ($frameworkcode eq 'FA'){ - $template->{VARS}->{'borrowernumber'}=$input->param('borrowernumber'); - $template->{VARS}->{'barcode'}=$input->param('barcode'); - $template->{VARS}->{'stickyduedate'}=$input->param('stickduedate'); - $template->{VARS}->{'duedatespec'}=$input->param('duedatespec'); -} + # fast cataloguing datas + $template->param( + 'circborrowernumber' => $fa_circborrowernumber, + 'barcode' => $fa_barcode, + 'branch' => $fa_branch, + 'stickyduedate' => $fa_stickyduedate, + 'duedatespec' => $fa_duedatespec, + ); +} foreach my $error (@errors) { $template->param($error => 1);