[koha-commits] main Koha release repository branch master updated. v3.16.00-794-gac4544e
Git repo owner
gitmaster at git.koha-community.org
Mon Oct 27 18:14:50 CET 2014
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 ac4544ea472c7bf00894ff6d86317ccb046bc420 (commit)
via 55587f5c346a7b7b8f35e05d88c2112f1de46a9a (commit)
via 4bdc80312017732dfa6d21671382cdc89ef4e0ad (commit)
via 8a2d765769eb6f992034d9f3d4b68b9ac00033bd (commit)
via e6d1d8727b609bc85e8f4275e00820af81ee6907 (commit)
via dd325738d65551c09504ebd21bcfc37d368cdecb (commit)
via 49788987b29f14884a59d41602c7821fec03e491 (commit)
via 5bbe42932e6395a8cb49c880c094c21b40590fd3 (commit)
via 0dd1ac40a0df984bee6583f13f80744b539b8f37 (commit)
via cc3a535439c98d70014d08366da1b38b2aca4ed0 (commit)
via a57f4aba22dc9c738cb4093a1fbec67e45de947d (commit)
via 0a53d5e6b68c1e67ed6cea8b93090e97da9f0fae (commit)
from aa9230436d034f038ecccff7470bb3d6012d3441 (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 ac4544ea472c7bf00894ff6d86317ccb046bc420
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Oct 10 22:47:32 2014 +0200
Bug 12844: Force the symbol place in the tests
Looking with Katrin at the default configuration of Number::Format, she
has the p_cs_precedes value set to 0 (put the symbol at the end) and
p_sep_by_sep set to 1.
Now it is possible to sent these values to the format subroutine.
On this way, the tests can force them in order to pass on all configuration.
This default value for this variable certainly depends on the locales.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 55587f5c346a7b7b8f35e05d88c2112f1de46a9a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Sep 16 09:49:40 2014 +0200
Bug 12844: FIX import package missing
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4bdc80312017732dfa6d21671382cdc89ef4e0ad
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Aug 28 16:20:27 2014 +0200
Bug 12844: Use Koha::Number::Price where it can be useful
This patch use the new module into pl and tt script.
Note that we could use it in the acqui/pdfformat/layout*.pm files.
Test plan:
1/ Verify that the acquisition home page displayes the prices as before.
2/ Verify that the budgets page displayes the prices as before.
3/ Verify that the funds page displayes the prices as before.
4/ Verify that the planning page displayes the prices as before. (Note
that 1 price is now formatted: 'Fund remaining').
5/ Create an order from a staged file. This stage file should contain a
formatted price.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8a2d765769eb6f992034d9f3d4b68b9ac00033bd
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Aug 28 16:20:18 2014 +0200
Bug 12844: Remove the C4::Output::FormatNumber subroutine
This subroutine is now useless.
Test plan:
git grep FormatNumber
should not return any result in pl and pm files.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e6d1d8727b609bc85e8f4275e00820af81ee6907
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Aug 28 16:19:17 2014 +0200
Bug 12844: New module to manage prices into Koha
This patch introduces a new module to manage prices into Koha and
especially the acquisition module.
How to use is:
1/ You can use it in a perl script/module:
my $price = Koha::Number::Price->new(3);
$price->format; # Will display 3.00 (or 3,00 depending on the CurrencyFormat syspref).
$price->format({with_symbol => 1}); # Will display €3.00 (or [$]3,00 depending on the CurrencyFormat syspref).
2/ But this module is usefull to display the price from a template file.
[% my_price | Price %]
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit dd325738d65551c09504ebd21bcfc37d368cdecb
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Oct 14 13:52:33 2014 -0400
Bug 13080 - Addition of noEnterSubmit class should not apply to textarea, only to input
The application of the "noEnterSubmit" class to textareas in the
cataloging editor prevents the user from being able to use the Enter key
to create line breaks. This is not intentional and should be corrected.
This patch adds more specific scoping to the relevant JavaScript.
To test, apply the patch and clear your browser cache if necessary. Open
up the MARC editor and locate a tag which uses a textarea for entry. Try
typing lines of text separated by line breaks. The enter key should work
correctly.
Signed-off-by: bondiurbano costalc at gmail.com
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes tests and fixes the problem.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 49788987b29f14884a59d41602c7821fec03e491
Author: Mathieu Saby <mathsabypro at gmail.com>
Date: Wed Aug 20 16:24:49 2014 +0200
Bug 9828 : Followup for Queryparser and deletion of useless 6XX$9
This followup
- changes some indexes in Queryparser configuration file
- supresses some clearly useless 6XX$9 in biblio-koha-indexdefs.xml and adds 2 new ones, probably useless (not sure of that)
- change the name of index Subject-geographical to Subject-name-geographical in ccl.properties (to match bib1.att)
the xsl file zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl was generated with the following command:
xsltproc zebradb/xsl/koha-indexdefs-to-zebra.xsl zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml > zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
To test :
1) Apply the 3 patches
2) copy the modified files from the source directory to the directory where you store the config files for Zebra and Queryparser
The files modified by the 3 patches and that need to be copied are:
etc/zebradb/biblios/etc/bib1.att
etc/zebradb/ccl.properties
etc/searchengine/queryparser.yaml
etc/zebradb/ccl.properties
.../unimarc/biblios/biblio-koha-indexdefs.xml
.../unimarc/biblios/biblio-zebra-indexdefs.xsl
3) Rebuild Zebra
4) Create a record A with some values in critical fields, for example:
- the string "test9828" in 600$c 600$f 600$p, 602$f, 616$c, 616$f, 606$2,600$2
- the string "subform" in 600$j
4) Create a record B with the string "subgeo" in 606$y
5) Create a record C with the string "subdate" in 606$z
WITHOUT QP activated in sysprefs ("Don't try to use QP"):
6) try to search "su:test9828". You should have no results
7) try to search "su-genre:subform". You should have 1 result : record A
8) try to search "su-geo:subgeo". You should have 1 result : record B
9) try to search "su-chrono:subdate". You should have 1 result : record C
10) on existing records, try su-ut, su-to, su-na, su-form, su-corp, su-geo indexes, and see it results are relevant
WITH QP activated in sysprefs:
Same tests
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5bbe42932e6395a8cb49c880c094c21b40590fd3
Author: Mathieu Saby <mathsabypro at gmail.com>
Date: Mon Aug 18 22:51:01 2014 +0200
ug 9828 : Add and fix comments in UNIMARC biblio-koha-indexdefs.xml
Only cosmetic :
- the references to lines record.abs are now useless and outdated
- some comments added in record.abs could be usefull in biblio-koha-indexdefs.xml
No change expected, only comments
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0dd1ac40a0df984bee6583f13f80744b539b8f37
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Sat Mar 16 19:47:20 2013 +0100
Bug 9828: More specific indexing of UNIMARC 6XX fields
[New commit on 18 Aug 2014 : rebased, and DOM indexing only]
Issues to fix :
Most of 6XX may contain a $2 that identifies the system used for indexing. It should not be indexed.
In French libraries, $2 contains "rameau". So searching books about the music composer "Rameau" retreive thousands of records!
For some 6XX fiels, other subfields should not be indexed, for example dates of persons and family, or adresses.
In Unimarc guide, 600$t,601$t,602$t are said to exist but to be "not used". I keep them indexed.
Additionnally, subject indexing could be improved by using specific indexes for each 6XX if possible :
In ccl.properties :
- su-to, su-geo and su-ut are defined as aliases of Subject.
- a specific index is defined, but not used in record.abs : Subject-name-personal, alias su-na
We can use these indexes and create new specific indexes by using existing bib1 attributes.
We could also index $j,$x,$y,$z subdivision in specific indexes.
This patch does the following changes :
1) For all 6XX : Not indexing $2 (LSCH, Rameau...), $3 and $5
2) Suppressing the indexing of some specific subfields, depending on the field:
600 : Personal name used as a subject // see Marc21 600
not indexing c (additional elements),f (dates),p (address/affiliation)
602 : Family name used as a subject // see Marc21 600 3X
not indexing f (dates)
616 : Trademark
not indexing c,f
3) For all 6XX : index $j,$x,$y,$z in several indexes in addition to the specfific index for their 6XX field:
4) Define in ccl.properties some specific indexes :
Subject-name-conference 1=1073 => alias su-conf
Subject-name-corporate 1=1074 => alias su-corp
Subject-genre-form 1=1075 => alias su-genre and su-form
Subject-geographical 1=1076 => alias su-geo
Subject-chronological 1=1077 => alias su-chrono
Subject-title 1=1078 => alias su-ut and su-ti
Subject-topical 1=1079 => alias su-to
5) Adding new aliases in Search.pm :
su-chrono, su-form, su-genre, su-corp, su-conf, su-ti
6) Using these new indexes in for
600 : Subject and Subject-Personal-Name ; all subfields except subdivisions in Personal-name
601 : Subject, Subject-name-conference and Subject-name-corporate and Subject-name-conf ; all subfields except subdivisions in Corporate-name and Conference-name
602 : same as 600 but could be improved later
604 : Subject and Subject-title ; $a in Subject-Personal-Name ; all subfields except subdivisions in Name-and-Title
605 : Subject and Subject-title
606 : Subject and Subject-topical
607 : Subject and Subject-geographical ; all subfields except subdivisions in Name-geographic
608 : Subject and Subject-genre-form
To test :
A. In a UNIMARC-DOM indexing environment
1) Apply the patch
2) Rebuild zebra
3) Create a record A with some values in critical fields, for example:
- the string "test9828" in 600$c 600$f 600$p, 602$f, 616$c, 616$f, 606$2,600$2
- the string "subform" in 600$j
4) Create a record B with the string "subgeo" in 606$y
5) Create a record C with the string "subdate" in 606$z
6) try to search "su:test9828". You should have no results
7) try to search "su-genre:subform". You should have 1 result : record A
8) try to search "su-geo:subgeo". You should have 1 result : record B
9) try to search "su-chrono:subdate". You should have 1 result : record C
10) on existing records, try su-ut, su-to, su-na, su-form, su-corp, su-geo indexes, and see it results are relevant
Indexing of subjects could maybe be improved later
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
All seems to work as expected, I am not super-familiar with UNIMARC but I wonder if in su-corp and su-conf the subdivisions might be useful (e.g. France-Gendarmie / Staatsbibliothek-Berlin)
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit cc3a535439c98d70014d08366da1b38b2aca4ed0
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Sep 1 23:06:25 2014 +0200
Bug 3977: MARC21 321$b has wrong description
Fixing descriptions in all frameworks for consistency.
Changed frameworks are:
- es-ES, default framework
- fr-FR, default and simple frameworks
- nb-NO, default and simple frameworks
- pl-PL, default and simple frameworks
To test:
- verify changes by reading them
- or verify by running the web installers of those languages
and checking the description appears correctly
- or verify by loading the sql files manually and check
they still load correctly
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a57f4aba22dc9c738cb4093a1fbec67e45de947d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Oct 23 14:55:23 2014 -0400
Bug 13139 - Move treeview jQuery plugin outside of language-specific directory
This patch moves the treeview plugin in the staff client from the
language-specific lib/jquery/plugins directory to the one outside the
theme directory.
To test, apply the patch and view the "Set permissions" page for a
patron. The list of permissions should display in an expandable list as
usual.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
It works, following the test plan. I can see the jQuery treeview plugin moved
from 'prog' language specific directory to the global lib/plugins directory.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described. Found no other places where we use this plugin.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0a53d5e6b68c1e67ed6cea8b93090e97da9f0fae
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Oct 23 20:12:05 2014 -0300
Bug 12651: DOM indexing is the default
On the 23 July development meeting it was decided to formally deprecate
GRS-1 indexing mode for Zebra. This patch makes code fallback to DOM
on the remaining places. No behaviour change should be noticed, as DOM
has been the default for a while.
Regards
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes tests and QA script.
Also checked running Makefile.PL
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Context.pm | 2 +-
C4/Output.pm | 28 +-
C4/Search.pm | 8 +-
Koha/Number/Price.pm | 90 ++
t/AuthUtils.t => Koha/Template/Plugin/Price.pm | 19 +-
Makefile.PL | 8 +-
acqui/acqui-home.pl | 43 +-
acqui/addorderiso2709.pl | 5 +-
admin/aqbudgetperiods.pl | 24 +-
admin/aqbudgets.pl | 20 +-
admin/aqplan.pl | 22 -
etc/searchengine/queryparser.yaml | 105 ++-
etc/zebradb/biblios/etc/bib1.att | 4 +-
etc/zebradb/ccl.properties | 43 +-
.../unimarc/biblios/biblio-koha-indexdefs.xml | 885 ++++++++++++++++----
.../unimarc/biblios/biblio-zebra-indexdefs.xsl | 574 ++++++++-----
.../optional/marc21_simple_bib_frameworks.sql | 16 +-
.../Obligatoire/marc21_framework_DEFAULT.sql | 4 +-
.../Optionnel/marc21_simple_bib_frameworks.sql | 16 +-
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 4 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 +-
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 4 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 +-
.../lib/jquery/plugins/jquery.treeview.pack.js | 0
koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js | 2 +-
.../prog/en/modules/acqui/acqui-home.tt | 25 +-
.../prog/en/modules/admin/aqbudgetperiods.tt | 7 +-
.../prog/en/modules/admin/aqbudgets.tt | 39 +-
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 5 +-
.../prog/en/modules/members/member-flags.tt | 2 +-
misc/migration_tools/rebuild_zebra.pl | 4 +-
t/Number/Price.t | 77 ++
t/db_dependent/zebra_config.pl | 2 +-
33 files changed, 1506 insertions(+), 613 deletions(-)
create mode 100644 Koha/Number/Price.pm
copy t/AuthUtils.t => Koha/Template/Plugin/Price.pm (69%)
rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/jquery/plugins/jquery.treeview.pack.js (100%)
create mode 100644 t/Number/Price.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list