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

(-)a/C4/Breeding.pm (-11 / +2 lines)
Lines 457-463 sub _isbn_replace { Link Here
457
457
458
ImportBreedingAuth($marcrecords,$overwrite_auth,$filename,$encoding,$z3950random,$batch_type);
458
ImportBreedingAuth($marcrecords,$overwrite_auth,$filename,$encoding,$z3950random,$batch_type);
459
459
460
TODO description
460
    ImportBreedingAuth imports MARC records in the reservoir (import_records table).
461
    ImportBreedingAuth is based on the ImportBreeding subroutine.
461
462
462
=cut
463
=cut
463
464
Lines 485-494 sub ImportBreedingAuth { Link Here
485
        # Normalize the record so it doesn't have separated diacritics
486
        # Normalize the record so it doesn't have separated diacritics
486
        SetUTF8Flag($marcrecord);
487
        SetUTF8Flag($marcrecord);
487
488
488
#         warn "$i : $marcarray[$i]";
489
        # FIXME - currently this does nothing
490
        my @warnings = $marcrecord->warnings();
491
492
        if (scalar($marcrecord->fields()) == 0) {
489
        if (scalar($marcrecord->fields()) == 0) {
493
            $notmarcrecord++;
490
            $notmarcrecord++;
494
        } else {
491
        } else {
Lines 509-518 sub ImportBreedingAuth { Link Here
509
506
510
            if ($duplicateauthid && $overwrite_auth ne 2) {
507
            if ($duplicateauthid && $overwrite_auth ne 2) {
511
                #If the authority record exists and $overwrite_auth doesn't equal 2, then mark it as already in the DB
508
                #If the authority record exists and $overwrite_auth doesn't equal 2, then mark it as already in the DB
512
                #FIXME: What does $overwrite_auth = 2 even mean?
513
514
                #FIXME: Should we bother with $overwrite_auth values? Currently, the hard-coded $overwrite_auth value is 2, which means the database gets filled with import_records...
515
                #^^ of course, we might not want to reject records if their control number/heading exist in the db or breeding/import pool...as we might be wanting to update existing authority records...
516
                $alreadyindb++;
509
                $alreadyindb++;
517
            } else {
510
            } else {
518
                if ($controlnumber && $heading) {
511
                if ($controlnumber && $heading) {
Lines 520-530 sub ImportBreedingAuth { Link Here
520
                    ($breedingid) = $searchbreeding->fetchrow;
513
                    ($breedingid) = $searchbreeding->fetchrow;
521
                }
514
                }
522
                if ($breedingid && $overwrite_auth eq '0') {
515
                if ($breedingid && $overwrite_auth eq '0') {
523
                    #FIXME: What does $overwrite_auth = 0 even mean?
524
                    $alreadyinfarm++;
516
                    $alreadyinfarm++;
525
                } else {
517
                } else {
526
                    if ($breedingid && $overwrite_auth eq '1') {
518
                    if ($breedingid && $overwrite_auth eq '1') {
527
                        #FIXME: What does $overwrite_auth = 1 even mean?
528
                        ModAuthorityInBatch($breedingid, $marcrecord);
519
                        ModAuthorityInBatch($breedingid, $marcrecord);
529
                    } else {
520
                    } else {
530
                        my $import_id = AddAuthToBatch($batch_id, $imported, $marcrecord, $encoding, $z3950random);
521
                        my $import_id = AddAuthToBatch($batch_id, $imported, $marcrecord, $encoding, $z3950random);
(-)a/cataloguing/z3950_auth_search.pl (-10 / +5 lines)
Lines 1-25 Link Here
1
#!/usr/bin/perl
1
#!/usr/bin/perl
2
2
3
# This is a completely new Z3950 clients search using async ZOOM -TG 02/11/06
4
# Copyright 2000-2002 Katipo Communications
5
#
6
# This is a new Z3950 authority search using the current Z3950 bibliographic search as a model 07/05/2013
7
# Parts Copyright 2013 Prosentient Systems
8
#
9
# This file is part of Koha.
3
# This file is part of Koha.
10
#
4
#
5
# Copyright 2013 Prosentient Systems
6
#
11
# Koha is free software; you can redistribute it and/or modify it under the
7
# Koha is free software; you can redistribute it and/or modify it under the
12
# terms of the GNU General Public License as published by the Free Software
8
# terms of the GNU General Public License as published by the Free Software
13
# Foundation; either version 2 of the License, or (at your option) any later
9
# Foundation; either version 3 of the License, or (at your option) any later
14
# version.
10
# version.
15
#
11
#
16
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
17
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
18
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
14
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
19
#
15
#
20
# You should have received a copy of the GNU General Public License along
16
# You should have received a copy of the GNU General Public License along
21
# with Koha; if not, write to the Free Software Foundation, Inc.,
17
# with Koha; if not, see <http://www.gnu.org/licenses>.
22
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
23
18
24
use strict;
19
use strict;
25
use warnings;
20
use warnings;
(-)a/installer/data/mysql/updatedatabase.pl (-2 / +1 lines)
Lines 7106-7112 if ( CheckVersion($DBversion) ) { Link Here
7106
7106
7107
$DBversion = "3.13.00.XXX";
7107
$DBversion = "3.13.00.XXX";
7108
if ( CheckVersion($DBversion) ) {
7108
if ( CheckVersion($DBversion) ) {
7109
    $dbh->do(q{ALTER TABLE `z3950servers` ADD COLUMN `recordtype` VARCHAR(45) NOT NULL DEFAULT 'biblio';});
7109
    $dbh->do(q{ALTER TABLE z3950servers ADD COLUMN recordtype VARCHAR(45) NOT NULL DEFAULT 'biblio' AFTER description;});
7110
    print "Upgrade to $DBversion done (Bug 10096 - Add a Z39.50 interface for authority searching)\n";
7110
    print "Upgrade to $DBversion done (Bug 10096 - Add a Z39.50 interface for authority searching)\n";
7111
    SetVersion ($DBversion);
7111
    SetVersion ($DBversion);
7112
}
7112
}
7113
- 

Return to bug 10096