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

(-)a/installer/data/mysql/atomicupdate/bug_17913.perl (+7 lines)
Line 0 Link Here
1
$DBversion = 'XXX';  # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do( "INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES('AuthorityMergeMode','loose','loose|strict','Authority merge mode','Choice')");
4
5
    SetVersion( $DBversion );
6
    print "Upgrade to $DBversion done (Bug 17913 - AuthorityMergeMode)\n";
7
}
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 52-57 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
52
('AudioAlerts','0','','Enable circulation sounds during checkin and checkout in the staff interface.  Not supported by all web browsers yet.','YesNo'),
52
('AudioAlerts','0','','Enable circulation sounds during checkin and checkout in the staff interface.  Not supported by all web browsers yet.','YesNo'),
53
('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
53
('AuthDisplayHierarchy','0','','Display authority hierarchies','YesNo'),
54
('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
54
('AuthoritiesLog','1',NULL,'If ON, log edit/create/delete actions on authorities.','YesNo'),
55
('AuthorityMergeMode','loose','loose|strict','Authority merge mode','Choice'),
55
('AuthoritySeparator','--','10','Used to separate a list of authorities in a display. Usually --','free'),
56
('AuthoritySeparator','--','10','Used to separate a list of authorities in a display. Usually --','free'),
56
('autoBarcode','OFF','incremental|annual|hbyymmincr|EAN13|OFF','Used to autogenerate a barcode: incremental will be of the form 1, 2, 3; annual of the form 2007-0001, 2007-0002; hbyymmincr of the form HB08010001 where HB=Home Branch','Choice'),
57
('autoBarcode','OFF','incremental|annual|hbyymmincr|EAN13|OFF','Used to autogenerate a barcode: incremental will be of the form 1, 2, 3; annual of the form 2007-0001, 2007-0002; hbyymmincr of the form HB08010001 where HB=Home Branch','Choice'),
57
('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
58
('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref (-1 / +9 lines)
Lines 49-54 Authorities: Link Here
49
              defautl: "afrey50      ba0"
49
              defautl: "afrey50      ba0"
50
              type: textarea
50
              type: textarea
51
              class: code
51
              class: code
52
        -
53
            - When updating biblio records from an attached authority record ("merging"), handle subfields of relevant biblio record fields in
54
            - pref: AuthorityMergeMode
55
              default: "loose"
56
              choices:
57
                  "loose": loose
58
                  "strict": strict
59
            - mode. In strict mode subfields that are not found in the authority record, are deleted. Loose mode will keep them. Loose mode is the historical behavior and still the default.
60
52
    Linker:
61
    Linker:
53
        -
62
        -
54
            - Use the
63
            - Use the
55
- 

Return to bug 17913