projects
/
koha-ffzg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 32350: Use array_minus and ignore nesting
[koha-ffzg.git]
/
authorities
/
merge.pl
diff --git
a/authorities/merge.pl
b/authorities/merge.pl
index
80c3640
..
0799c26
100755
(executable)
--- a/
authorities/merge.pl
+++ b/
authorities/merge.pl
@@
-19,16
+19,16
@@
use Modern::Perl;
use CGI qw ( -utf8 );
use Modern::Perl;
use CGI qw ( -utf8 );
-use C4::Output;
-use C4::Auth;
-use C4::AuthoritiesMarc;
-use C4::Koha;
-use C4::Biblio;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
+use C4::AuthoritiesMarc qw( GetAuthority ModAuthority DelAuthority GetTagsLabels merge );
+use C4::Biblio qw( TransformHtmlToMarc );
+use Koha::Authority::MergeRequests;
use Koha::Authority::Types;
use Koha::MetadataRecord::Authority;
use Koha::Authority::Types;
use Koha::MetadataRecord::Authority;
-my $input =
new CGI
;
+my $input =
CGI->new
;
my @authid = $input->multi_param('authid');
my $merge = $input->param('merge');
my @authid = $input->multi_param('authid');
my $merge = $input->param('merge');
@@
-39,7
+39,6
@@
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
template_name => "authorities/merge.tt",
query => $input,
type => "intranet",
template_name => "authorities/merge.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { editauthorities => 1 },
}
);
flagsrequired => { editauthorities => 1 },
}
);
@@
-82,8
+81,7
@@
if ($merge) {
my $MARCfrom = GetAuthority( $recordid2 );
merge({ mergefrom => $recordid2, MARCfrom => $MARCfrom, mergeto => $recordid1, MARCto => $record });
my $MARCfrom = GetAuthority( $recordid2 );
merge({ mergefrom => $recordid2, MARCfrom => $MARCfrom, mergeto => $recordid1, MARCto => $record });
- # Delete the other record. Do not merge. It is unneeded and could under
- # special circumstances have unwanted side-effects.
+ # Delete the other record. No need to merge.
DelAuthority({ authid => $recordid2, skip_merge => 1 });
# Parameters
DelAuthority({ authid => $recordid2, skip_merge => 1 });
# Parameters