View | Details | Raw Unified | Return to bug 21272
Collapse All | Expand All

(-)a/C4/ImportBatch.pm (-10 / +10 lines)
Lines 40-46 use Koha::SearchEngine; Link Here
40
use Koha::SearchEngine::Indexer;
40
use Koha::SearchEngine::Indexer;
41
use Koha::Plugins::Handler;
41
use Koha::Plugins::Handler;
42
use Koha::Logger;
42
use Koha::Logger;
43
use List::MoreUtils qw( uniq );
43
use List::MoreUtils qw( uniq any );
44
44
45
our (@ISA, @EXPORT_OK);
45
our (@ISA, @EXPORT_OK);
46
BEGIN {
46
BEGIN {
Lines 825-836 sub _batchCommitItems { Link Here
825
            my ( $holdingbranchfield, $holdingbranchsubfield ) = GetMarcFromKohaField('items.holdingbranch');
825
            my ( $holdingbranchfield, $holdingbranchsubfield ) = GetMarcFromKohaField('items.holdingbranch');
826
            my $holdingbranch = $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );
826
            my $holdingbranch = $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );
827
827
828
            my @branches = map { $_->branchcode } Koha::Libraries->search->as_list;
828
            my @branches = Koha::Libraries->search->as_list;
829
            my %branches = map { $_ => 1 } @branches;
830
831
            my $missing_branchcode;
829
            my $missing_branchcode;
832
            $missing_branchcode = $homebranch    if ( !exists( $branches{$homebranch} ) );
830
            $missing_branchcode = $homebranch    if not any { $_->branchcode eq $homebranch } @branches;
833
            $missing_branchcode = $holdingbranch if ( !exists( $branches{$holdingbranch} ) );
831
            $missing_branchcode = $holdingbranch if not any { $_->branchcode eq $holdingbranch } @branches;
834
            if ($missing_branchcode) {
832
            if ($missing_branchcode) {
835
                $updsth->bind_param( 1, 'error' );
833
                $updsth->bind_param( 1, 'error' );
836
                $updsth->bind_param( 2, undef );
834
                $updsth->bind_param( 2, undef );
Lines 1232-1238 Returns an array of imported item branches. Link Here
1232
=cut
1230
=cut
1233
1231
1234
sub GetImportItemsBranches {
1232
sub GetImportItemsBranches {
1235
    my ( $batch_id ) = @_;
1233
    my ($batch_id) = @_;
1236
1234
1237
    my $dbh   = C4::Context->dbh;
1235
    my $dbh   = C4::Context->dbh;
1238
    my $query = "SELECT import_items_id, import_items.marcxml, encoding
1236
    my $query = "SELECT import_items_id, import_items.marcxml, encoding
Lines 1242-1257 sub GetImportItemsBranches { Link Here
1242
        ORDER BY import_items_id";
1240
        ORDER BY import_items_id";
1243
    my @params;
1241
    my @params;
1244
    push( @params, $batch_id );
1242
    push( @params, $batch_id );
1245
    my $sth = $dbh->prepare_cached($query);
1243
    my $sth = $dbh->prepare($query);
1246
    $sth->execute(@params);
1244
    $sth->execute(@params);
1247
    my $results = $sth->fetchall_arrayref( {} );
1245
    my $results = $sth->fetchall_arrayref( {} );
1248
    my @branch;
1246
    my @branch;
1249
    my ( $homebranchfield,    $homebranchsubfield )    = GetMarcFromKohaField('items.homebranch');
1247
    my ( $homebranchfield,    $homebranchsubfield )    = GetMarcFromKohaField('items.homebranch');
1250
    my ( $holdingbranchfield, $holdingbranchsubfield ) = GetMarcFromKohaField('items.holdingbranch');
1248
    my ( $holdingbranchfield, $holdingbranchsubfield ) = GetMarcFromKohaField('items.holdingbranch');
1249
1251
    foreach my $row (@$results) {
1250
    foreach my $row (@$results) {
1252
        my $item_marc    = MARC::Record->new_from_xml( StripNonXmlChars( $row->{'marcxml'} ), 'UTF-8', $row->{'encoding'} );
1251
        my $item_marc =
1252
            MARC::Record->new_from_xml( StripNonXmlChars( $row->{'marcxml'} ), 'UTF-8', $row->{'encoding'} );
1253
        push @branch, $item_marc->subfield( $homebranchfield,    $homebranchsubfield );
1253
        push @branch, $item_marc->subfield( $homebranchfield,    $homebranchsubfield );
1254
        push @branch, $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );;
1254
        push @branch, $item_marc->subfield( $holdingbranchfield, $holdingbranchsubfield );
1255
    }
1255
    }
1256
    $sth->finish();
1256
    $sth->finish();
1257
    return uniq @branch;
1257
    return uniq @branch;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt (-2 / +1 lines)
Lines 301-307 Link Here
301
                                        <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" />
301
                                        <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" />
302
                                    </fieldset>
302
                                    </fieldset>
303
                                    [% IF ( missing_branches ) %]
303
                                    [% IF ( missing_branches ) %]
304
                                        <div class="dialog alert">There are some missing libraries in your installation:
304
                                        <div class="dialog alert"><span>There are some missing libraries in your installation:</span>
305
                                        [% FOREACH branche IN branches %]
305
                                        [% FOREACH branche IN branches %]
306
                                        <a href="/cgi-bin/koha/admin/branches.pl?op=add_form" target="_blank">
306
                                        <a href="/cgi-bin/koha/admin/branches.pl?op=add_form" target="_blank">
307
                                            [% branche | html %]
307
                                            [% branche | html %]
308
- 

Return to bug 21272