@@ -, +, @@ --- C4/Items.pm | 2 +- Koha/FrameworkPlugin.pm | 4 ++-- authorities/authorities.pl | 14 +++++++------- cataloguing/addbiblio.pl | 12 ++++++------ cataloguing/additem.pl | 6 +++--- cataloguing/value_builder/normarc_field_007.pl | 2 +- cataloguing/value_builder/normarc_field_008.pl | 2 +- cataloguing/value_builder/normarc_leader.pl | 2 +- cataloguing/value_builder/unimarc_field_010.pl | 2 +- cataloguing/value_builder/unimarc_field_100.pl | 2 +- .../value_builder/unimarc_field_100_authorities.pl | 2 +- cataloguing/value_builder/unimarc_field_105.pl | 2 +- cataloguing/value_builder/unimarc_field_106.pl | 2 +- cataloguing/value_builder/unimarc_field_110.pl | 2 +- cataloguing/value_builder/unimarc_field_115a.pl | 2 +- cataloguing/value_builder/unimarc_field_115b.pl | 2 +- cataloguing/value_builder/unimarc_field_116.pl | 2 +- cataloguing/value_builder/unimarc_field_117.pl | 2 +- cataloguing/value_builder/unimarc_field_120.pl | 2 +- cataloguing/value_builder/unimarc_field_121a.pl | 2 +- cataloguing/value_builder/unimarc_field_121b.pl | 2 +- cataloguing/value_builder/unimarc_field_122.pl | 2 +- cataloguing/value_builder/unimarc_field_123a.pl | 2 +- cataloguing/value_builder/unimarc_field_123d.pl | 2 +- cataloguing/value_builder/unimarc_field_123e.pl | 2 +- cataloguing/value_builder/unimarc_field_123f.pl | 2 +- cataloguing/value_builder/unimarc_field_123g.pl | 2 +- cataloguing/value_builder/unimarc_field_123i.pl | 2 +- cataloguing/value_builder/unimarc_field_123j.pl | 2 +- cataloguing/value_builder/unimarc_field_124.pl | 2 +- cataloguing/value_builder/unimarc_field_124a.pl | 2 +- cataloguing/value_builder/unimarc_field_124b.pl | 2 +- cataloguing/value_builder/unimarc_field_124c.pl | 2 +- cataloguing/value_builder/unimarc_field_124d.pl | 2 +- cataloguing/value_builder/unimarc_field_124e.pl | 2 +- cataloguing/value_builder/unimarc_field_124f.pl | 2 +- cataloguing/value_builder/unimarc_field_124g.pl | 2 +- cataloguing/value_builder/unimarc_field_125.pl | 2 +- cataloguing/value_builder/unimarc_field_125a.pl | 2 +- cataloguing/value_builder/unimarc_field_125b.pl | 2 +- cataloguing/value_builder/unimarc_field_126.pl | 2 +- cataloguing/value_builder/unimarc_field_126a.pl | 2 +- cataloguing/value_builder/unimarc_field_126b.pl | 2 +- cataloguing/value_builder/unimarc_field_127.pl | 2 +- cataloguing/value_builder/unimarc_field_128a.pl | 2 +- cataloguing/value_builder/unimarc_field_128b.pl | 2 +- cataloguing/value_builder/unimarc_field_128c.pl | 2 +- cataloguing/value_builder/unimarc_field_130.pl | 2 +- cataloguing/value_builder/unimarc_field_135a.pl | 2 +- cataloguing/value_builder/unimarc_field_140.pl | 2 +- cataloguing/value_builder/unimarc_field_141.pl | 2 +- cataloguing/value_builder/unimarc_field_210c.pl | 2 +- .../value_builder/unimarc_field_210c_bis.pl | 2 +- cataloguing/value_builder/unimarc_field_225a.pl | 2 +- .../value_builder/unimarc_field_225a_bis.pl | 2 +- cataloguing/value_builder/unimarc_field_4XX.pl | 4 ++-- cataloguing/value_builder/unimarc_field_686a.pl | 2 +- cataloguing/value_builder/unimarc_field_700-4.pl | 2 +- cataloguing/value_builder/unimarc_leader.pl | 2 +- t/db_dependent/FrameworkPlugin.t | 2 +- tools/batchMod.pl | 2 +- 61 files changed, 76 insertions(+), 76 deletions(-) --- a/C4/Items.pm +++ a/C4/Items.pm @@ -1758,7 +1758,7 @@ sub PrepareItemrecordDisplay { name => $subfield->{value_builder}, item_style => 1, }); - my $pars = { dbh => $dbh, record => undef, tagslib =>$tagslib, id => $subfield_data{id}, tabloop => undef }; + my $pars = { dbh => $dbh, record => undef, tagslib =>$tagslib, id => $subfield_data{id} }; $plugin->build( $pars ); if ( $itemrecord and my $field = $itemrecord->field($tag) ) { $defaultvalue = $field->subfield($subfield->{subfield}) || q{}; --- a/Koha/FrameworkPlugin.pm +++ a/Koha/FrameworkPlugin.pm @@ -155,7 +155,7 @@ sub new { Generate html and javascript by calling the builder sub of the plugin. Params is a hashref supporting keys: id (=html id for the input field), - record (MARC record or undef), dbh (database handle), tagslib, tabloop. + record (MARC record or undef), dbh (database handle), tagslib. Note that some of these parameters are not used in most (if not all) plugins and may be obsoleted in the future (kept for now to provide backward compatibility). @@ -276,7 +276,7 @@ sub _generate_js { my @params = $self->{oldschool}//0 ? ( $params->{dbh}, $params->{record}, $params->{tagslib}, - $params->{id}, $params->{tabloop} ): + $params->{id} ): ( $params ); my @rv = &$sub( @params ); return $self->_error( 'Builder sub failed: ' . $@ ) if $@; --- a/authorities/authorities.pl +++ a/authorities/authorities.pl @@ -133,8 +133,8 @@ builds the entry for a subfield. =cut sub create_input { - my ( $tag, $subfield, $value, $index_tag, $tabloop, $rec, $authorised_values_sth,$cgi ) = @_; - + my ( $tag, $subfield, $value, $index_tag, $rec, $authorised_values_sth,$cgi ) = @_; + my $index_subfield = CreateKey(); # create a specifique key for each subfield # determine maximum length; 9999 bytes per ISO 2709 except for leader and MARC21 008 @@ -213,7 +213,7 @@ sub create_input { name => $tagslib->{$tag}->{$subfield}->{'value_builder'}, }); my $pars= { dbh => $dbh, record => $rec, tagslib =>$tagslib, - id => $subfield_data{id}, tabloop => $tabloop }; + id => $subfield_data{id} }; $plugin->build( $pars ); if( !$plugin->errstr ) { $subfield_data{marc_value} = { @@ -410,7 +410,7 @@ sub build_tabs { push( @subfields_data, &create_input( - $tag, $subfield, $value, $index_tag, $tabloop, $record, + $tag, $subfield, $value, $index_tag, $record, $authorised_values_sth,$input ) ); @@ -426,7 +426,7 @@ sub build_tabs { push( @subfields_data, &create_input( - $tag, $subfield, $value, $index_tag, $tabloop, + $tag, $subfield, $value, $index_tag, $record, $authorised_values_sth,$input ) ); @@ -444,7 +444,7 @@ sub build_tabs { push( @subfields_data, &create_input( - $tag, $subfield, '', $index_tag, $tabloop, $record, + $tag, $subfield, '', $index_tag, $record, $authorised_values_sth,$input ) ); @@ -486,7 +486,7 @@ sub build_tabs { push( @subfields_data, &create_input( - $tag, $subfield->{subfield}, '', $index_tag, $tabloop, $record, + $tag, $subfield->{subfield}, '', $index_tag, $record, $authorised_values_sth,$input ) ); --- a/cataloguing/addbiblio.pl +++ a/cataloguing/addbiblio.pl @@ -283,7 +283,7 @@ sub GetMandatoryFieldZ3950 { =cut sub create_input { - my ( $tag, $subfield, $value, $index_tag, $tabloop, $rec, $authorised_values_sth,$cgi ) = @_; + my ( $tag, $subfield, $value, $index_tag, $rec, $authorised_values_sth,$cgi ) = @_; my $index_subfield = CreateKey(); # create a specifique key for each subfield @@ -394,7 +394,7 @@ sub create_input { name => $tagslib->{$tag}->{$subfield}->{'value_builder'}, }); my $pars= { dbh => $dbh, record => $rec, tagslib => $tagslib, - id => $subfield_data{id}, tabloop => $tabloop }; + id => $subfield_data{id} }; $plugin->build( $pars ); if( !$plugin->errstr ) { $subfield_data{marc_value} = { @@ -567,7 +567,7 @@ sub build_tabs { push( @subfields_data, &create_input( - $tag, $subfield, $value, $index_tag, $tabloop, $record, + $tag, $subfield, $value, $index_tag, $record, $authorised_values_sth,$input ) ); @@ -582,7 +582,7 @@ sub build_tabs { push( @subfields_data, &create_input( - $tag, $subfield, $value, $index_tag, $tabloop, + $tag, $subfield, $value, $index_tag, $record, $authorised_values_sth,$input ) ); @@ -612,7 +612,7 @@ sub build_tabs { push( @subfields_data, &create_input( - $tag, $subfield, '', $index_tag, $tabloop, $record, + $tag, $subfield, '', $index_tag, $record, $authorised_values_sth,$input ) ); @@ -668,7 +668,7 @@ sub build_tabs { push( @subfields_data, &create_input( - $tag, $subfield->{subfield}, '', $index_tag, $tabloop, $record, + $tag, $subfield->{subfield}, '', $index_tag, $record, $authorised_values_sth,$input ) ); --- a/cataloguing/additem.pl +++ a/cataloguing/additem.pl @@ -59,7 +59,7 @@ use List::MoreUtils qw( any uniq ); our $dbh = C4::Context->dbh; sub generate_subfield_form { - my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $subfields, $i, $restrictededition, $item) = @_; + my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $i, $restrictededition, $item) = @_; my $frameworkcode = &GetFrameworkCode($biblionumber); @@ -241,7 +241,7 @@ sub generate_subfield_form { item_style => 1, }); my $pars= { dbh => $dbh, record => $temp, tagslib =>$tagslib, - id => $subfield_data{id}, tabloop => $subfields }; + id => $subfield_data{id} }; $plugin->build( $pars ); if( !$plugin->errstr ) { my $class= 'buttonDot'. ( $plugin->noclick? ' disabled': '' ); @@ -885,7 +885,7 @@ foreach my $tag ( keys %{$tagslib} ) { $value, $tagslib, $subfield, $libraries, $biblionumber, $temp, - \@subfields, $i, + $i, $restrictededition, $current_item, ); push @subfields, $subfield_data; --- a/cataloguing/value_builder/normarc_field_007.pl +++ a/cataloguing/value_builder/normarc_field_007.pl @@ -26,7 +26,7 @@ use C4::Search; use C4::Output qw( output_html_with_http_headers ); sub plugin_javascript { -my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; +my ($dbh,$record,$tagslib,$field_number) = @_; my $function_name= $field_number; my $res="