[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1278-gaa86e7e
Git repo owner
gitmaster at git.koha-community.org
Thu Oct 10 23:46:14 CEST 2013
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 aa86e7eb7526b7f4a4ab5af6134db5655cd3e6d2 (commit)
via 4a2aa0e7687ac113d1a98c37a4bc8338fea156a4 (commit)
via ec3986c1db39bb84017a37b68f745183a447cdd8 (commit)
via adabb74aa1751bb9760f5e559f84af8ac59397e9 (commit)
via a512481af30e038cd694a4a2e771eb4ab8192ed9 (commit)
via cbd95910104e38545ef4371099f3af0584a5f301 (commit)
via 1460065d244b4a54350cf83c23fdc560e773e34b (commit)
via b5bd2b75865da040a44b2b48874da35b92e74cd5 (commit)
from 4d8b1ec7864837bfb139c547e6e461644b5f730d (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 aa86e7eb7526b7f4a4ab5af6134db5655cd3e6d2
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 10 21:57:29 2013 +0000
bug 5202: (follow-up) tweak display of merge action link on staged batch page
This patch adds a vertical bar between the link to display the
matching authority record and the link to initiate a record
merge; prior to this patch, the two links ran together.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 4a2aa0e7687ac113d1a98c37a4bc8338fea156a4
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 10 21:50:08 2013 +0000
bug 5202: (follow-up) adjust for the move of the merge record Javascript
This patch applies to change from bug 10650 to the new
authority record merge feature.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ec3986c1db39bb84017a37b68f745183a447cdd8
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun Aug 18 14:44:19 2013 -0400
Bug 5202: QA follow-up - correct license and POD errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit adabb74aa1751bb9760f5e559f84af8ac59397e9
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun Aug 18 12:57:50 2013 -0400
Bug 5202: QA follow-up - improve merge reference selection
The link on the merge reference had been wrong, and framework types
were not indicated when you were merging records of two types. This
patch fixes those problems.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit a512481af30e038cd694a4a2e771eb4ab8192ed9
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun Aug 18 12:41:18 2013 -0400
Bug 5202: (follow-up) Quiet warning
$mergereference is not always defined, so we should check it is
defined before checking its value.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit cbd95910104e38545ef4371099f3af0584a5f301
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun Aug 4 10:15:14 2013 -0400
Bug 5202: QA follow-up 2 - fix overeager error message
When rebasing the patch for this, I accidentally moved the line
setting the mergereference when merging from breeding to *before*
I checked whether we were merging from breeding. Needless to say,
this caused problems. This patch fixes that, and:
* Makes the error translatable.
* Adds a missing authtypesloop argument for the template.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 1460065d244b4a54350cf83c23fdc560e773e34b
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun Jul 14 17:13:07 2013 -0400
Bug 5202: QA follow-up: quiet warnings
Due to massively incorrect data in the default authority frameworks,
we were getting warnings about undefined values and spaces from checking
which tab subfields/fields were displayed in. This patch eliminates those
warnings.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b5bd2b75865da040a44b2b48874da35b92e74cd5
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sat May 11 16:11:38 2013 -0400
Bug 5202: merge authorities from the authority file and reservoir
This patch gives Koha the ability to merge authority records using the
same interface used by bibliographic records, though slightly different
methods for selecting which records to merge. The two ways to select
records are as follows:
1) Records can be selected from authority search results by clicking
the "Merge" link for two records.
2) Authority records can be merged from the reservoir by clicking the
merge-related links in the Manage staged MARC batch screen.
To test:
1) Apply patch.
2) Do a search for an authority record that will turn up multiple
identical records (or at least two records that you don't mind
merging).
3) Click the "Merge" link for the first record.
4) Click the "Merge" link for the second record.
5) Choose which fields from which record you want to appear in the
resulting record.
6) Confirm that those are the fields that exist in the resulting record.
7) Stage an authority record (for example, an authority record you
saved from your catalog.
8) Search for a record to merge with it using the "Search for a record
to merge in a new window" link.
9) Merge these records, confirming that the resulting record (after
going through the entire merging process) matches your expectations.
10) Set up a matching rule for authorities, and export an authority from
your catalog that will match based on that rule. For MARC21, the
following is a good choice for a rule:
Matching rule code: AUTHPER
Description: Personal name main entry
Match threshold: 999
Record type: Authority record
[Match point 1:]
Search index: mainmainentry
Score: 1000
Tag: 100
Subfields: a
11) Stage the record you just exported, choosing the matching rule you
just created.
12) Merge the record using the "Merge" link, confirming that the
resulting record (after going through the entire merging process)
matches your expectations.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Testing notes on last patch in series.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Authority.pm | 65 +++++-
Koha/Util/MARC.pm | 87 +++++++-
authorities/merge.pl | 212 ++++++++++++++++++++
{cataloguing => authorities}/merge_ajax.pl | 11 +-
.../prog/en/includes/authorities_js.inc | 38 ++++
.../en/modules/authorities/authorities-home.tt | 3 +
.../modules/{cataloguing => authorities}/merge.tt | 60 +++---
.../en/modules/authorities/searchresultlist.tt | 8 +-
.../prog/en/modules/tools/manage-marc-import.tt | 20 +-
t/Koha_Util_MARC.t | 4 +-
t/db_dependent/Koha_Authority.t | 26 +++
11 files changed, 489 insertions(+), 45 deletions(-)
create mode 100755 authorities/merge.pl
copy {cataloguing => authorities}/merge_ajax.pl (79%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
copy koha-tmpl/intranet-tmpl/prog/en/modules/{cataloguing => authorities}/merge.tt (58%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list