[koha-commits] main Koha release repository branch master updated. v3.22.00-680-ga99c29b
Git repo owner
gitmaster at git.koha-community.org
Fri Feb 26 15:02:32 CET 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via a99c29b309f240b9bd0724bc1de05aaab053a6a9 (commit)
via 5a46d23fee376b43920e58331103009bcaeef2b3 (commit)
via fad89a59b91852dca4b260a071930c8e3a5e1603 (commit)
via 9fd673f34fb01b79ce65edb6caaa80008dd25539 (commit)
from b73b68f6296fb1ac468f6cb8fbf5024c4a4056af (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a99c29b309f240b9bd0724bc1de05aaab053a6a9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Feb 26 14:08:03 2016 +0000
Bug 14199 - DBRev 3.23.00.029
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 5a46d23fee376b43920e58331103009bcaeef2b3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sat Jul 11 18:49:45 2015 +0200
Bug 14199: Modify webinstaller sql files for marc21_orgcode plugin
This patch updates the sql installer files for new installations.
Occurrences to the three plugins marc21_field_003, 040c and 040d are
replaced by marc21_orgcode.pl.
This has been generated by one sed statement.
Test plan:
[1] Run a new installation or run some of the changed sql files manually.
[2] Verify that marc21_orgcode is linked to fields previously linked to
the three old plugins.
[3] Do a git grep on the three plugin file names. No occurrences expected.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Have tested the three english sql files:
authorities_normal_marc21.sql: 18 rows with marc21_orgcode (003 and 040a
for 9 auth codes)
marc21_framework_DEFAULT.sql: 1 row with marc21_orgcode (003) -- this patch
does not add them to 040c or 040d; no behavior change..
marc21_simple_bib_frameworks.sql: 8 rows (003 for 8 frameworks)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
The following files do no longer need an adjustment:
installer/data/mysql/de-DE/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
installer/data/mysql/es-ES/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
installer/data/mysql/it-IT/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
For details, check Bug 15097: Update MARC21 de-DE frameworks to Update 21.
And similar reports for es-ES and it-IT.
Verified this change by installing de-DE in the webinstaller. The plugin for
field 003 was correctly set to marc21_orgcode.pl.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit fad89a59b91852dca4b260a071930c8e3a5e1603
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sat Jul 11 17:36:18 2015 +0200
Bug 14199: Database revision for marc21_orgcode.pl
This patch adds the dbrev in atomicupdate, updating the marc structure
for existing installations. (New installation in previous patch.)
And it removes the obsolete plugin files.
Test plan:
Run upgrade. Verify that new plugin is linked (for bib and auth).
Check plugin in editor.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Plugin tested, added to 040a/c/d
Test pass
No koha-qa errors
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 9fd673f34fb01b79ce65edb6caaa80008dd25539
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sat Jul 11 17:22:41 2015 +0200
Bug 14199: Unify marc orgcode plugins, not overwriting existing values
This patch copies code from marc21_field_003.pl to create marc21_orgcode.pl
for more generic use. Other fields like 040c or 040d should use it too.
Note: The plugin is used for authorities too (003, 040a).
One behaviour change is added: If the corresponding field is already
filled, it will not be overwritten.
In the unit test marc21_orgcode already replaces marc21_field_003.
Test plan:
[1] Attach plugin marc21_orgcode to a field (e.g. 003) and test it in
the MARC editor of Cataloguing or Authorities.
[2] Check if a value is not overwritten any more.
[3] Run unit test t/db_dependent/FrameworkPlugin.t; don't be distracted by
the noisy warnings of marc21_field_007.pl. They will be addressed on
another report.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
cataloguing/value_builder/marc21_field_003.pl | 46 --------------------
cataloguing/value_builder/marc21_field_040d.pl | 45 -------------------
.../{marc21_field_040c.pl => marc21_orgcode.pl} | 17 ++++----
.../marc21/mandatory/authorities_normal_marc21.sql | 4 +-
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../marc21/mandatory/authorities_normal_marc21.sql | 4 +-
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../marc21/mandatory/authorities_normal_marc21.sql | 4 +-
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../Obligatoire/authorities_normal_marc21.sql | 36 +++++++--------
.../Obligatoire/marc21_framework_DEFAULT.sql | 2 +-
.../Optionnel/marc21_simple_bib_frameworks.sql | 16 +++----
.../marc21/mandatory/authorities_normal_marc21.sql | 4 +-
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../marc21/mandatory/authorities_normal_marc21.sql | 36 +++++++--------
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 +++----
.../marc21/mandatory/authorities_normal_marc21.sql | 36 +++++++--------
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 +++----
.../marc21_authorities_DEFAULT_general.sql | 4 +-
.../marc21_bibliographic_DEFAULT_general.sql | 2 +-
.../marc21_authorities_CHRON_TERM_general.sql | 4 +-
.../marc21_authorities_CORPO_NAME_general.sql | 4 +-
.../marc21_authorities_GENRE-FORM_general.sql | 4 +-
.../marc21_authorities_GEOGR_NAME_general.sql | 4 +-
.../marc21_authorities_MEETI_NAME_general.sql | 4 +-
.../marc21_authorities_PERSO_NAME_general.sql | 4 +-
.../marc21_authorities_TOPIC_TERM_general.sql | 4 +-
.../marc21_authorities_UNIF_TITLE_general.sql | 4 +-
.../optional/marc21_bibliographic_AR_general.sql | 2 +-
.../optional/marc21_bibliographic_BKS_general.sql | 2 +-
.../optional/marc21_bibliographic_CF_general.sql | 2 +-
.../optional/marc21_bibliographic_IR_general.sql | 2 +-
.../optional/marc21_bibliographic_KT_general.sql | 2 +-
.../optional/marc21_bibliographic_SER_general.sql | 2 +-
.../optional/marc21_bibliographic_SR_general.sql | 2 +-
.../optional/marc21_bibliographic_VR_general.sql | 2 +-
.../marc21_authorities_DEFAULT_general.sql | 4 +-
.../marc21_bibliographic_DEFAULT_general.sql | 2 +-
.../marc21_authorities_CHRON_TERM_general.sql | 4 +-
.../marc21_authorities_CORPO_NAME_general.sql | 4 +-
.../marc21_authorities_GENRE-FORM_general.sql | 4 +-
.../marc21_authorities_GEOGR_NAME_general.sql | 4 +-
.../marc21_authorities_MEETI_NAME_general.sql | 4 +-
.../marc21_authorities_PERSO_NAME_general.sql | 4 +-
.../marc21_authorities_TOPIC_TERM_general.sql | 4 +-
.../marc21_authorities_UNIF_TITLE_general.sql | 4 +-
.../optional/marc21_bibliographic_AR_general.sql | 2 +-
.../optional/marc21_bibliographic_BKS_general.sql | 2 +-
.../optional/marc21_bibliographic_CF_general.sql | 2 +-
.../optional/marc21_bibliographic_IR_general.sql | 2 +-
.../optional/marc21_bibliographic_KT_general.sql | 2 +-
.../optional/marc21_bibliographic_SER_general.sql | 2 +-
.../optional/marc21_bibliographic_SR_general.sql | 2 +-
.../optional/marc21_bibliographic_VR_general.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 15 +++++++
t/db_dependent/FrameworkPlugin.t | 2 +-
59 files changed, 172 insertions(+), 249 deletions(-)
delete mode 100755 cataloguing/value_builder/marc21_field_003.pl
delete mode 100755 cataloguing/value_builder/marc21_field_040d.pl
rename cataloguing/value_builder/{marc21_field_040c.pl => marc21_orgcode.pl} (78%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list