[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1265-gc9b0905
Git repo owner
gitmaster at git.koha-community.org
Thu Oct 10 20:21:10 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 c9b09051e741ef7e74368e4c1ad52bdb0b7c32f4 (commit)
via e3ccbe145ce0f93d0db3d47da1ef7f2cdeb259af (commit)
via 104c10b248e34e4f0740b0960ba61becae90d81f (commit)
via 1737ff4cc3fef0ce1e12f0f3a8b704d018cb7beb (commit)
via 8ea34625175051247d6df931a35352c403a37edc (commit)
via 45d0365d1280553a83f7a5d66034779898c92359 (commit)
via 5024e519ad53587f1c315ceb983856391afaf0fb (commit)
via 475a9d19d1e023aac12bc8dd7d11405467f869f7 (commit)
via f9addcc98b3e87ba67ac35d01520ef3a0665c6b9 (commit)
via 43809d283558f34fa3164708787a94a5c0fbc419 (commit)
via 8034566027df8fecae558090d4d97bacfc40a922 (commit)
via 041e3603a1bf44a7147188cb83419a9e4cf51fe6 (commit)
from d88e15acfb7da8168cdcb24b271f2aba4dcee4fb (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 c9b09051e741ef7e74368e4c1ad52bdb0b7c32f4
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 10 18:31:02 2013 +0000
Bug 8252: (follow-up) add basic UNIMARC indexing tests
This patch adds a few basic search and indexing tests for UNIMARC,
using sample data provied by Frédéric Demians. The new tests
by no means completely cover the possibilities, but should be
considered a starting point for future tests.
To test:
[1] Verify that prove -v t/db_dependent/Search.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit e3ccbe145ce0f93d0db3d47da1ef7f2cdeb259af
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 10 17:58:30 2013 +0000
Bug 8252: (follow-up) make it easier to add UNIMARC indexing tests
This patch refactors t/db_dependent/Search.t so that it can be
subsequently modified to add tests for indexing and searching
UNIMARC records without duplicating the setup code.
This patch also moves the MARC21 records from t/db_dependent/data/zebraexport
to t/db_dependent/data/marc21/zebraexport so that UNIMARC sample
data can be slotted in t/db_dependent/data/unimarc/zebraexport.
To test:
[1] Verify that prove -v t/db_dependent/Search.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 104c10b248e34e4f0740b0960ba61becae90d81f
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 10 17:28:51 2013 +0000
bug 8252: (follow-up) add search tests on music number
There was some churn in previous patches about the desired
name of the music publisher number index, so this patch
adds tests to confirm that both the old and new names
work as CCL keywords.
To test:
[1] Verify that t/db_dependent/Search.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 1737ff4cc3fef0ce1e12f0f3a8b704d018cb7beb
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 10 17:18:43 2013 +0000
bug 8252: (follow-up) test both GRS1 and DOM indexing
This patch expands t/db_dependent/Search.t to run
the same tests using both the GRS-1 and DOM indexing
modes. It also adds hooks in zebra_config.pl to make
it easier to stage test cases for non-MARC21 Zebra
indexing.
Note that in DOM mode one of the tests is currently a
TODO, as relevance ranking for wegihted queries differs
between GRS-1 and DOM.
To test:
[1] Verify that prove -v t/db_dependent/Search.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 8ea34625175051247d6df931a35352c403a37edc
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 10 16:05:33 2013 +0000
Bug 8252: (follow-up) standardize name of Identifier-publisher-for-music index
To test:
[1] When running t/db_dependent/Search.t, veify that no warnings like
this are shown:
15:52:07-10/10 zebraidx(2006) [warn] Index 'Number-music-publisher' not found in attset(s)
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 45d0365d1280553a83f7a5d66034779898c92359
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 10 15:49:06 2013 +0000
Bug 8620: (follow-up) apply to NORMARC and MARC21 authorities
This applies the fix for the Any index to NORMARC bib
and MARC21 authority DOM Zebra indexes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 5024e519ad53587f1c315ceb983856391afaf0fb
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Oct 10 15:30:29 2013 +0000
Bug 8252: (follow-up) tidy up long lines in bib1.att
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 475a9d19d1e023aac12bc8dd7d11405467f869f7
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Wed Sep 25 09:34:20 2013 +0200
Bug 8252: (follow-up) fix biblio-zebra-indexdefs.xsl
This patch fixes biblio-zebra-indexdefs.xsl files.
It was generated from biblio-koha-indexdefs.xsm with the new
koha-indexdefs-to-zebra.xsl amended by F. Démians's patch.
To test :
- Take a DOM UNIMARC Koha
- Apply all the patchs of 8252 bug, including this one
- Copy src/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
to your etc/zebradb/marc_defs/unimarc/biblios/ located in your
installation directory
- Run rebuid_zebra -b -x -r -v
- make advanced searches on staff interface and opac, on coded fields
indexes (Audience, Literary genre, Biography, Illustration, Content,
Video Types, Serial Type, Periodicity, Regularity, Picture)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Ok for me. This patch put in sync indexes XSL definition with
authoritative XML definition. Subsequently, it won't be difficult to
amend DOM UNIMARC indexes defintion if necessary. And, as it is, I don't
see any regression, whereas I can see huge improvements. Thanks Mathieu!
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit f9addcc98b3e87ba67ac35d01520ef3a0665c6b9
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Tue Sep 24 23:14:50 2013 +0200
Bug 8852: DOM XSL now handles subfield substring extraction
This patch modify koha-indexdefs-to-zebra.xsl in order to add the
ability to populate indexes with subfield substring.
It's now possible to understand such construction as:
<index_subfields xmlns="http://..." tag="100" subfields="a" offset="7" length="1">
<target_index>tpubdate:s</target_index>
</index_subfields>
Signed-off-by:Mathieu Saby <mathieu.saby at univ-rennes2.fr>
I applied the patch and ran
xsltproc koha-indexdefs-to-zebra.xsl ../marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml \
> ../marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
I looked at the generated file. It looks nice.
Then I copied it file in my INSTALLDIR/etc/zebra.... and reindexed my
records with rebuild_zebra.pl
I made some searches on coded position index and non coded position
indexes, everything works.
http://bugs.koha-community.org/show_bug.cgi?id=8252
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 43809d283558f34fa3164708787a94a5c0fbc419
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Mon May 6 19:58:09 2013 +0200
Bug 8252: Followup for Date/time-last-modified and Music number
This followup restores the original wording of "Date/time-last-modified"
index, and change the name of "Music-number" index to
"Number-music-publisher"
To test :
1. In a UNIMARC Koha instance
2. Apply patchs #1, #2 and this followup
3. Copy from src/etc/zebradb directory to the etc/zebradb/ in your main
Koha directory the following files:
-- zebradb/biblios/etc/bib1.att
-- zebradb/ccl.properties
-- zebradb/marc_defs/unimarc/biblios/record.abs
-- zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
-- zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
4. Rebuild zebra with -b -x -v -r options
5. Write a value like "test071a" in 071$a field in a record
6. Check if you can find this record with this search:
"ccl=Number-music-publisher:test071a"
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
No koha-qa errors.
Test
Copy files
reindex full
Modify a couple of record to add 071a with test message
Reindex -v -z -b -x
Search test message as described and found modified records.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 8034566027df8fecae558090d4d97bacfc40a922
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Wed Mar 27 16:04:28 2013 +0100
Bug 8252: Fix indexing of UNIMARC 1xx for DOM
This patch makes the same changes in UNIMARC DOM configuration as patch
1 made for GRS-1.
positions of subfields are indexed that way :
In biblio-koha-indexdefs.xml :
tag="100" subfields="a" offset="17" length="1"
In biblio-zebra-indexdefs.xsl :
xslo:value-of select="substring(., 17, 1)"
I had to edit biblio-zebra-indexdefs.xsl by hand, because
etc/zebdradb/xml/koha-indexdefs-to-zebra.xsl does only support
"subtring" in handle-one-index-control-field template.
It is good for MARC21, but not for UNIMARC : in MARC21, indexing
subtrings is needed for controled field (001-009, with no subfields)
But in UNIMARC it is needed for subfields of 1XX fields.
So if DOM indexing is working with these new files, we may need to
change koha-indexdefs-to-zebra.xsl.
Test plan (not possible in a sandbox) :
1) In a Koha instance using UNIMARC and DOM indexing
2) Apply Patch 1 and Patch 2 (this one)
3) Copy the following files from the etc/zebradb directory of your
source into the etc/zebradb directory of your main Koha directory :
-- etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
-- etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
-- etc/zebradb/ccl.properties
-- etc/zebradb/biblios/etc/bib1.att
4) rebuild zebra with -x -b -r -v options
5) check if coded filters in advanced search are usable in OPAC and
Staff interface
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works. No koha-qa errors.
Test for DOM
Apply patches
Don't forget to copy files
reindex
Search by coded fields works, also Country-publication
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 041e3603a1bf44a7147188cb83419a9e4cf51fe6
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Fri Feb 1 14:52:05 2013 +0100
Bug 8252: Fix indexing of UNIMARC 1xx for GRS-1
Before fixing UNIMARC DOM indexing, we must fix GRS-1 indexing
1) In advanced search, some Coded fields index are not working: Print,
Illustration, Content
2) Country-heading index is not working
3) Some subfields are indexed in wrong indexes :
102$a should be in Country-publication instead of Country-heading
(non defined in bib1.att)
106$a, filled only for printed works, should be in ff88-23 (form of
item) instead of itype. (ff88-23 is made for Marc21 008 pos
23, which contains the same data as 106a)
200$b should be in Material-type instead of (or in addition to) itype
and itemtype: (Material-type :"free-form string, ... that
describes the material type of the item, e.g., cassette, kit,
computer database, computer file.")
100$a pos 22-24 should not be indexed as "ln" : it is the language of
the record, not the language of the ressource
4) Index names are too long : if we index new positions of coded fields,
with existing names it breaks Zebra indexing (there must be a limit
in line lenghth in record.abs?)
5) There are a lot of warns when rebuiding zebra.
This patch make some changes in bib1.att (could be used later to improve
search) :
- fixing wording for att 51 and 1012
- adding comments for attributes based on MARC21 008 field (8800-8841)
- creating 8806 (tpubdate), 8838 (Modified-code), 8818 (ff8-18), 8840
(ff8-18-21), 8819 (ff8-19), 8821 (ff8-21), 8828 (ff8-28), 8830
(ff8-30), 8831 (ff8-31)
- creating attributes specific to UNIMARC : 9701-9707 (Video-mt,
Graphics-type, Graphics-support, Title-page-availability,
Cumulative-index-availability, script-Title, char-encoding)
- setting apart 3 blocks of attributes, so it could be easy to make
further changes :
-- common to Marc21 and UNIMARC : 8806, 8822, 8838
-- slightly different in Marc21 and UNIMARC (different meanings
according to the type of the record => don't match a single
UNIMARC field)
-- specific to UNIMARC : 9701-9707
In ccl.properties :
- creating a new index: Country-publication 1=1053
- suppressing some warns by mapping with bib1 att:
Date-time-last-modified, Name, rtype, Music-number
- defining indexes using the 3 blocks attributes defined in bib1
(common to Marc21 and UNIMARC, slightly different, specific to UNIMARC)
In record.abs :
- renaming some index for 100-105-110 fields
- correcting indexing of 102$a (country of publication)
106$a (ff88-23)
100$a pos 22-24 (language of record, no more
indexed)
105$a pos. 0-3 (illustration code)
200$b (for the moment, I keep it indexed in
itype and itemtype, but also Material-Type)
In C4/Search.pm :
- adding "Country-publication" index
In OPAC and staff interface template subtypes_unimarc.in :
- renaming indexes to take into account the changes made to Zebra
config files
To test (this cannot be done with a sandbox) :
1) Apply the patch in a UNIMARC GRS-1 Koha instance
2) Copy the following files from the etc/zebradb of your source
directory into the etc/zebradb of your main Koha directory:
-- etc/zebradb/biblios/etc/bib1.att
-- etc/zebradb/ccl.properties
-- etc/zebradb/marc_defs/unimarc/biblios/record.abs
3) Reindex your data (rebuild_zebra -x -b -r -v)
4) Try to use those Coded fields indexes in Advanced search, in OPAC
and Staff interface (available after clicking on "More options",
then on "Coded information filters"):
Audience, Print, Literary genre, Biography, Illustration, Content,
Video Types, Serials, Serial Type, Periodicity, Regularity
5) Try to search "Country-publication=FR" in simple search
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
No koha-qa errors.
Tests for GRS-1
Followed test plan
Search by coded fields works, but only on OPAC,
on staff there are few options
Search by Country-publication works after patch
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Search.pm | 1 +
etc/zebradb/biblios/etc/bib1.att | 85 +-
etc/zebradb/ccl.properties | 158 ++-
.../authorities/authority-zebra-indexdefs.xsl | 3 +-
.../marc21/biblios/biblio-koha-indexdefs.xml | 4 +-
.../marc21/biblios/biblio-zebra-indexdefs.xsl | 2 +-
etc/zebradb/marc_defs/marc21/biblios/record.abs | 2 +-
.../normarc/biblios/biblio-koha-indexdefs.xml | 4 +-
.../normarc/biblios/biblio-zebra-indexdefs.xsl | 5 +-
etc/zebradb/marc_defs/normarc/biblios/record.abs | 2 +-
.../unimarc/biblios/biblio-koha-indexdefs.xml | 142 ++-
.../unimarc/biblios/biblio-zebra-indexdefs.xsl | 241 ++++-
etc/zebradb/marc_defs/unimarc/biblios/record.abs | 78 +-
etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl | 19 +-
.../prog/en/includes/subtypes_unimarc.inc | 160 +--
.../prog/en/includes/subtypes_unimarc.inc | 166 +--
t/db_dependent/Search.t | 1112 +++++++++++---------
.../zebraexport/authority/exported_records | 0
.../zebraexport/biblio/exported_records | 0
.../unimarc/zebraexport/biblio/exported_records | 1 +
t/db_dependent/zebra_config.pl | 11 +
21 files changed, 1371 insertions(+), 825 deletions(-)
rename t/db_dependent/data/{ => marc21}/zebraexport/authority/exported_records (100%)
rename t/db_dependent/data/{ => marc21}/zebraexport/biblio/exported_records (100%)
create mode 100644 t/db_dependent/data/unimarc/zebraexport/biblio/exported_records
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list