From nahuel.angelinetti at biblibre.com Tue Jun 1 13:56:39 2010 From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI) Date: Tue, 1 Jun 2010 13:56:39 +0200 Subject: [Koha-patches] [PATCH] (bug #4842) check if string is utf8 or not Message-ID: <1275393399-13825-1-git-send-email-nahuel.angelinetti@biblibre.com> This fix a double encoding problem in serial receive. --- C4/Serials.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index 2f5f27f..2f72762 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -1110,7 +1110,6 @@ Note : if we change from "waited" to something else,then we will have to create sub ModSerialStatus { my ( $serialid, $serialseq, $planneddate,$publisheddate, $status, $notes ) = @_; - #It is a usual serial # 1st, get previous status : my $dbh = C4::Context->dbh; @@ -1141,7 +1140,9 @@ sub ModSerialStatus { $sth->execute($subscriptionid); my ( $missinglist, $recievedlist ) = $sth->fetchrow; if ( $status eq 2 ) { - + if (not utf8::is_utf8($serialseq)){ + utf8::decode($serialseq); + } $recievedlist .= "; $serialseq" unless ( index( "$recievedlist", "$serialseq" ) >= 0 ); } -- 1.7.0.4 From colin.campbell at ptfs-europe.com Tue Jun 1 18:52:12 2010 From: colin.campbell at ptfs-europe.com (Colin Campbell) Date: Tue, 1 Jun 2010 17:52:12 +0100 Subject: [Koha-patches] [PATCH] Bug 4844 Remove a circular dependency in koha_perl_deps.pl Message-ID: <1275411132-5019-1-git-send-email-colin.campbell@ptfs-europe.com> Remove 'use Installer' which had external dependencies we're trying to report on. Instead call Installer::PerlModules directly added use warnings and strict updated FSF address in License statement --- koha_perl_deps.pl | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/koha_perl_deps.pl b/koha_perl_deps.pl index 5557f7a..934dea5 100755 --- a/koha_perl_deps.pl +++ b/koha_perl_deps.pl @@ -7,7 +7,10 @@ use FindBin; # we need to enforce which C4::Installer is used in case more than use lib $FindBin::Bin; -use C4::Installer; +use C4::Installer::PerlModules; + +use strict; +use warnings; my $help = 0; my $missing = 0; @@ -135,8 +138,9 @@ This file is part of Koha. Koha is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License along with Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -Suite 330, Boston, MA 02111-1307 USA +You should have received a copy of the GNU General Public License along +with Koha; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. =head1 DISCLAIMER OF WARRANTY -- 1.7.0.1 From lars at catalyst.net.nz Wed Jun 2 06:42:43 2010 From: lars at catalyst.net.nz (Lars Wirzenius) Date: Wed, 2 Jun 2010 16:42:43 +1200 Subject: [Koha-patches] [PATCH 1/2] Add YAML as a dependency, since C4/Record.pm uses it. Message-ID: <1275453764-4405-1-git-send-email-lars@catalyst.net.nz> --- C4/Installer/PerlDependencies.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm index b77ef8b..4ffc2f1 100644 --- a/C4/Installer/PerlDependencies.pm +++ b/C4/Installer/PerlDependencies.pm @@ -448,6 +448,11 @@ our $PERL_DEPS = { 'usage' => 'Core', 'required' => '1', 'min_ver' => '2.07' + }, + 'YAML' => { + 'usage' => 'Core', + 'required' => '1', + 'min_ver' => '0.71' } }; -- 1.7.1 From lars at catalyst.net.nz Wed Jun 2 06:42:44 2010 From: lars at catalyst.net.nz (Lars Wirzenius) Date: Wed, 2 Jun 2010 16:42:44 +1200 Subject: [Koha-patches] [PATCH 2/2] Add missing build-dependencies (python, python-debian). In-Reply-To: <1275453764-4405-1-git-send-email-lars@catalyst.net.nz> References: <1275453764-4405-1-git-send-email-lars@catalyst.net.nz> Message-ID: <1275453764-4405-2-git-send-email-lars@catalyst.net.nz> Also, debian/control gets re-generated, from debian/control.in and PerlDependencies.pm. --- debian/bd-to-depends | 2 ++ debian/control | 5 +++-- debian/control.in | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/bd-to-depends b/debian/bd-to-depends index 747a7d1..ce8809b 100755 --- a/debian/bd-to-depends +++ b/debian/bd-to-depends @@ -5,6 +5,8 @@ import debian.deb822 exclusions = [ 'debhelper', + 'python', + 'python-debian', ] exclusions = [re.compile(s) for s in exclusions] diff --git a/debian/control b/debian/control index 8c0aa4f..a808675 100644 --- a/debian/control +++ b/debian/control @@ -71,15 +71,16 @@ Build-Depends: libalgorithm-checkdigits-perl, libxml-sax-perl, libxml-sax-writer-perl, libxml-simple-perl, + libyaml-perl, libyaml-syck-perl, perl, perl-base, perl-modules, - debhelper (>= 7.0.50), gettext + debhelper (>= 7.0.50), gettext, python, python-debian Package: koha-common Architecture: all -Depends: ${shlib:Depends}, ${misc:Depends}, ${koha:Depends}, +Depends: ${misc:Depends}, ${koha:Depends}, apache2, apache2-mpm-itk, at, diff --git a/debian/control.in b/debian/control.in index 2bed47b..37d1673 100644 --- a/debian/control.in +++ b/debian/control.in @@ -7,11 +7,11 @@ Standards-Version: 3.8.4 # See debian/rules, the override_dh_gencontrol rules. # There are some exceptions. Build-Depends:__AUTODEPENDS__, - debhelper (>= 7.0.50), gettext + debhelper (>= 7.0.50), gettext, python, python-debian Package: koha-common Architecture: all -Depends: ${shlib:Depends}, ${misc:Depends}, ${koha:Depends}, +Depends: ${misc:Depends}, ${koha:Depends}, apache2, apache2-mpm-itk, at, -- 1.7.1 From lars at catalyst.net.nz Wed Jun 2 06:56:47 2010 From: lars at catalyst.net.nz (Lars Wirzenius) Date: Wed, 2 Jun 2010 16:56:47 +1200 Subject: [Koha-patches] [PATCH] Fix bug 4818: Add note to koha README.Debian to maybe disable default vhost. Message-ID: <1275454607-5781-1-git-send-email-lars@catalyst.net.nz> --- debian/koha.README.Debian | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/debian/koha.README.Debian b/debian/koha.README.Debian index 399eedd..74b1df3 100644 --- a/debian/koha.README.Debian +++ b/debian/koha.README.Debian @@ -26,6 +26,10 @@ following: The latter three steps can be done by running the koha-post-install-setup script. +You may also need to disable the default Apache virtual host: + + # sudo a2dissite 000-default + Then access the following URL: http://localhost:8080/ -- 1.7.1 From lars at catalyst.net.nz Wed Jun 2 07:34:24 2010 From: lars at catalyst.net.nz (Lars Wirzenius) Date: Wed, 2 Jun 2010 17:34:24 +1200 Subject: [Koha-patches] [PATCH] Upgrade Koha instance database schema when package is upgraded. Message-ID: <1275456864-31370-1-git-send-email-lars@catalyst.net.nz> If the new version of Koha requires a newer version of the database schema, the Koha instances will work immediately after the package is upgraded, rather than after the sysadmin has run koha-upgrade-schema manually. --- debian/koha-common.postinst | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/debian/koha-common.postinst b/debian/koha-common.postinst index ffb2165..64a7980 100644 --- a/debian/koha-common.postinst +++ b/debian/koha-common.postinst @@ -9,3 +9,5 @@ then fi #DEBHELPER# + +koha-upgrade-schema $(koha-list) -- 1.7.1 From lars at catalyst.net.nz Wed Jun 2 07:51:38 2010 From: lars at catalyst.net.nz (Lars Wirzenius) Date: Wed, 2 Jun 2010 17:51:38 +1200 Subject: [Koha-patches] [PATCH] Update FSF address in debian/copyright. Message-ID: <1275457898-16327-1-git-send-email-lars@catalyst.net.nz> This makes lintian be a bit more quiet. --- debian/copyright | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/copyright b/debian/copyright index b583bfd..88d7c6a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,14 +10,14 @@ License: GPL-2+ terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + . Koha is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, - Suite 330, Boston, MA 02111-1307 USA + . + You should have received a copy of the GNU General Public License along + with Koha; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. . On a Debian system, you can find a copy of GPL version 2 at /usr/share/common-licenses/GPL-2 . -- 1.7.1 From Katrin.Fischer.83 at web.de Wed Jun 2 16:13:14 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Wed, 02 Jun 2010 16:13:14 +0200 Subject: [Koha-patches] [PATCH 1/3] BUG 4506: Add 8xx $w subfields to MARC-Frameworks en, fr-FR Message-ID: <4C0666FA.8040702@web.de> From 776e058c04ade7c7542488ec32d6d42c858e2805 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 21 May 2010 18:00:05 +0200 Subject: [PATCH 3/5] BUG 4506: Add 8xx $w subfields to MARC-Frameworks en, fr-FR Content-Type: text/plain; charset="utf-8" Signed-off-by: Katrin Fischer --- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 4 + .../optional/marc21_simple_bib_frameworks.sql | 32 +++ .../Obligatoire/marc21_framework_DEFAULT.sql | 28 ++- .../Optionnel/marc21_simple_bib_frameworks.sql | 256 +++++++++++--------- 4 files changed, 196 insertions(+), 124 deletions(-) diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql index a5e7d77..cb673dc 100644 --- a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql +++ b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql @@ -2715,6 +2715,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), @@ -2738,6 +2739,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -1, '', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), @@ -2760,6 +2762,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, '', '', '', NULL), @@ -2778,6 +2781,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql index 8821aa2..da72d8f 100644 --- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql +++ b/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql @@ -2740,6 +2740,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), @@ -2763,6 +2764,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), @@ -2785,6 +2787,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'BKS', '', '', NULL), @@ -2803,6 +2806,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), @@ -6661,6 +6665,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), @@ -6684,6 +6689,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), @@ -6706,6 +6712,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'CF', '', '', NULL), @@ -6724,6 +6731,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), @@ -10581,6 +10589,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), @@ -10604,6 +10613,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), @@ -10626,6 +10636,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'SR', '', '', NULL), @@ -10644,6 +10655,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), @@ -14501,6 +14513,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), @@ -14524,6 +14537,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), @@ -14546,6 +14560,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'VR', '', '', NULL), @@ -14564,6 +14579,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), @@ -18419,6 +18435,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), @@ -18442,6 +18459,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), @@ -18464,6 +18482,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'AR', '', '', NULL), @@ -18482,6 +18501,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), @@ -22337,6 +22357,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), @@ -22360,6 +22381,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), @@ -22382,6 +22404,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'KT', '', '', NULL), @@ -22400,6 +22423,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), @@ -26256,6 +26280,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), @@ -26279,6 +26304,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), @@ -26301,6 +26327,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'IR', '', '', NULL), @@ -26319,6 +26346,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), @@ -30171,6 +30199,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), @@ -30194,6 +30223,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), @@ -30216,6 +30246,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'SER', '', '', NULL), @@ -30234,6 +30265,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), diff --git a/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql b/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql index 5877662..cb673dc 100644 --- a/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql +++ b/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql @@ -111,10 +111,10 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, '', '', '', NULL), ('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, '', '', '', NULL), ('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, '', '', '', NULL), - ('952', '8', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, '', '', '', NULL), + ('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, '', '', '', NULL), ('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, '', '', '', NULL), - ('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL), - ('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL), + ('952', 'a', 'Permanent location', 'Permanent Location', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL), + ('952', 'b', 'Current location', 'Current Location', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, '', '', '', NULL), ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, '', '', '', NULL), ('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, '', '', '', NULL), ('952', 'e', 'Source of acquisition', 'Source of acquisition', 0, 0, 'items.booksellerid', 10, '', '', '', 0, 0, '', '', '', NULL), @@ -122,19 +122,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, '', '', '', NULL), ('952', 'h', 'Serial Enumeration / chronology','Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, 0, '', '', '', NULL), ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, '', '', '', NULL), - ('952', 'l', 'Koha issues (times borrowed)', 'Koha issues (times borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, '', '', '', NULL), - ('952', 'm', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, '', '', '', NULL), - ('952', 'n', 'Koha reserves (requests)', 'Koha reserves (requests)', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, '', '', '', NULL), - ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, '', '', '', NULL), - ('952', 'p', 'Piece designation (barcode)', 'Piece designation (barcode)', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, '', '', '', NULL), - ('952', 'q', 'Koha out on loan', 'Koha out on loan', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, '', '', '', NULL), - ('952', 'r', 'Koha date last seen', 'Koha date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, '', '', '', NULL), - ('952', 's', 'Koha date last borrowed', 'Koha date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, '', '', '', NULL), + ('952', 'l', 'Total Checkouts', 'Total Checkouts', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, '', '', '', NULL), + ('952', 'm', 'Total Renewals', 'Total Renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, '', '', '', NULL), + ('952', 'n', 'Total Holds', 'Total Holds', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, '', '', '', NULL), + ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, '', '', '', NULL), + ('952', 'p', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, '', '', '', NULL), + ('952', 'q', 'Checked out', 'Checked out', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, '', '', '', NULL), + ('952', 'r', 'Date last seen', 'Date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, '', '', '', NULL), + ('952', 's', 'Date last checked out', 'Date checked out', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, '', '', '', NULL), ('952', 't', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, '', '', '', NULL), ('952', 'u', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 0, 0, 'items.uri', 10, '', '', '', 1, 0, '', '', '', NULL), ('952', 'v', 'Cost, replacement price', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, '', '', '', NULL), ('952', 'w', 'Price effective from', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, '', '', '', NULL), - ('952', 'x', 'Nonpublic note (lost item payment)', 'Nonpublic note (lost item payment)', 1, 0, 'items.paidfor', 10, '', '', '', NULL, 7, '', '', '', NULL), + ('952', 'x', 'Non-public note', 'Non-public note', 0, 0, '', 10, '', '', '', NULL, 1, '', '', '', NULL), ('952', 'y', 'Koha item type', 'Koha item type', 0, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, 0, '', '', '', NULL), ('952', 'z', 'Public note', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, '', '', '', NULL); @@ -2715,6 +2715,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), @@ -2738,6 +2739,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -1, '', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), @@ -2760,6 +2762,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, '', '', '', NULL), @@ -2778,6 +2781,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), diff --git a/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql b/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql index 024e2db..da72d8f 100644 --- a/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql +++ b/installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_simple_bib_frameworks.sql @@ -151,7 +151,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` -- ('952', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'items.cn_source', 10, '', '', 'marc21_classcodes.pl', NULL, 0, 'BKS', '', '', NULL), --- ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'BKS', '', '', NULL), +-- ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'BKS', '', '', NULL), @@ -170,10 +170,10 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'BKS', '', '', NULL), ('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'BKS', '', '', NULL), ('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'BKS', '', '', NULL), - ('952', '8', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'BKS', '', '', NULL), + ('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'BKS', '', '', NULL), ('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'BKS', '', '', NULL), - ('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'BKS', '', '', NULL), - ('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 1, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'BKS', '', '', NULL), + ('952', 'a', 'Permanent location', 'Permanent location', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'BKS', '', '', NULL), + ('952', 'b', 'Current location', 'Current location', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'BKS', '', '', NULL), ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'BKS', '', '', NULL), ('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'BKS', '', '', NULL), ('952', 'e', 'Source of acquisition', 'Source of acquisition', 0, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'BKS', '', '', NULL), @@ -181,19 +181,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, 'BKS', '', '', NULL), ('952', 'h', 'Serial Enumeration / chronology','Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, 0, 'BKS', '', '', NULL), ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, 'BKS', '', '', NULL), - ('952', 'l', 'Koha issues (times borrowed)', 'Koha issues (times borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), - ('952', 'm', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), - ('952', 'n', 'Koha reserves (requests)', 'Koha reserves (requests)', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), - ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'BKS', '', '', NULL), - ('952', 'p', 'Piece designation (barcode)', 'Piece designation (barcode)', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'BKS', '', '', NULL), - ('952', 'q', 'Koha out on loan', 'Koha out on loan', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), - ('952', 'r', 'Koha date last seen', 'Koha date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), - ('952', 's', 'Koha date last borrowed', 'Koha date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), + ('952', 'l', 'Total Checkouts', 'Total Checkouts', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), + ('952', 'm', 'Total Renewals', 'Total Renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), + ('952', 'n', 'Total Holds', 'Total Holds', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), + ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'BKS', '', '', NULL), + ('952', 'p', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'BKS', '', '', NULL), + ('952', 'q', 'Checked out', 'Checked out', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), + ('952', 'r', 'Date last seen', 'Date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), + ('952', 's', 'Date last borrowed', 'Date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'BKS', '', '', NULL), ('952', 't', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, 'BKS', '', '', NULL), ('952', 'u', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 0, 0, 'items.uri', 10, '', '', '', 1, 0, 'BKS', '', '', NULL), ('952', 'v', 'Cost, replacement price', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, 'BKS', '', '', NULL), ('952', 'w', 'Price effective from', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, 'BKS', '', '', NULL), - ('952', 'x', 'Nonpublic note (lost item payment)', 'Nonpublic note (lost item payment)', 0, 0, 'items.paidfor', 10, '', '', '', NULL, 7, 'BKS', '', '', NULL), + ('952', 'x', 'Non-public note', 'Non-public note', 0, 0, '', 10, '', '', '', NULL, 1, 'BKS', '', '', NULL), ('952', 'y', 'Koha item type', 'Koha item type', 0, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, 0, 'BKS', '', '', NULL), ('952', 'z', 'Public note', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, 'BKS', '', '', NULL); @@ -2740,6 +2740,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), @@ -2763,6 +2764,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), @@ -2785,6 +2787,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'BKS', '', '', NULL), @@ -2803,6 +2806,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), @@ -3969,7 +3973,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'BKS', '', '', NULL), ('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'BKS', '', '', NULL), ('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'BKS', '', '', NULL), - ('995', '8', 'Koha collection [LOCAL, KOHA]', 'Koha collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'BKS', '', '', NULL), + ('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'BKS', '', '', NULL), ('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'BKS', '', '', NULL), ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'BKS', '', '', NULL), ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'BKS', '', '', NULL), @@ -4071,7 +4075,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` -- ('952', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'items.cn_source', 10, '', '', 'marc21_classcodes.pl', NULL, 0, 'CF', '', '', NULL), --- ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'CF', '', '', NULL), +-- ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'CF', '', '', NULL), @@ -4090,10 +4094,10 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'CF', '', '', NULL), ('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'CF', '', '', NULL), ('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'CF', '', '', NULL), - ('952', '8', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'CF', '', '', NULL), + ('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'CF', '', '', NULL), ('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'CF', '', '', NULL), - ('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'CF', '', '', NULL), - ('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'CF', '', '', NULL), + ('952', 'a', 'Permanent location', 'Permanent location', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'CF', '', '', NULL), + ('952', 'b', 'Current location', 'Current location', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'CF', '', '', NULL), ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'CF', '', '', NULL), ('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'CF', '', '', NULL), ('952', 'e', 'Source of acquisition', 'Source of acquisition', 0, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'CF', '', '', NULL), @@ -4101,19 +4105,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, 'CF', '', '', NULL), ('952', 'h', 'Serial Enumeration / chronology','Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, 0, 'CF', '', '', NULL), ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, 'CF', '', '', NULL), - ('952', 'l', 'Koha issues (times borrowed)', 'Koha issues (times borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), - ('952', 'm', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), - ('952', 'n', 'Koha reserves (requests)', 'Koha reserves (requests)', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), - ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'CF', '', '', NULL), - ('952', 'p', 'Piece designation (barcode)', 'Piece designation (barcode)', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'CF', '', '', NULL), - ('952', 'q', 'Koha out on loan', 'Koha out on loan', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), - ('952', 'r', 'Koha date last seen', 'Koha date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), - ('952', 's', 'Koha date last borrowed', 'Koha date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), + ('952', 'l', 'Total Checkouts', 'Total Checkouts', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), + ('952', 'm', 'Total Renewals', 'Total Renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), + ('952', 'n', 'Total Holds', 'Total Holds', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), + ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'CF', '', '', NULL), + ('952', 'p', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'CF', '', '', NULL), + ('952', 'q', 'Checked out', 'Checked out', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), + ('952', 'r', 'Date last seen', 'Date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), + ('952', 's', 'Date last borrowed', 'Date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'CF', '', '', NULL), ('952', 't', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, 'CF', '', '', NULL), ('952', 'u', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 0, 0, 'items.uri', 10, '', '', '', 1, 0, 'CF', '', '', NULL), ('952', 'v', 'Cost, replacement price', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, 'CF', '', '', NULL), ('952', 'w', 'Price effective from', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, 'CF', '', '', NULL), - ('952', 'x', 'Nonpublic note (lost item payment)', 'Nonpublic note (lost item payment)', 0, 0, 'items.paidfor', 10, '', '', '', NULL, 7, 'CF', '', '', NULL), + ('952', 'x', 'Non-public note', 'Non-public note', 0, 0, '', 10, '', '', '', NULL, 1, 'CF', '', '', NULL), ('952', 'y', 'Koha item type', 'Koha item type', 0, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, 0, 'CF', '', '', NULL), ('952', 'z', 'Public note', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, 'CF', '', '', NULL); @@ -6661,6 +6665,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), @@ -6684,6 +6689,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), @@ -6706,6 +6712,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'CF', '', '', NULL), @@ -6724,6 +6731,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), @@ -7890,7 +7898,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'CF', '', '', NULL), ('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'CF', '', '', NULL), ('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'CF', '', '', NULL), - ('995', '8', 'Koha collection [LOCAL, KOHA]', 'Koha collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'CF', '', '', NULL), + ('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'CF', '', '', NULL), ('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'CF', '', '', NULL), ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'CF', '', '', NULL), ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'CF', '', '', NULL), @@ -7992,7 +8000,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` -- ('952', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'items.cn_source', 10, '', '', 'marc21_classcodes.pl', NULL, 0, 'SR', '', '', NULL), --- ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'SR', '', '', NULL), +-- ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'SR', '', '', NULL), @@ -8011,10 +8019,10 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'SR', '', '', NULL), ('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'SR', '', '', NULL), ('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'SR', '', '', NULL), - ('952', '8', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'SR', '', '', NULL), + ('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'SR', '', '', NULL), ('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'SR', '', '', NULL), - ('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'SR', '', '', NULL), - ('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'SR', '', '', NULL), + ('952', 'a', 'Permanent location', 'Permanent location', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'SR', '', '', NULL), + ('952', 'b', 'Current location', 'Current location', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'SR', '', '', NULL), ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'SR', '', '', NULL), ('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'SR', '', '', NULL), ('952', 'e', 'Source of acquisition', 'Source of acquisition', 0, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'SR', '', '', NULL), @@ -8022,19 +8030,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, 'SR', '', '', NULL), ('952', 'h', 'Serial Enumeration / chronology','Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, 0, 'SR', '', '', NULL), ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, 'SR', '', '', NULL), - ('952', 'l', 'Koha issues (times borrowed)', 'Koha issues (times borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), - ('952', 'm', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), - ('952', 'n', 'Koha reserves (requests)', 'Koha reserves (requests)', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), - ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'SR', '', '', NULL), - ('952', 'p', 'Piece designation (barcode)', 'Piece designation (barcode)', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'SR', '', '', NULL), - ('952', 'q', 'Koha out on loan', 'Koha out on loan', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), - ('952', 'r', 'Koha date last seen', 'Koha date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), - ('952', 's', 'Koha date last borrowed', 'Koha date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), + ('952', 'l', 'Total Checkouts', 'Total Checkouts', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), + ('952', 'm', 'Total Renewals', 'Total Renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), + ('952', 'n', 'Total Holds', 'Total Holds', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), + ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'SR', '', '', NULL), + ('952', 'p', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'SR', '', '', NULL), + ('952', 'q', 'Checked out', 'Checked out', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), + ('952', 'r', 'Date last seen', 'Date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), + ('952', 's', 'Date last borrowed', 'Date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'SR', '', '', NULL), ('952', 't', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, 'SR', '', '', NULL), ('952', 'u', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 0, 0, 'items.uri', 10, '', '', '', 1, 0, 'SR', '', '', NULL), ('952', 'v', 'Cost, replacement price', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, 'SR', '', '', NULL), ('952', 'w', 'Price effective from', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, 'SR', '', '', NULL), - ('952', 'x', 'Nonpublic note (lost item payment)', 'Nonpublic note (lost item payment)', 0, 0, 'items.paidfor', 10, '', '', '', NULL, 7, 'SR', '', '', NULL), + ('952', 'x', 'Non-public note', 'Non-public note', 0, 0, '', 10, '', '', '', NULL, 1, 'SR', '', '', NULL), ('952', 'y', 'Koha item type', 'Koha item type', 0, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, 0, 'SR', '', '', NULL), ('952', 'z', 'Public note', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, 'SR', '', '', NULL); @@ -10581,6 +10589,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), @@ -10604,6 +10613,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), @@ -10626,6 +10636,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'SR', '', '', NULL), @@ -10644,6 +10655,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), @@ -11810,7 +11822,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'SR', '', '', NULL), ('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'SR', '', '', NULL), ('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'SR', '', '', NULL), - ('995', '8', 'Koha collection [LOCAL, KOHA]', 'Koha collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SR', '', '', NULL), + ('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SR', '', '', NULL), ('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SR', '', '', NULL), ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'SR', '', '', NULL), ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'SR', '', '', NULL), @@ -11912,7 +11924,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` -- ('952', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'items.cn_source', 10, '', '', 'marc21_classcodes.pl', NULL, 0, 'VR', '', '', NULL), --- ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'VR', '', '', NULL), +-- ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'VR', '', '', NULL), @@ -11931,10 +11943,10 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'VR', '', '', NULL), ('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'VR', '', '', NULL), ('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'VR', '', '', NULL), - ('952', '8', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'VR', '', '', NULL), + ('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'VR', '', '', NULL), ('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'VR', '', '', NULL), - ('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'VR', '', '', NULL), - ('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'VR', '', '', NULL), + ('952', 'a', 'Permanent location', 'Permanent location', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'VR', '', '', NULL), + ('952', 'b', 'Current location', 'Current location', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'VR', '', '', NULL), ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'VR', '', '', NULL), ('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'VR', '', '', NULL), ('952', 'e', 'Source of acquisition', 'Source of acquisition', 0, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'VR', '', '', NULL), @@ -11942,19 +11954,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, 'VR', '', '', NULL), ('952', 'h', 'Serial Enumeration / chronology','Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, 0, 'VR', '', '', NULL), ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, 'VR', '', '', NULL), - ('952', 'l', 'Koha issues (times borrowed)', 'Koha issues (times borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), - ('952', 'm', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), - ('952', 'n', 'Koha reserves (requests)', 'Koha reserves (requests)', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), - ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'VR', '', '', NULL), - ('952', 'p', 'Piece designation (barcode)', 'Piece designation (barcode)', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'VR', '', '', NULL), - ('952', 'q', 'Koha out on loan', 'Koha out on loan', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), - ('952', 'r', 'Koha date last seen', 'Koha date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), - ('952', 's', 'Koha date last borrowed', 'Koha date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), + ('952', 'l', 'Total Checkouts', 'Total Checkouts', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), + ('952', 'm', 'Total Renewals', 'Total Renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), + ('952', 'n', 'Total Holds', 'Total Holds', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), + ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'VR', '', '', NULL), + ('952', 'p', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'VR', '', '', NULL), + ('952', 'q', 'Checked out', 'Checked out', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), + ('952', 'r', 'Date last seen', 'Date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), + ('952', 's', 'Date last borrowed', 'Date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'VR', '', '', NULL), ('952', 't', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, 'VR', '', '', NULL), ('952', 'u', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 0, 0, 'items.uri', 10, '', '', '', 1, 0, 'VR', '', '', NULL), ('952', 'v', 'Cost, replacement price', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, 'VR', '', '', NULL), ('952', 'w', 'Price effective from', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, 'VR', '', '', NULL), - ('952', 'x', 'Nonpublic note (lost item payment)', 'Nonpublic note (lost item payment)', 0, 0, 'items.paidfor', 10, '', '', '', NULL, 7, 'VR', '', '', NULL), + ('952', 'x', 'Non-public note', 'Non-public note', 0, 0, '', 10, '', '', '', NULL, 1, 'VR', '', '', NULL), ('952', 'y', 'Koha item type', 'Koha item type', 0, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, 0, 'VR', '', '', NULL), ('952', 'z', 'Public note', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, 'VR', '', '', NULL); @@ -14501,6 +14513,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), @@ -14524,6 +14537,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), @@ -14546,6 +14560,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'VR', '', '', NULL), @@ -14564,6 +14579,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), @@ -15730,7 +15746,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'VR', '', '', NULL), ('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'VR', '', '', NULL), ('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'VR', '', '', NULL), - ('995', '8', 'Koha collection [LOCAL, KOHA]', 'Koha collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'VR', '', '', NULL), + ('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'VR', '', '', NULL), ('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'VR', '', '', NULL), ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'VR', '', '', NULL), ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'VR', '', '', NULL), @@ -15831,7 +15847,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` -- ('952', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'items.cn_source', 10, '', '', 'marc21_classcodes.pl', NULL, 0, 'AR', '', '', NULL), --- ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'AR', '', '', NULL), +-- ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'AR', '', '', NULL), @@ -15850,10 +15866,10 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'AR', '', '', NULL), ('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'AR', '', '', NULL), ('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'AR', '', '', NULL), - ('952', '8', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'AR', '', '', NULL), + ('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'AR', '', '', NULL), ('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'AR', '', '', NULL), - ('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'AR', '', '', NULL), - ('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'AR', '', '', NULL), + ('952', 'a', 'Permanent location', 'Permanent location', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'AR', '', '', NULL), + ('952', 'b', 'Current location', 'Current location', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'AR', '', '', NULL), ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'AR', '', '', NULL), ('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'AR', '', '', NULL), ('952', 'e', 'Source of acquisition', 'Source of acquisition', 0, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'AR', '', '', NULL), @@ -15861,19 +15877,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, 'AR', '', '', NULL), ('952', 'h', 'Serial Enumeration / chronology','Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, 0, 'AR', '', '', NULL), ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, 'AR', '', '', NULL), - ('952', 'l', 'Koha issues (times borrowed)', 'Koha issues (times borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), - ('952', 'm', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), - ('952', 'n', 'Koha reserves (requests)', 'Koha reserves (requests)', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), - ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'AR', '', '', NULL), - ('952', 'p', 'Piece designation (barcode)', 'Piece designation (barcode)', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'AR', '', '', NULL), - ('952', 'q', 'Koha out on loan', 'Koha out on loan', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), - ('952', 'r', 'Koha date last seen', 'Koha date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), - ('952', 's', 'Koha date last borrowed', 'Koha date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), + ('952', 'l', 'Total Checkouts', 'Total Checkouts', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), + ('952', 'm', 'Total Renewals', 'Total Renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), + ('952', 'n', 'Total Holds', 'Total Holds', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), + ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'AR', '', '', NULL), + ('952', 'p', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'AR', '', '', NULL), + ('952', 'q', 'Checked out', 'Checked out', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), + ('952', 'r', 'Date last seen', 'Date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), + ('952', 's', 'Date last borrowed', 'Date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'AR', '', '', NULL), ('952', 't', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, 'AR', '', '', NULL), ('952', 'u', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 0, 0, 'items.uri', 10, '', '', '', 1, 0, 'AR', '', '', NULL), ('952', 'v', 'Cost, replacement price', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, 'AR', '', '', NULL), ('952', 'w', 'Price effective from', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, 'AR', '', '', NULL), - ('952', 'x', 'Nonpublic note (lost item payment)', 'Nonpublic note (lost item payment)', 0, 0, 'items.paidfor', 10, '', '', '', NULL, 7, 'AR', '', '', NULL), + ('952', 'x', 'Non-public note', 'Non-public note', 0, 0, '', 10, '', '', '', NULL, 1, 'AR', '', '', NULL), ('952', 'y', 'Koha item type', 'Koha item type', 0, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, 0, 'AR', '', '', NULL), ('952', 'z', 'Public note', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, 'AR', '', '', NULL); @@ -18419,6 +18435,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), @@ -18442,6 +18459,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), @@ -18464,6 +18482,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'AR', '', '', NULL), @@ -18482,6 +18501,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), @@ -19648,7 +19668,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'AR', '', '', NULL), ('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'AR', '', '', NULL), ('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'AR', '', '', NULL), - ('995', '8', 'Koha collection [LOCAL, KOHA]', 'Koha collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'AR', '', '', NULL), + ('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'AR', '', '', NULL), ('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'AR', '', '', NULL), ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'AR', '', '', NULL), ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'AR', '', '', NULL), @@ -19749,7 +19769,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` -- ('952', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'items.cn_source', 10, '', '', 'marc21_classcodes.pl', NULL, 0, 'KT', '', '', NULL), --- ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'KT', '', '', NULL), +-- ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'KT', '', '', NULL), @@ -19768,10 +19788,10 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'KT', '', '', NULL), ('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'KT', '', '', NULL), ('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'KT', '', '', NULL), - ('952', '8', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'KT', '', '', NULL), + ('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'KT', '', '', NULL), ('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'KT', '', '', NULL), - ('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'KT', '', '', NULL), - ('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'KT', '', '', NULL), + ('952', 'a', 'Permanent location', 'Permanent location', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'KT', '', '', NULL), + ('952', 'b', 'Current location', 'Current location', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'KT', '', '', NULL), ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'KT', '', '', NULL), ('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'KT', '', '', NULL), ('952', 'e', 'Source of acquisition', 'Source of acquisition', 0, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'KT', '', '', NULL), @@ -19779,19 +19799,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, 'KT', '', '', NULL), ('952', 'h', 'Serial Enumeration / chronology','Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, 0, 'KT', '', '', NULL), ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, 'KT', '', '', NULL), - ('952', 'l', 'Koha issues (times borrowed)', 'Koha issues (times borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), - ('952', 'm', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), - ('952', 'n', 'Koha reserves (requests)', 'Koha reserves (requests)', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), - ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'KT', '', '', NULL), - ('952', 'p', 'Piece designation (barcode)', 'Piece designation (barcode)', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'KT', '', '', NULL), - ('952', 'q', 'Koha out on loan', 'Koha out on loan', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), - ('952', 'r', 'Koha date last seen', 'Koha date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), - ('952', 's', 'Koha date last borrowed', 'Koha date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), + ('952', 'l', 'Total Checkouts', 'Total Checkouts', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), + ('952', 'm', 'Total Renewals', 'Total Renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), + ('952', 'n', 'Total Holds', 'Total Holds', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), + ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'KT', '', '', NULL), + ('952', 'p', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'KT', '', '', NULL), + ('952', 'q', 'Checked out', 'Checked out', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), + ('952', 'r', 'Date last seen', 'Date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), + ('952', 's', 'Date last borrowed', 'Date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'KT', '', '', NULL), ('952', 't', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, 'KT', '', '', NULL), ('952', 'u', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 0, 0, 'items.uri', 10, '', '', '', 1, 0, 'KT', '', '', NULL), ('952', 'v', 'Cost, replacement price', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, 'KT', '', '', NULL), ('952', 'w', 'Price effective from', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, 'KT', '', '', NULL), - ('952', 'x', 'Nonpublic note (lost item payment)', 'Nonpublic note (lost item payment)', 0, 0, 'items.paidfor', 10, '', '', '', NULL, 7, 'KT', '', '', NULL), + ('952', 'x', 'Non-public note', 'Non-public note', 0, 0, '', 10, '', '', '', NULL, 1, 'KT', '', '', NULL), ('952', 'y', 'Koha item type', 'Koha item type', 0, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, 0, 'KT', '', '', NULL), ('952', 'z', 'Public note', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, 'KT', '', '', NULL); @@ -22337,6 +22357,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), @@ -22360,6 +22381,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), @@ -22382,6 +22404,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'KT', '', '', NULL), @@ -22400,6 +22423,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), @@ -23566,7 +23590,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'KT', '', '', NULL), ('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'KT', '', '', NULL), ('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'KT', '', '', NULL), - ('995', '8', 'Koha collection [LOCAL, KOHA]', 'Koha collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'KT', '', '', NULL), + ('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'KT', '', '', NULL), ('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'KT', '', '', NULL), ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'KT', '', '', NULL), ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'KT', '', '', NULL), @@ -23668,7 +23692,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` -- ('952', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'items.cn_source', 10, '', '', 'marc21_classcodes.pl', NULL, 0, 'IR', '', '', NULL), --- ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'IR', '', '', NULL), +-- ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'IR', '', '', NULL), @@ -23687,10 +23711,10 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'IR', '', '', NULL), ('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'IR', '', '', NULL), ('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'IR', '', '', NULL), - ('952', '8', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'IR', '', '', NULL), + ('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'IR', '', '', NULL), ('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'IR', '', '', NULL), - ('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'IR', '', '', NULL), - ('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'IR', '', '', NULL), + ('952', 'a', 'Permanent location', 'Permanent location', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'IR', '', '', NULL), + ('952', 'b', 'Current location', 'Current location', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'IR', '', '', NULL), ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'IR', '', '', NULL), ('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'IR', '', '', NULL), ('952', 'e', 'Source of acquisition', 'Source of acquisition', 0, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'IR', '', '', NULL), @@ -23698,19 +23722,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, 'IR', '', '', NULL), ('952', 'h', 'Serial Enumeration / chronology','Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, 0, 'IR', '', '', NULL), ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, 'IR', '', '', NULL), - ('952', 'l', 'Koha issues (times borrowed)', 'Koha issues (times borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), - ('952', 'm', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), - ('952', 'n', 'Koha reserves (requests)', 'Koha reserves (requests)', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), - ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'IR', '', '', NULL), - ('952', 'p', 'Piece designation (barcode)', 'Piece designation (barcode)', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'IR', '', '', NULL), - ('952', 'q', 'Koha out on loan', 'Koha out on loan', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), - ('952', 'r', 'Koha date last seen', 'Koha date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), - ('952', 's', 'Koha date last borrowed', 'Koha date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), + ('952', 'l', 'Total Checkouts', 'Total Checkouts', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), + ('952', 'm', 'Total Renewals', 'Total Renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), + ('952', 'n', 'Total Holds', 'Total Holds', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), + ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'IR', '', '', NULL), + ('952', 'p', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'IR', '', '', NULL), + ('952', 'q', 'Checked out', 'Checked out', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), + ('952', 'r', 'Date last seen', 'Date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), + ('952', 's', 'Date last borrowed', 'Date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'IR', '', '', NULL), ('952', 't', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, 'IR', '', '', NULL), ('952', 'u', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 0, 0, 'items.uri', 10, '', '', '', 1, 0, 'IR', '', '', NULL), ('952', 'v', 'Cost, replacement price', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, 'IR', '', '', NULL), ('952', 'w', 'Price effective from', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, 'IR', '', '', NULL), - ('952', 'x', 'Nonpublic note (lost item payment)', 'Nonpublic note (lost item payment)', 0, 0, 'items.paidfor', 10, '', '', '', NULL, 7, 'IR', '', '', NULL), + ('952', 'x', 'Non-public note', 'Non-public note', 0, 0, '', 10, '', '', '', NULL, 1, 'IR', '', '', NULL), ('952', 'y', 'Koha item type', 'Koha item type', 0, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, 0, 'IR', '', '', NULL), ('952', 'z', 'Public note', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, 'IR', '', '', NULL); @@ -26256,6 +26280,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), @@ -26279,6 +26304,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), @@ -26301,6 +26327,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'IR', '', '', NULL), @@ -26319,6 +26346,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), @@ -27485,7 +27513,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'IR', '', '', NULL), ('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'IR', '', '', NULL), ('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'IR', '', '', NULL), - ('995', '8', 'Koha collection [LOCAL, KOHA]', 'Koha collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'IR', '', '', NULL), + ('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'IR', '', '', NULL), ('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'IR', '', '', NULL), ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'IR', '', '', NULL), ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'IR', '', '', NULL), @@ -27585,7 +27613,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` -- ('952', '2', 'Source of classification or shelving scheme', 'Source of classification or shelving scheme', 0, 0, 'items.cn_source', 10, '', '', 'marc21_classcodes.pl', NULL, 0, 'SER', '', '', NULL), --- ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'SER', '', '', NULL), +-- ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', 'marc21_itemcallnumber.pl', NULL, 0, 0, 'SER', '', '', NULL), @@ -27604,10 +27632,10 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', '5', 'Use restrictions', 'Use restrictions', 0, 0, 'items.restricted', 10, 'RESTRICTED', '', '', 0, 0, 'SER', '', '', NULL), ('952', '6', 'Koha normalized classification for sorting', 'Koha normalized classification for sorting', 0, 0, 'items.cn_sort', -1, '', '', '', 0, 7, 'SER', '', '', NULL), ('952', '7', 'Not for loan', 'Not for loan', 0, 0, 'items.notforloan', 10, 'NOT_LOAN', '', '', 0, 0, 'SER', '', '', NULL), - ('952', '8', 'Koha collection', 'Koha collection', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'SER', '', '', NULL), + ('952', '8', 'Collection code', 'Collection code', 0, 0, 'items.ccode', 10, 'CCODE', '', '', 0, 0, 'SER', '', '', NULL), ('952', '9', 'Koha itemnumber (autogenerated)', 'Koha itemnumber', 0, 0, 'items.itemnumber', -1, '', '', '', 0, 7, 'SER', '', '', NULL), - ('952', 'a', 'Location (home branch)', 'Location (home branch)', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'SER', '', '', NULL), - ('952', 'b', 'Sublocation or collection (holding branch)', 'Sublocation or collection (holding branch)', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'SER', '', '', NULL), + ('952', 'a', 'Permanent location', 'Permanent location', 0, 0, 'items.homebranch', 10, 'branches', '', '', 0, 0, 'SER', '', '', NULL), + ('952', 'b', 'Current location', 'Current location', 0, 0, 'items.holdingbranch', 10, 'branches', '', '', 0, 0, 'SER', '', '', NULL), ('952', 'c', 'Shelving location', 'Shelving location', 0, 0, 'items.location', 10, 'LOC', '', '', 0, 0, 'SER', '', '', NULL), ('952', 'd', 'Date acquired', 'Date acquired', 0, 0, 'items.dateaccessioned', 10, '', '', 'dateaccessioned.pl', 0, 0, 'SER', '', '', NULL), ('952', 'e', 'Source of acquisition', 'Source of acquisition', 0, 0, 'items.booksellerid', 10, '', '', '', 0, 0, 'SER', '', '', NULL), @@ -27615,19 +27643,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, 'SER', '', '', NULL), ('952', 'h', 'Serial Enumeration / chronology','Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, 0, 'SER', '', '', NULL), ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, 'SER', '', '', NULL), - ('952', 'l', 'Koha issues (times borrowed)', 'Koha issues (times borrowed)', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), - ('952', 'm', 'Koha renewals', 'Koha renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), - ('952', 'n', 'Koha reserves (requests)', 'Koha reserves (requests)', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), - ('952', 'o', 'Koha full call number', 'Koha full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'SER', '', '', NULL), - ('952', 'p', 'Piece designation (barcode)', 'Piece designation (barcode)', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'SER', '', '', NULL), - ('952', 'q', 'Koha out on loan', 'Koha out on loan', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), - ('952', 'r', 'Koha date last seen', 'Koha date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), - ('952', 's', 'Koha date last borrowed', 'Koha date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), + ('952', 'l', 'Total Checkouts', 'Total Checkouts', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), + ('952', 'm', 'Total Renewals', 'Total Renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), + ('952', 'n', 'Total Holds', 'Total Holds', 0, 0, 'items.reserves', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), + ('952', 'o', 'Full call number', 'Full call number', 0, 0, 'items.itemcallnumber', 10, '', '', NULL, 0, 0, 'SER', '', '', NULL), + ('952', 'p', 'Barcode', 'Barcode', 0, 0, 'items.barcode', 10, '', '', 'barcode.pl', 0, 0, 'SER', '', '', NULL), + ('952', 'q', 'Checked out', 'Checked out', 0, 0, 'items.onloan', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), + ('952', 'r', 'Date last seen', 'Date last seen', 0, 0, 'items.datelastseen', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), + ('952', 's', 'Date last borrowed', 'Date last borrowed', 0, 0, 'items.datelastborrowed', 10, '', '', '', NULL, -5, 'SER', '', '', NULL), ('952', 't', 'Copy number', 'Copy number', 0, 0, 'items.copynumber', 10, '', '', '', NULL, 0, 'SER', '', '', NULL), ('952', 'u', 'Uniform Resource Identifier', 'Uniform Resource Identifier', 0, 0, 'items.uri', 10, '', '', '', 1, 0, 'SER', '', '', NULL), ('952', 'v', 'Cost, replacement price', 'Cost, replacement price', 0, 0, 'items.replacementprice', 10, '', '', '', 0, 0, 'SER', '', '', NULL), ('952', 'w', 'Price effective from', 'Price effective from', 0, 0, 'items.replacementpricedate', 10, '', '', '', 0, 0, 'SER', '', '', NULL), - ('952', 'x', 'Nonpublic note (lost item payment)', 'Nonpublic note (lost item payment)', 0, 0, 'items.paidfor', 10, '', '', '', NULL, 7, 'SER', '', '', NULL), + ('952', 'x', 'Non-public note', 'Non-public note', 0, 0, '', 10, '', '', '', NULL, 1, 'SER', '', '', NULL), ('952', 'y', 'Koha item type', 'Koha item type', 0, 0, 'items.itype', 10, 'itemtypes', '', '', NULL, 0, 'SER', '', '', NULL), ('952', 'z', 'Public note', 'Public note', 0, 0, 'items.itemnotes', 10, '', '', '', NULL, 0, 'SER', '', '', NULL); @@ -30171,6 +30199,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), @@ -30194,6 +30223,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), @@ -30216,6 +30246,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'SER', '', '', NULL), @@ -30234,6 +30265,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), @@ -31400,7 +31432,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('995', '5', 'Coded location qualifier [LOCAL, KOHA]', 'Coded location qualifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', NULL, 5, 'SER', '', '', NULL), ('995', '6', 'Copy number [LOCAL, KOHA]', 'Copy number [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', NULL, 5, 'SER', '', '', NULL), ('995', '7', 'Uniform Resource Identifier [LOCAL, KOHA]', 'Uniform Resource Identifier [LOCAL, KOHA]', 1, 0, '', 9, '', '', '', 1, 5, 'SER', '', '', NULL), - ('995', '8', 'Koha collection [LOCAL, KOHA]', 'Koha collection [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SER', '', '', NULL), + ('995', '8', 'Collection code [LOCAL, KOHA]', 'Collection code [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SER', '', '', NULL), ('995', '9', 'Internal item number (Koha itemnumber, autogenerated) [LOCAL, KOHA]', 'Internal itemnumber (Koha itemnumber) [LOCAL, KOHA]', 0, 0, '', 9, '', '', '', 0, 5, 'SER', '', '', NULL), ('995', 'a', 'Origin of the item (home branch) (free text)', 'Origin of item (home branch) (free text)', 0, 0, '', 9, '', '', '', 0, 5, 'SER', '', '', NULL), ('995', 'b', 'Origin of item (home branch) (coded)', 'Origin of item (home branch (coded)', 0, 0, '', 9, '', '', '', 0, 5, 'SER', '', '', NULL), -- 1.6.3.3 From Katrin.Fischer.83 at web.de Wed Jun 2 16:13:40 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Wed, 02 Jun 2010 16:13:40 +0200 Subject: [Koha-patches] [PATCH 2/3] BUG 4506: Add 8xx $w subfields to MARC-Frameworks pl-PL Message-ID: <4C066714.3080501@web.de> From fa681b2bb31cdc95e4fb72b0c81886a0c1b43624 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 23 May 2010 16:36:29 +0200 Subject: [PATCH 1/3] BUG 4506: Add 8xx $w subfields to MARC-Frameworks pl-PL Content-Type: text/plain; charset="utf-8" ru-RU and uk-UA have no files for MARC21 --- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 4 ++ .../optional/marc21_simple_bib_frameworks.sql | 32 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql index be49737..81c25f7 100644 --- a/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql +++ b/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql @@ -2714,6 +2714,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), @@ -2737,6 +2738,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -1, '', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), @@ -2759,6 +2761,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, '', '', '', NULL), @@ -2777,6 +2780,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -1, '', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, '', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, '', '', '', NULL), diff --git a/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql index 6b3a0dc..3d7d5ad 100644 --- a/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql +++ b/installer/data/mysql/pl-PL/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql @@ -2740,6 +2740,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), @@ -2763,6 +2764,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), @@ -2785,6 +2787,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'BKS', '', '', NULL), @@ -2803,6 +2806,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'BKS', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'BKS', '', '', NULL), @@ -6660,6 +6664,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), @@ -6684,6 +6689,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), @@ -6706,6 +6712,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'CF', '', '', NULL), @@ -6724,6 +6731,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'CF', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'CF', '', '', NULL), @@ -10581,6 +10589,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), @@ -10604,6 +10613,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), @@ -10626,6 +10636,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'SR', '', '', NULL), @@ -10644,6 +10655,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SR', '', '', NULL), @@ -14501,6 +14513,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), @@ -14524,6 +14537,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), @@ -14546,6 +14560,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'VR', '', '', NULL), @@ -14564,6 +14579,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'VR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'VR', '', '', NULL), @@ -18419,6 +18435,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), @@ -18442,6 +18459,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), @@ -18464,6 +18482,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'AR', '', '', NULL), @@ -18482,6 +18501,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'AR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'AR', '', '', NULL), @@ -22337,6 +22357,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), @@ -22360,6 +22381,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), @@ -22382,6 +22404,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'KT', '', '', NULL), @@ -22400,6 +22423,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'KT', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'KT', '', '', NULL), @@ -26256,6 +26280,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), @@ -26279,6 +26304,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), @@ -26301,6 +26327,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'IR', '', '', NULL), @@ -26319,6 +26346,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'IR', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'IR', '', '', NULL), @@ -30171,6 +30199,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('800', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('800', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('800', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), + ('800', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('810', '4', 'Relator code', 'Relator code', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), @@ -30194,6 +30223,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('810', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', 'u', 'Affiliation', 'Affiliation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('810', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), + ('810', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', '4', 'Relator code', 'Relator code', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', '6', 'Linkage', 'Linkage', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', '8', 'Field link and sequence number ', 'Field link and sequence number ', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), @@ -30216,6 +30246,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('811', 't', 'Title of a work', 'Title of a work', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', 'u', 'Affiliation', 'Affiliation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('811', 'v', 'Volume/sequential designation', 'Volume/sequential designation', 0, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), + ('811', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('830', '6', 'Linkage', 'Linkage', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', '8', 'Field link and sequence number', 'Field link and sequence number', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', '9', '9 (RLIN)', '9 (RLIN)', 0, 0, '', 8, '', '', '', 0, -5, 'SER', '', '', NULL), @@ -30234,6 +30265,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('830', 's', 'Version', 'Version', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', 't', 'Title of a work', 'Title of a work', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('830', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), + ('830', 'w', 'Bibliographic record control number', 'Bibliographic record control number', 1, 0, NULL, 8, NULL, NULL, '', NULL, -6, 'SER', '', '', NULL), ('840', 'a', 'Title', 'Title', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('840', 'h', 'Medium', 'Medium', 1, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), ('840', 'v', 'Volume number/sequential designation', 'Volume number/sequential designation', 0, 0, '', 8, '', '', '', NULL, -6, 'SER', '', '', NULL), -- 1.6.3.3 From Katrin.Fischer.83 at web.de Wed Jun 2 16:14:20 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Wed, 02 Jun 2010 16:14:20 +0200 Subject: [Koha-patches] [PATCH 3/3] Bug 4506: Add index Record-control-number = rcn for indexing of $w subfields Message-ID: <4C06673C.1010604@web.de> From 31585bbfb6802086534ce5a2c790cf8e976c7c49 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 14 May 2010 18:01:56 +0200 Subject: [PATCH 3/3] Bug 4506: Add index Record-control-number = rcn for indexing of $w subfields Content-Type: text/plain; charset="utf-8" Signed-off-by: Katrin Fischer --- C4/Search.pm | 2 ++ etc/zebradb/biblios/etc/bib1.att | 1 + etc/zebradb/ccl.properties | 4 ++++ etc/zebradb/marc_defs/marc21/biblios/record.abs | 14 ++++++++++++++ 4 files changed, 21 insertions(+), 0 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index cb97a1e..308484c 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -893,6 +893,8 @@ sub getIndexes{ 'popularity', 'pubdate', 'Publisher', + 'Record-control-number', + 'rcn', 'Record-type', 'rtype', 'se', diff --git a/etc/zebradb/biblios/etc/bib1.att b/etc/zebradb/biblios/etc/bib1.att index d47b2a3..9b84e25 100644 --- a/etc/zebradb/biblios/etc/bib1.att +++ b/etc/zebradb/biblios/etc/bib1.att @@ -104,6 +104,7 @@ att 1033 Host-item att 1034 ctype att 1035 Anywhere att 1036 Author-Title-Subject +att 1045 Record-control-number att 1079 Subject-topical diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties index 3dbf9be..c106d3b 100644 --- a/etc/zebradb/ccl.properties +++ b/etc/zebradb/ccl.properties @@ -554,6 +554,10 @@ pb Publisher Note 1=63 nt Note +# Record-linking +Record-control-number 1=1045 +rcn Record-control-number + #Record-source 1019 The USMARC code or name of the 008/39, 040 # organization(s) that created # the original record, assigned diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs index 6cf37ba..74b948e 100644 --- a/etc/zebradb/marc_defs/marc21/biblios/record.abs +++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs @@ -217,25 +217,39 @@ melm 730$r Music-key melm 730$9 Koha-Auth-Number melm 730 Title,Title-uniform melm 740 Title,Title-other-variant +melm 770$w Record-control-number +melm 772$w Record-control-number melm 773$t Host-item +melm 773$w Record-control-number +melm 774$w Record-control-number +melm 775$w Record-control-number +melm 776$w Record-control-number +melm 777$w Record-control-number melm 780$t Title +melm 780$w Record-control-number melm 780 Title,Title-former,Related-periodical melm 785 Related-periodical +melm 785$w Record-control-number +melm 787$w Record-control-number melm 800$a Name-and-title #melm 800$t author,Author-title,Name-and-title,Title,Title-series melm 800$t Author-title,Name-and-title,Title,Title-series melm 800$9 Koha-Auth-Number melm 800 Author,Author-name-personal,Name,Personal-name +melm 800$w Record-control-number melm 810$a Name-and-title melm 810$t Author-title,Name-and-title,Title,Title-series +melm 810$w Record-control-number melm 810$9 Koha-Auth-Number melm 810 Author,Corporate-name,Author-name-corporate,Name melm 811$a Name-and-title melm 811$9 Koha-Auth-Number #melm 811$t author,Author-title,Name-and-title,Title,Title-series melm 811$t Author-title,Name-and-title,Title,Title-series +melm 811$w Record-control-number melm 811 Author,Author-name-corporate,Name,Conference-name +melm 830$w Record-control-number melm 830$9 Koha-Auth-Number melm 830 Title,Title-series melm 840 Title,Title-series -- 1.6.3.3 From caitlin.83 at web.de Wed Jun 2 16:13:49 2010 From: caitlin.83 at web.de (Katrin Fischer) Date: Wed, 02 Jun 2010 16:13:49 +0200 Subject: [Koha-patches] [PATCH 3/3] Bug 4506: Add index Record-control-number = rcn for indexing of $w subfields Message-ID: <4C06671D.5050504@web.de> From 31585bbfb6802086534ce5a2c790cf8e976c7c49 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 14 May 2010 18:01:56 +0200 Subject: [PATCH 3/3] Bug 4506: Add index Record-control-number = rcn for indexing of $w subfields Content-Type: text/plain; charset="utf-8" Signed-off-by: Katrin Fischer --- C4/Search.pm | 2 ++ etc/zebradb/biblios/etc/bib1.att | 1 + etc/zebradb/ccl.properties | 4 ++++ etc/zebradb/marc_defs/marc21/biblios/record.abs | 14 ++++++++++++++ 4 files changed, 21 insertions(+), 0 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index cb97a1e..308484c 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -893,6 +893,8 @@ sub getIndexes{ 'popularity', 'pubdate', 'Publisher', + 'Record-control-number', + 'rcn', 'Record-type', 'rtype', 'se', diff --git a/etc/zebradb/biblios/etc/bib1.att b/etc/zebradb/biblios/etc/bib1.att index d47b2a3..9b84e25 100644 --- a/etc/zebradb/biblios/etc/bib1.att +++ b/etc/zebradb/biblios/etc/bib1.att @@ -104,6 +104,7 @@ att 1033 Host-item att 1034 ctype att 1035 Anywhere att 1036 Author-Title-Subject +att 1045 Record-control-number att 1079 Subject-topical diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties index 3dbf9be..c106d3b 100644 --- a/etc/zebradb/ccl.properties +++ b/etc/zebradb/ccl.properties @@ -554,6 +554,10 @@ pb Publisher Note 1=63 nt Note +# Record-linking +Record-control-number 1=1045 +rcn Record-control-number + #Record-source 1019 The USMARC code or name of the 008/39, 040 # organization(s) that created # the original record, assigned diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs index 6cf37ba..74b948e 100644 --- a/etc/zebradb/marc_defs/marc21/biblios/record.abs +++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs @@ -217,25 +217,39 @@ melm 730$r Music-key melm 730$9 Koha-Auth-Number melm 730 Title,Title-uniform melm 740 Title,Title-other-variant +melm 770$w Record-control-number +melm 772$w Record-control-number melm 773$t Host-item +melm 773$w Record-control-number +melm 774$w Record-control-number +melm 775$w Record-control-number +melm 776$w Record-control-number +melm 777$w Record-control-number melm 780$t Title +melm 780$w Record-control-number melm 780 Title,Title-former,Related-periodical melm 785 Related-periodical +melm 785$w Record-control-number +melm 787$w Record-control-number melm 800$a Name-and-title #melm 800$t author,Author-title,Name-and-title,Title,Title-series melm 800$t Author-title,Name-and-title,Title,Title-series melm 800$9 Koha-Auth-Number melm 800 Author,Author-name-personal,Name,Personal-name +melm 800$w Record-control-number melm 810$a Name-and-title melm 810$t Author-title,Name-and-title,Title,Title-series +melm 810$w Record-control-number melm 810$9 Koha-Auth-Number melm 810 Author,Corporate-name,Author-name-corporate,Name melm 811$a Name-and-title melm 811$9 Koha-Auth-Number #melm 811$t author,Author-title,Name-and-title,Title,Title-series melm 811$t Author-title,Name-and-title,Title,Title-series +melm 811$w Record-control-number melm 811 Author,Author-name-corporate,Name,Conference-name +melm 830$w Record-control-number melm 830$9 Koha-Auth-Number melm 830 Title,Title-series melm 840 Title,Title-series -- 1.6.3.3 From oleonard at myacpl.org Wed Jun 2 18:55:53 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 2 Jun 2010 12:55:53 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 4504, Confirmation messages in opac account not translated Message-ID: <1275497753-20480-1-git-send-email-oleonard@myacpl.org> Strings within JavaScript onclick attributes are not getting picked up by the translator: onclick="return confirmDelete(_('Are you sure you want to cancel this hold?'));" This patch converts those to use variables defined in the main script block: onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);" --- .../prog/en/modules/opac-search-history.tmpl | 3 ++- .../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 13 +++++++------ koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl index f129925..1847017 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl @@ -4,6 +4,7 @@ /css/preferences.css" /> /css/humanmsg.css" /> @@ -48,11 +49,12 @@ -

+

+
-
PreferenceValue
+
PreferenceValue
- + @@ -36,7 +36,7 @@ - + -- 1.5.6.5 From nengard at bywatersolutions.com Tue Jun 1 01:25:01 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Mon, 31 May 2010 19:25:01 -0400 Subject: [Koha-patches] [PATCH] bug 4252 use permissions to control authorities on more menu Message-ID: <1275348301-6968-1-git-send-email-nengard@bywatersolutions.com> --- .../intranet-tmpl/prog/en/includes/header.inc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 95ce8dd..6f5093e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -22,7 +22,9 @@
  • Acquisitions
    • +
  • Authorities
    • +
  • Serials
    • -- 1.5.6.5 From nengard at bywatersolutions.com Tue Jun 1 01:40:06 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Mon, 31 May 2010 19:40:06 -0400 Subject: [Koha-patches] [PATCH] bug 4445 update OCLC text tips on preferences Message-ID: <1275349206-7068-1-git-send-email-nengard@bywatersolutions.com> --- .../admin/preferences/enhanced-content.pref | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref index 5ab6c67..cecb7a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref @@ -165,12 +165,12 @@ Enhanced Content: - - Use the OCLC affiliate ID - pref: OCLCAffiliateID - - to access the xISBN service. Note that unless you have signed up for an ID, you are limited to 500 requests per day. + - to access the xISBN service. Note that unless you have signed up for an ID, you are limited to 1000 requests per day. - - Only use the xISBN service - pref: XISBNDailyLimit class: integer - - times a day. Unless you are paying for the xISBN service, you should leave this at the default of 499 (as detailed above). + - times a day. Unless you are paying for the xISBN service, you should leave this at the default of 999 (as detailed above). Syndetics: - - pref: SyndeticsEnabled -- 1.5.6.5 From nengard at bywatersolutions.com Tue Jun 1 01:56:23 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Mon, 31 May 2010 19:56:23 -0400 Subject: [Koha-patches] [PATCH] bug 4205 remove extra 'plan by' option Message-ID: <1275350183-7117-1-git-send-email-nengard@bywatersolutions.com> There wasn't a conditional in place to stop the planning pull down from showing a blank 'plan by' option. This patch also makes the other 'plan by' options look cleaner by removing the all caps. --- .../prog/en/includes/budgets-admin-toolbar.inc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc index f0c041c..c3ec018 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc @@ -42,27 +42,28 @@ var planning_menu = [ - { text: _("Plan by MONTHS"), + { text: _("Plan by Months"), url: "/cgi-bin/koha/admin/aqplan.pl?budget_period_id=&authcat=MONTHS" , id:'disabled' }, - { text: _("Plan by BRANCHES"), + { text: _("Plan by Branches"), url: "/cgi-bin/koha/admin/aqplan.pl?budget_period_id=&authcat=BRANCHES" , id:'disabled' }, - { text: _("Plan by ITEMTYPES"), + { text: _("Plan by Item Types"), url: "/cgi-bin/koha/admin/aqplan.pl?budget_period_id=&authcat=ITEMTYPES" , id:'disabled' }, - + { text: _("Plan by "), url: "/cgi-bin/koha/admin/aqplan.pl?budget_period_id=&authcat=" , id:'disabled' }, + ] new YAHOO.widget.Button({ -- 1.5.6.5 From nengard at bywatersolutions.com Tue Jun 1 02:28:04 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Mon, 31 May 2010 20:28:04 -0400 Subject: [Koha-patches] [PATCH] bug 4131 have subscription so edit routing if one exists Message-ID: <1275352084-7236-1-git-send-email-nengard@bywatersolutions.com> --- .../prog/en/includes/serials-menu.inc | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc index 6f21f93..c3007f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc @@ -1,12 +1,11 @@ - - - \ No newline at end of file -- 1.5.6.5 From nengard at bywatersolutions.com Tue Jun 1 02:36:38 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Mon, 31 May 2010 20:36:38 -0400 Subject: [Koha-patches] [PATCH] bug 4027 fix testStatus typo to textStatus Message-ID: <1275352598-7277-1-git-send-email-nengard@bywatersolutions.com> --- .../prog/en/includes/background-job.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc index 80f79ef..9d257f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc @@ -73,7 +73,7 @@ backgroundJobProgressTimer = setInterval("updateJobProgress()", 500); }, error: function(xml, textStatus) { - alert('Failed to submit form: ' + testStatus); + alert('Failed to submit form: ' + textStatus); } }); -- 1.5.6.5 From lars at catalyst.net.nz Thu Jun 3 05:45:45 2010 From: lars at catalyst.net.nz (Lars Wirzenius) Date: Thu, 3 Jun 2010 15:45:45 +1200 Subject: [Koha-patches] [PATCH] Disable a new site created with --request-db. Message-ID: <1275536745-19750-1-git-send-email-lars@catalyst.net.nz> This way, the various cron jobs will not try to do things to it. They can't, since it is not yet really created. --- debian/scripts/koha-create | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index 33edb94..60262d4 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -227,3 +227,9 @@ then # Start Zebra. koha-start-zebra "$name" fi + + +if [ "$op" = request ] +then + koha-disable "$name" +fi -- 1.7.1 From f.demians at tamil.fr Thu Jun 3 07:41:26 2010 From: f.demians at tamil.fr (=?ISO-8859-1?Q?Fr=E9d=E9ric_DEMIANS?=) Date: Thu, 03 Jun 2010 07:41:26 +0200 Subject: [Koha-patches] [PATCH] Bug 4838 Allow to choose which authority heading to copy into biblio record In-Reply-To: <1275215688-18289-1-git-send-email-f.demians@tamil.fr> References: <1275215688-18289-1-git-send-email-f.demians@tamil.fr> Message-ID: <4C074086.3010701@tamil.fr> > This patch, with the previous one, is REQUIRED by French libraries > following > SUDOC UNIMARC format, ie all Higher Educational and Research libraries. Henri-Damien, could you confirm this assertion? I can send a screencast showing how it works and proving it doesn't modify operations for usual headings. Thanks. -- Fr?d?ric DEMIANS http://www.tamil.fr/u/fdemians.html From oleonard at myacpl.org Thu Jun 3 14:59:13 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 3 Jun 2010 08:59:13 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 4278, canceling vendor add refreshes wrong In-Reply-To: <4C06B4E9.8090902@biblibre.com> References: <1275502031-20806-1-git-send-email-oleonard@myacpl.org> <4C06B4E9.8090902@biblibre.com> Message-ID: > I am pretty sure you donot want to be sent back to acqui-home but you > rather want to be sent to the detail page of the supplier. You're quite right. I'll fix and re-submit. -- Owen -- Web Developer Athens County Public Libraries http://www.myacpl.org From oleonard at myacpl.org Thu Jun 3 17:12:50 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 3 Jun 2010 11:12:50 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 3926, inadvertantly resurrected by me. Message-ID: <1275577970-22847-1-git-send-email-oleonard@myacpl.org> The template-side fix for Bug 3926 was overwritten by another template change I submitted later. My bad. --- .../prog/en/modules/suggestion/suggestion.tmpl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index b0904a1..30350ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -131,18 +131,18 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di - - + - +
    PreferenceValue
    -- 1.7.0.4 From oleonard at myacpl.org Wed Jun 2 20:45:18 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 2 Jun 2010 14:45:18 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 3992 - New Sys Prefs Branch - Local Use Tab not Highlighted Message-ID: <1275504318-21224-1-git-send-email-oleonard@myacpl.org> --- .../intranet-tmpl/prog/en/includes/prefs-menu.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc index 238b5f8..2716ec8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc @@ -8,7 +8,7 @@
  • Creators
  • Enhanced Content
  • I18N/L10N
    • -
  • Local Use
    • +
  • Local Use
  • Logs
  • OPAC
  • Patrons
    • -- 1.7.0.4 From oleonard at myacpl.org Wed Jun 2 21:17:37 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 2 Jun 2010 15:17:37 -0400 Subject: [Koha-patches] [PATCH] More fixes for Bug 4423, Staff Client XSLT is just a copy of the OPAC one Message-ID: <1275506257-21780-1-git-send-email-oleonard@myacpl.org> - Adding material type icons from the OPAC side - Adding OPAC View link - Copying revised handling of MU from the OPAC - Removing OPAC-specific markup --- C4/XSLT.pm | 2 +- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 51 +++++++------------ koha-tmpl/intranet-tmpl/prog/img/famfamfam/BK.png | Bin 0 -> 593 bytes koha-tmpl/intranet-tmpl/prog/img/famfamfam/CF.png | Bin 0 -> 620 bytes koha-tmpl/intranet-tmpl/prog/img/famfamfam/MM.png | Bin 0 -> 760 bytes koha-tmpl/intranet-tmpl/prog/img/famfamfam/MP.png | Bin 0 -> 804 bytes koha-tmpl/intranet-tmpl/prog/img/famfamfam/MU.png | Bin 0 -> 610 bytes koha-tmpl/intranet-tmpl/prog/img/famfamfam/SE.png | Bin 0 -> 658 bytes koha-tmpl/intranet-tmpl/prog/img/famfamfam/VM.png | Bin 0 -> 653 bytes 9 files changed, 20 insertions(+), 33 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/BK.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/CF.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/MM.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/MP.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/MU.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/SE.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/VM.png diff --git a/C4/XSLT.pm b/C4/XSLT.pm index 6fd93b4..e628dc6 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -128,7 +128,7 @@ sub XSLTParse4Display { my $itemsxml = buildKohaItemsNamespace($biblionumber); my $xmlrecord = $record->as_xml(C4::Context->preference('marcflavour')); my $sysxml = "\n"; - foreach my $syspref ( qw/OPACURLOpenInNewWindow DisplayOPACiconsXSLT URLLinkText viewISBD/ ) { + foreach my $syspref ( qw/OPACURLOpenInNewWindow DisplayOPACiconsXSLT URLLinkText viewISBD OPACBaseURL/ ) { $sysxml .= "" . C4::Context->preference( $syspref ) . "\n"; diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index 7fcd66a..16785d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -16,9 +16,9 @@ - - - + + + @@ -36,7 +36,8 @@ CF MP VM - MU + MU + PR @@ -52,7 +53,9 @@ Computer File Map Visual Material - Sound + Music + Sound + Score @@ -85,6 +88,7 @@ h + fgknps @@ -154,13 +158,12 @@ - - + Type: - /opac-tmpl/prog/famfamfam/.png + /intranet-tmpl/prog/img/famfamfam/.png + - @@ -391,7 +394,6 @@ Online Resources: - @@ -411,28 +413,6 @@ - - - - - - - y3z - - - - - - - - - Click here to access online - - - - - - | @@ -571,6 +551,12 @@ + + OPAC view: + http:///cgi-bin/koha/opac-detail.pl?biblionumber=_blankOpen in new window. + + + @@ -662,4 +648,5 @@ + diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/BK.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/BK.png new file mode 100644 index 0000000000000000000000000000000000000000..b0f4dd7928cc5714e002fd2a6e8f2faac0073f00 GIT binary patch literal 593 zcmV-X0l6k>CGhc0FIuigU9U^L+D`6bSr zIEp(+L4eIgaZT(|{B!*DbrTYc1t0J9*MLJm+n zOEVloE20S^g6s|1rvjjuW1W$TV;&TbK2|slm=91)Q{X{Kg;c!Saglq7xo8`(>{A}G zw@`8gScq(adr(4@;>^%e<~7+uNMv&?8L0#%0yj~@DW&fPImKeyFHkRKuNERO3(SOB z?S)niZbFEN`0<|w+LjBKR#DU7F3d&rQGGY&Y)Fv0w002i=Jm_>x9jBX>wg3XCKK`E f>xbvJ_5i;DeEQXvyE?}U00000NkvXXu0mjfKqCEw literal 0 HcmV?d00001 diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/CF.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/CF.png new file mode 100644 index 0000000000000000000000000000000000000000..99d532e8b1750115952f97302a92d713c0486f97 GIT binary patch literal 620 zcmV-y0+aoTP)~H+MJzd|s z^YP1Hc07G_>)Lgir!F1{Qn4GcTg%?koHo<=1qRN{}nPDolOeI^o4N5I>! zU$N=L=sg~ zDx#dOA*B0N~cqPsWI(^rbbkh)DS0_H_UN0C4l_kvWIm2#Kyy6%BCh z(yIUf003&1xdx>t$*eR2ZvXxT0001Z_R$y3Iju92q*wg58};}zm(OaAH=p|y0002M zh5O5#fxp|~jc?yi at +7$`d4Q6Hl%z;WiWG??NXR{Hx%)pMd~SE0000OQI literal 0 HcmV?d00001 diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/MM.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/MM.png new file mode 100644 index 0000000000000000000000000000000000000000..1c856cd61593e944e09238a6c2cee7e10cb42c56 GIT binary patch literal 760 zcmV^u|ySI)$xo}?> za_FHfThhJj`M)!)y1Ken7-L>YP?_pt$X`6n=F1=cYufX?^1}RqJ{J3UFP&@z zECfL?sZm6*)=sM9 at pvfG($ccT7;|1yt+;54&pQ5j$#EP+q*g1XYJxR_XwSX$w3G!2 z8vst-96|&vgaZNsoZQ_szDA8;W-G4J{Ce716A*!AbK_$I;eFp<0>BspfZNc}Fj7}n zH&}UjW2aN>p_1)q;jW_`Z~sC}RT&uigd at Cv23*T7n=wUqsU zAEO$8$8UyegB1-$AM!t|C?yj;*oTW|EL?#jJ$3auL-+ at vJEf(KsTqgop6ei4H zEY=EI2UM$i0>P`>>10YEOo!2OKty at 8ZJUOcD&T+xtAv;r<;?W~3dPa{g6#)Fg1eo# zu8R?iO9bIJ?eC7zl$eLYAzvQk(Asl2#3=h?9%!wXum1F)FEJyIwUEtb at jRFLvtd?p zluawwQ6HTH4*aalAvIN#h=QjS>hGUEu&8mvykvA^t`rPj{#@u;b at 0}uB at 3EX)K94= q=1oUSfD%DjgQzmS1APn^1O5Pr0d*Bb`9~`N0000mbpQb1 at 7I~O+ue5CWtZi#AZox at gcwb{Xkx^Rf;Ty8yn6DWhJV4kC*wg94<7Vt zlteKm5+jKLV^qM1yt2HO4YZw^&a^Wfzb_m+ at y40e_0^+M6ajz$03Zl}fU=sqfA9W} z@#^~O(a%3QB{YI^J_A4y)M^1_vjjn1H`Mc5t at 6>y50A!C6seTL>`UqQ7p$DgY at K|> zQm^as;HM{#Qwj<3}(>R-AM4&+cd0t49%y2X`UaCBJg8YmB)K#uA{Z>9n zOp8>WCg#&r06`o8oz6gaIn`fY2FR)ssCr at 3rc|5f%`bIJO$zbt__PK3gH51Sff`H}0ZWac9&q~*( zO at qNscV0VSU%X#sYO9)Qx4M=(eR(m}UFhondELHSnO2hr&mMO3 zv6gmw!P2y#u0c!?LPO88NyxOTj>XWm>*77F&55fo9Z?)iynObdfA;SdwVRl$W~G3* zEGt!2+1T-%ja32&!XdoMS_mM#IQK#{6D_nvjYu`GlvO3XdE)qYJJ;7FDRfPcVFW5d%9V=z{?A#;oriL5xO+n6O2X~nf!lQuE^VWXpgu83qI(qCF{ zS}dqc=wWy-JjhR6YYDxINHb)T^nMSh)vA20R`F7)lzCSCZF94My}d73T>N+m zpyXWPL`#FF;s+j3t(LL2R!6+EP98p9G9EaJe<5S)o@#CPu0JyV*YBbiNC<>y{C`3_2 zFc^fUC0P=`0GC2D0rmxry!i<{eh#|t2UjSV*w|QyY37m5W)KQZKoA6m%^;bK|K7sb zq~^Y!1U(%y>Cs5W^^bz?JUQeR7IK)M&$43OYdMwDJVcVBtSjl_Ar8Hmr2)a$eK-tv zNC4d)(7D`Piq~gVUR7m2k$BH5O6=$i%I6Kpa_sVNy!&j)9UKPT@*VWNNNm+UIUciF wPJ00!a`S;oH}3WS at hUTDnx*^y9 at F3E2OYGed{u8eJ^%m!07*qoM6N<$f+a~A3jhEB literal 0 HcmV?d00001 diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/SE.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/SE.png new file mode 100644 index 0000000000000000000000000000000000000000..6a2ecce1b85eaa9084b427ee2c5226e2296eaeb8 GIT binary patch literal 658 zcmV;D0&V??P)oVs((xWgD$)EF}_d~6|E9cYZTvaqk~9`i&BW97*P>v z at lDk@Xl;b%^t%HQ(pa0tz at 5kM+;h(T<_N&ip(~wEOB0DiJ{F5{;c!^;_xs1dg=jRo z3WY*KAQ0euKA+ at K0;yC=8jr^rydICoSglqd_{QV$a4whY=|O=zI1-7hhr=Og4T=Ck z5O8*O_S at lbByBd^lf44TWKv2W^LH=<&(F_6aj;k{L?;9b7K?>5nM{(sFqO3)3}ZrBV at HFj%2boa`NCnylwer*m5<6vU%rtuL2L)a!Nd zJP*qIOD>n6?i;$@!fv-8Tdme9+l?I|%bm;R7`!3)<-bP$-VIIGvB6*%vHYw+%Da)t sWG at c=a1S2nbh=||dPK1BKbT#A0Qk`HN6lbD;Q#;t07*qoM6N<$f^gU==>Px# literal 0 HcmV?d00001 diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/VM.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/VM.png new file mode 100644 index 0000000000000000000000000000000000000000..b0ce7bb198a3b268bd634d2b26e9b710f3797d37 GIT binary patch literal 653 zcmV;80&@L{P)WO3(`_cf+b25 at DJ#zdQm}8GzWtq2-QnZ8W6mB^kfeK5f%S{ zUW%tGMCwrwic~ZrQcG=4f?5bkV+3dRk8hw6bk~y$KX#b!y*J4EJ~>;dRASqrSu;ZpM>?P}K~6AT zWv6Dmq?v&9LdXC(m%WCO6ma_di$R(v$@ad_>@R41N3N5lSJq9 at 6CGhX84-$%Xrd_6 z;){?{E|Ytt5$S-&Au>t4wDlIxdkfe-a22LMj``McG};r8@{GsRPm*+8fFey6C)@ifDBXVyTw(N at Xd41b45OFg6x_QA zpwLiigyy~cVoPxW^r~C7ZQpr%>1$*HKmv~AY-qJw4;gUecS--wnqslISSS=^KA&Ic n at BK|Onfz#3R%n{$a)0j^sqv5F(1NTL00000NkvXXu0mjf3S}fX literal 0 HcmV?d00001 -- 1.7.0.4 From henridamien.laurent at biblibre.com Wed Jun 2 21:45:45 2010 From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien) Date: Wed, 02 Jun 2010 21:45:45 +0200 Subject: [Koha-patches] [PATCH] Fix for Bug 4278, canceling vendor add refreshes wrong In-Reply-To: <1275502031-20806-1-git-send-email-oleonard@myacpl.org> References: <1275502031-20806-1-git-send-email-oleonard@myacpl.org> Message-ID: <4C06B4E9.8090902@biblibre.com> Le 02/06/2010 20:07, Owen Leonard a ?crit : > Updating cancel link to return to acqui-home If you are editing an existing vendor, I am pretty sure you donot want to be sent back to acqui-home but you rather want to be sent to the detail page of the supplier. So Why not "simply add" a condition "> Can you consider my proposition ? > --- > .../prog/en/modules/acqui/supplier.tmpl | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl > index e07b303..5eeb5ce 100644 > --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl > +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl > @@ -145,7 +145,7 @@ if (f.company.value == "") { > > > > -
    ">Cancel
    > +
    Cancel
    > > > From nengard at bywatersolutions.com Tue Jun 1 01:18:09 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Mon, 31 May 2010 19:18:09 -0400 Subject: [Koha-patches] [PATCH] bug 4837 make circ print page show item type description Message-ID: <1275347889-6907-1-git-send-email-nengard@bywatersolutions.com> --- .../prog/en/modules/members/moremember-print.tmpl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl index e395e3f..151c98d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl @@ -21,7 +21,7 @@
    Title AuthorFormatItem Type Date Due Charge Price
    "/>"/> + "/>">, ()
    " />"/>"/>">, ()
    " />"/>"/>">, ()
    -- 1.7.0.4 From oleonard at myacpl.org Thu Jun 3 19:37:33 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 3 Jun 2010 13:37:33 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 3722 - Branch deletion results in incorrect message Message-ID: <1275586653-23658-1-git-send-email-oleonard@myacpl.org> A fix was submitted by Nahuel on 23 Nov 2009 and pushed, but it combined messages for existing patrons and existing items. This patch defines separate messages for the various cases and corrects a typo in the original fix which left existing patrons unreported. --- admin/branches.pl | 12 ++++++++++-- .../prog/en/modules/admin/branches.tmpl | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/admin/branches.pl b/admin/branches.pl index d579490..27d374e 100755 --- a/admin/branches.pl +++ b/admin/branches.pl @@ -131,8 +131,16 @@ elsif ( $op eq 'delete' ) { $sthitems->execute( $branchcode, $branchcode ); $sthborrowers->execute( $branchcode ); my ($totalitems) = $sthitems->fetchrow_array; - my ($totalborrowers) = $sthitems->fetchrow_array; - if ($totalitems or $totalborrowers) { + my ($totalborrowers) = $sthborrowers->fetchrow_array; + if ($totalitems && !$totalborrowers) { + $template->param( else => 1 ); + default("MESSAGE10", $template); + } + elsif (!$totalitems && $totalborrowers){ + $template->param( else => 1 ); + default("MESSAGE11", $template); + } + elsif ($totalitems && $totalborrowers){ $template->param( else => 1 ); default("MESSAGE7", $template); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl index ccd147d..aaa869c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl @@ -156,9 +156,11 @@
    Library category added
    Library category modified
    Library category deleted
    -
    Library cannot be deleted because there are patrons or items using that library
    +
    Library cannot be deleted because there are patrons and items using that library
    Category cannot be deleted because there are libraries using that category
    Category cannot be added, categorycode already exists
    +
    Library cannot be deleted because there are items held by that library
    +
    Library cannot be deleted because there are patrons registered at that library
    -- 1.7.0.4 From oleonard at myacpl.org Thu Jun 3 19:54:21 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 3 Jun 2010 13:54:21 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 3770, 'Add to list' page only allows adding to private lists Message-ID: <1275587661-23863-1-git-send-email-oleonard@myacpl.org> This patch is a reformat of chad at pennmanor.net's submission to the bug report on 2010-02-16. --- virtualshelves/addbybiblionumber.pl | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl index d53a8c4..7af17c8 100755 --- a/virtualshelves/addbybiblionumber.pl +++ b/virtualshelves/addbybiblionumber.pl @@ -153,18 +153,17 @@ if ( $shelfnumber || ( $shelfnumber == -1 ) ) { # the shelf already exist. } else { # this shelf doesn't already exist. my $limit = 10; - my ($shelflist) = GetRecentShelves(1, $limit, $loggedinuser); + my ($shelflist); my @shelvesloop; my %shelvesloop; - for my $shelf ( @{ $shelflist->[0] } ) { - push( @shelvesloop, $shelf->{shelfnumber} ); - $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname}; - } - # then open shelves... - ($shelflist) = GetRecentShelves(3, $limit, undef); - for my $shelf ( @{ $shelflist->[0] } ) { - push( @shelvesloop, $shelf->{shelfnumber} ); - $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname}; + + #grab each type of shelf, open (type 3) should not be limited by user. + foreach my $shelftype (1,2,3) { + my ($shelflist) = GetRecentShelves($shelftype, $limit, $shelftype == 3 ? undef : $loggedinuser); + for my $shelf (@{ $shelflist->[0] }) { + push(@shelvesloop, $shelf->{shelfnumber}); + $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname}; + } } if(@shelvesloop gt 0){ -- 1.7.0.4 From gmcharlt at gmail.com Fri Jun 4 02:31:15 2010 From: gmcharlt at gmail.com (Galen Charlton) Date: Thu, 3 Jun 2010 20:31:15 -0400 Subject: [Koha-patches] [PATCH] bug 4252 use permissions to control authorities on more menu In-Reply-To: <1275348301-6968-1-git-send-email-nengard@bywatersolutions.com> References: <1275348301-6968-1-git-send-email-nengard@bywatersolutions.com> Message-ID: Hi, On Mon, May 31, 2010 at 7:25 PM, Nicole Engard wrote: > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? This is the wrong permission; it should be CAN_user_editauthorities. Please fix and resubmit. Regards, Galen -- Galen Charlton gmcharlt at gmail.com From nengard at bywatersolutions.com Tue Jun 1 14:48:38 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Tue, 1 Jun 2010 08:48:38 -0400 Subject: [Koha-patches] [PATCH] bug 4252 add authorites permission to menus Message-ID: <1275396518-9096-1-git-send-email-nengard@bywatersolutions.com> Added to more menu and to the main intranet page --- .../intranet-tmpl/prog/en/includes/header.inc | 2 + .../prog/en/modules/intranet-main.tmpl | 28 +++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 95ce8dd..4a81e97 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -22,7 +22,9 @@
  • Acquisitions
    • +
  • Authorities
    • +
  • Serials
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl index 420d7e1..368ad00 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl @@ -58,21 +58,35 @@

    Cataloging

    • Add MARC Record
      • + + +

      Cataloging

      +

      Serials

      -

      Acquisitions

      -

      Reports

      + +

      Acquisitions

      + + +

      Reports

      + -

      Koha administration

      - +

      Koha administration

      + + + +

      Tools

      -

      Tools

      About Koha

      -- 1.5.6.5 From gmcharlt at gmail.com Fri Jun 4 03:49:59 2010 From: gmcharlt at gmail.com (Galen Charlton) Date: Thu, 3 Jun 2010 21:49:59 -0400 Subject: [Koha-patches] [PATCH] fixes to edit_items granular permission Message-ID: <1275616199-16288-1-git-send-email-gmcharlt@gmail.com> * cataloging toolbar now properly handles case where staff user has permission to edit items but not bibs * fixed wrong permission introduced in the bib details page that prevented circulation users from being able to change item statuses, which is the very point of that page. A possible future direction is to introduce another permission for the benefit of circulation staff who need to be able to change item statues, e.g., a circulate/change_item_status. Signed-off-by: Galen Charlton --- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 17 +++++++++++++++++ .../prog/en/modules/catalogue/moredetail.tmpl | 2 +- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index eda7985..3dfceac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -75,12 +75,19 @@ function confirm_items_deletion() { // YUI Toolbar Functions function yuiToolbar() { + var newmenu = [ {text: _("New Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl" }, {text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=#additema" }, {text: _("New Subscription"), url: "/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription="}, ]; + + var newmenu = [ + {text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=#additema" } + ]; + + var editmenu = [ { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&frameworkcode=&op=" }, { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=" }, @@ -89,6 +96,12 @@ function confirm_items_deletion() { { text: _("Delete Record"), onclick: {fn: confirm_deletion },id:'disabled' }, { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion } } ]; + + var editmenu = [ + { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=" }, + { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion } } + ]; + var savemenu = [ { text: _("MODS (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=" }, @@ -170,6 +183,10 @@ function confirm_items_deletion() {
    • ">Edit Items
    • &frameworkcode=&op=duplicate">Duplicate Record
    • ">Delete
      • + + +
    • ">New Item
      • +
    • ">Edit Items
    • ">Add to shelf
    • ">Print
      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl index 8577193..93a46a5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl @@ -167,7 +167,7 @@
    • Previous Borrower: "> 
    • Paid for?:  
    • Public Note: - +
      " /> " />" /> -- 1.7.0 From lars at catalyst.net.nz Fri Jun 4 04:52:44 2010 From: lars at catalyst.net.nz (Lars Wirzenius) Date: Fri, 4 Jun 2010 14:52:44 +1200 Subject: [Koha-patches] [PATCH] Remove dependencies on perl-base. Message-ID: <1275619964-9918-1-git-send-email-lars@catalyst.net.nz> perl-base is a required package, so it is always installed on a Debian system, and Debian packages should not depend on it, unless they need it a specific version, and I don't think we do. --- debian/control | 3 +-- debian/list-deps | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index a808675..5f107ba 100644 --- a/debian/control +++ b/debian/control @@ -53,7 +53,7 @@ Build-Depends: libalgorithm-checkdigits-perl, libpdf-reuse-perl, libpdf-table-perl, libpoe-perl, - libscalar-list-utils-perl | perl-base, + libscalar-list-utils-perl, libschedule-at-perl, libsms-send-perl, libtest-harness-perl | perl-modules, @@ -74,7 +74,6 @@ Build-Depends: libalgorithm-checkdigits-perl, libyaml-perl, libyaml-syck-perl, perl, - perl-base, perl-modules, debhelper (>= 7.0.50), gettext, python, python-debian diff --git a/debian/list-deps b/debian/list-deps index e30c54a..41003b8 100755 --- a/debian/list-deps +++ b/debian/list-deps @@ -33,7 +33,16 @@ foreach my $module (keys %$deps) { $subpath =~ s,::,/,g; my $output = qx(apt-file -l -x search "$prefix/$subpath.pm\$"); - my @lines = split(/\n/, $output); + my @temp = split(/\n/, $output); + my @lines = (); + # Remove packages that are required/essential and always installed on + # a Debian system. Debian packages should not have unversioned + # dependencies on such packages. + foreach my $line (@temp) { + if ($line ne "perl-base") { + @lines = (@lines, $line); + } + } if (scalar(@lines) == 1 && $lines[0] ne "") { my $pkg = $lines[0]; print "$pkg\n"; @@ -43,6 +52,17 @@ foreach my $module (keys %$deps) { print "$pkg"; } print "\n"; + } elsif (scalar(@temp) != 0) { + # I'm an Essential and I'm OK, + # I install all night, and work all day. + # I chomp up strings. I eat my bugs. + # I go to the base install. + # On Fridays I go drinking, + # and have buttered commits for git. + # (Beer O'Clock is more than two hours + # away. I don't even drink beer. There + # is no reason to be suspicious of this + # commit.) } else { print "EEEK: unknown package for $module\n"; } -- 1.7.1 From gmcharlt at gmail.com Fri Jun 4 05:08:50 2010 From: gmcharlt at gmail.com (Galen Charlton) Date: Thu, 3 Jun 2010 23:08:50 -0400 Subject: [Koha-patches] [PATCH] Remove dependencies on perl-base. In-Reply-To: <1275619964-9918-1-git-send-email-lars@catalyst.net.nz> References: <1275619964-9918-1-git-send-email-lars@catalyst.net.nz> Message-ID: Hi, On Thu, Jun 3, 2010 at 10:52 PM, Lars Wirzenius wrote: > + ? ?} elsif (scalar(@temp) != 0) { > + ? ? ? ?# I'm an Essential and I'm OK, > + ? ? ? ?# I install all night, and work all day. > + ? ? ? ?# I chomp up strings. I eat my bugs. > + ? ? ? ?# I go to the base install. > + ? ? ? ?# On Fridays I go drinking, > + ? ? ? ?# and have buttered commits for git. > + ? ? ? ?# (Beer O'Clock is more than two hours > + ? ? ? ?# away. I don't even drink beer. There > + ? ? ? ?# is no reason to be suspicious of this > + ? ? ? ?# commit.) Are you absolutely sure I shouldn't be suspicious of this commit? I'm feeling paranoid all of a sudden. ;) Regards, Galen -- Galen Charlton gmcharlt at gmail.com From nahuel.angelinetti at biblibre.com Fri Jun 4 11:06:59 2010 From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI) Date: Fri, 4 Jun 2010 11:06:59 +0200 Subject: [Koha-patches] [PATCH] [followup](MT3160) fix previous patch for non checked variable Message-ID: <1275642419-8299-1-git-send-email-nahuel.angelinetti@biblibre.com> This add a if to check if the variable exists --- C4/Overdues.pm | 2 +- .../prog/en/modules/cataloguing/addbiblio.tmpl | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/C4/Overdues.pm b/C4/Overdues.pm index 79e5151..d9bd420 100644 --- a/C4/Overdues.pm +++ b/C4/Overdues.pm @@ -199,7 +199,7 @@ sub GetOverduesByBorrowers{ surname, firstname, title, - CONCAT(borrowers.address, '\n', borrowers.address2) as address, + CONCAT(borrowers.streetnumber, ' ', borrowers.address, '\n', borrowers.address2) as address, city, zipcode, email, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl index 6321e5e..e13e07a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -454,12 +454,14 @@ function CloneSubfield(index){ // Changing the "..." link's onclick attribute for plugin callback var links = clone.getElementsByTagName('a'); var link = links[0]; - var buttonDotOnClick = link.getAttribute('onclick'); - if(buttonDotOnClick.match('Clictag')){ // -1- It s a plugin - var re = /\('.*'\)/i; - buttonDotOnClick = buttonDotOnClick.replace(re,"('"+linkid+"')"); - if(buttonDotOnClick){ - link.setAttribute('onclick',buttonDotOnClick); + if ( link ) { + var buttonDotOnClick = link.getAttribute('onclick'); + if(buttonDotOnClick.match('Clictag')){ // -1- It s a plugin + var re = /\('.*'\)/i; + buttonDotOnClick = buttonDotOnClick.replace(re,"('"+linkid+"')"); + if(buttonDotOnClick){ + link.setAttribute('onclick',buttonDotOnClick); + } } } -- 1.7.0.4 From nengard at bywatersolutions.com Tue Jun 1 18:52:55 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Tue, 1 Jun 2010 12:52:55 -0400 Subject: [Koha-patches] [PATCH] bug 2434 remove upcoming messaging option from db Message-ID: <1275411175-9829-1-git-send-email-nengard@bywatersolutions.com> This message was never implemented and so it shouldn't be in the database as it causes confusion for patrons and librarians a like. --- .../optional/sample_notices_message_attributes.sql | 1 - .../sample_notices_message_attributes.sql | 1 - installer/data/mysql/updatedatabase.pl | 8 ++++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql index 5d1ecb6..1834063 100644 --- a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql +++ b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql @@ -3,7 +3,6 @@ insert into `message_attributes` values (1, 'Item DUE', 0), (2, 'Advance Notice', 1), -(3, 'Upcoming Events', 1), (4, 'Hold Filled', 0), (5, 'Item Check-in', 0), (6, 'Item Checkout', 0); diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql index 5d1ecb6..1834063 100644 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql +++ b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql @@ -3,7 +3,6 @@ insert into `message_attributes` values (1, 'Item DUE', 0), (2, 'Advance Notice', 1), -(3, 'Upcoming Events', 1), (4, 'Hold Filled', 0), (5, 'Item Check-in', 0), (6, 'Item Checkout', 0); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 1d90656..1b66e15 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3624,6 +3624,14 @@ INSERT INTO permissions (module_bit, code, description) VALUES SetVersion ($DBversion); } +$DBversion = 'XXX'; +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ + $dbh->do(qq{ +Delete from message_attributes where message_attribute_id=3;}); + print "Upgrade to $DBversion done Remove upcoming events messaging option (bug 2434)"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) -- 1.5.6.5 From oleonard at myacpl.org Fri Jun 4 16:53:20 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 4 Jun 2010 10:53:20 -0400 Subject: [Koha-patches] [PATCH] Followup fix for Bug 4453: Removing invalid template fragment. Message-ID: <1275663200-28169-1-git-send-email-oleonard@myacpl.org> --- .../prog/en/modules/tools/batchMod-del.tmpl | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl index 47ea42c..c6f82b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl @@ -138,10 +138,6 @@ - -

      No items found

      - -

      item(s) deleted.

      -- 1.7.0.4 From f.demians at tamil.fr Fri Jun 4 17:04:18 2010 From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=) Date: Fri, 4 Jun 2010 17:04:18 +0200 Subject: [Koha-patches] [PATCH] Bug 2789 Fix UNIMAC leader plugin Message-ID: <1275663858-3739-1-git-send-email-f.demians@tamil.fr> The plugin was returning a 25 characters length leader rather than 24 characters. So leader was recreated automatically, removing user update, before writing biblio record. --- .../cataloguing/value_builder/unimarc_leader.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl index b75cb1f..b267614 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl @@ -298,7 +298,7 @@ function report() { field.value = ' '+document.f_pop.f5.value + document.f_pop.f6.value+ document.f_pop.f7.value+ document.f_pop.f8.value+ ' '+ - document.f_pop.f17.value+ document.f_pop.f18.value+' 450 '; + document.f_pop.f17.value+ document.f_pop.f18.value+' 4500'; window.close(); return false; } -- 1.7.1 From oleonard at myacpl.org Fri Jun 4 18:49:19 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 4 Jun 2010 12:49:19 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 4278, canceling vendor add refreshes wrong Message-ID: <1275670159-29507-1-git-send-email-oleonard@myacpl.org> Patch corrected to follow HDL's suggestion that link check for existing vendor id and conditionally redirect based on that. --- .../prog/en/modules/acqui/supplier.tmpl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl index e07b303..83b8631 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl @@ -145,7 +145,9 @@ if (f.company.value == "") { -
      ">Cancel
      +
      + "> + Cancel
      -- 1.7.0.4 From Katrin.Fischer.83 at web.de Fri Jun 4 22:17:16 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Fri, 04 Jun 2010 22:17:16 +0200 Subject: [Koha-patches] Bug 3682: change message_attributes.message_name from varchar(20) to varchar(40) Message-ID: <4C095F4C.8070604@web.de> From bf82c3e3ed9fcb5e145fca53a7f9812db6b780f2 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 4 Jun 2010 22:06:52 +0200 Subject: [PATCH] Bug 3682: change message_attributes.message_name from varchar(20) to varchar(40) Content-Type: text/plain; charset="utf-8" --- installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ kohaversion.pl | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index db5b372..f09ff11 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2130,7 +2130,7 @@ CREATE TABLE `message_transport_types` ( DROP TABLE IF EXISTS `message_attributes`; CREATE TABLE `message_attributes` ( `message_attribute_id` int(11) NOT NULL auto_increment, - `message_name` varchar(20) NOT NULL default '', + `message_name` varchar(40) NOT NULL default '', `takes_days` tinyint(1) NOT NULL default '0', PRIMARY KEY (`message_attribute_id`), UNIQUE KEY `message_name` (`message_name`) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 1d90656..6865de2 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3624,6 +3624,13 @@ INSERT INTO permissions (module_bit, code, description) VALUES SetVersion ($DBversion); } +$DBversion = '3.01.00.XXX'; +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ + $dbh->do("ALTER TABLE message_attributes CHANGE message_name message_name varchar(40);"); + print "Upgrade to $DBversion done (bug 3682: change message_name from varchar(20) to varchar(40))\n"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) diff --git a/kohaversion.pl b/kohaversion.pl index 3fa5030..ce483ee 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -10,7 +10,7 @@ use strict; sub kohaversion { - our $VERSION = '3.01.00.136'; + our $VERSION = '3.01.00.XXX'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install -- 1.6.3.3 From gcollum at gmail.com Sat Jun 5 04:20:55 2010 From: gcollum at gmail.com (Garry Collum) Date: Fri, 4 Jun 2010 22:20:55 -0400 Subject: [Koha-patches] [PATCH] Bug 4223: Divides the information on the Serials Subscription detail page into tabs. Message-ID: <1275704455-3091-1-git-send-email-gcollum@gmail.com> --- .../en/modules/serials/subscription-detail.tmpl | 158 +++++++++++--------- 1 files changed, 86 insertions(+), 72 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl index 86c3efc..17cee63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl @@ -34,6 +34,9 @@ function popup(subscriptionid) { newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes'); } +$(document).ready(function() { + $("#subscription_description").tabs(); +}); --> @@ -75,6 +78,89 @@ function popup(subscriptionid) { +
    + + + + + + + + + + + + + + +
    Issue numberPlanned datePublished dateStatus
    + + + + + + + + Expected + + + Arrived + + + Late + + + Missing + + + Not Available + + + Claimed + + + + +
    + + +
    +

    Subscription summary

    + + + + + + + + + + + + + + + + + + + + + +
    +
    + +

    Subscription information

    @@ -285,78 +371,6 @@ function popup(subscriptionid) {
    -
    -

    Serial issues

    - - - - - - - - - - - - - - - -
    Issue numberPlanned datePublished dateStatus
    - - - - - - - - Expected - - - Arrived - - - Late - - - Missing - - - Not Available - - - Claimed - - - - -
    -
    -
    -

    Subscription summary

    - - - - - - - - - - - - - - - - - - - - - -
    -
    -- 1.5.6.5 From andrew.elwell at gmail.com Sat Jun 5 13:16:51 2010 From: andrew.elwell at gmail.com (Andrew Elwell) Date: Sat, 5 Jun 2010 13:16:51 +0200 Subject: [Koha-patches] [PATCH] The start of some POD cleanups in C4/*.pm Message-ID: <1275736611-9177-1-git-send-email-Andrew.Elwell@gmail.com> If these are acceptable I'll continue - target is to get rid of all warnings and errors with podcheck and make sure that any man and html formatted pod docs look 'OK' --- C4/Acquisition.pm | 292 ++++++++++++------------------------------------- C4/AuthoritiesMarc.pm | 126 ++++++---------------- C4/Koha.pm | 170 +++++++++++++---------------- 3 files changed, 180 insertions(+), 408 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index c0ac40e..fc99f7d 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -128,16 +128,11 @@ orders, basket and parcels. =head3 GetBasket -=over 4 - -$aqbasket = &GetBasket($basketnumber); + $aqbasket = &GetBasket($basketnumber); get all basket informations in aqbasket for a given basket -return : -informations for a given basket returned as a hashref. - -=back +B informations for a given basket returned as a hashref. =cut @@ -162,15 +157,12 @@ sub GetBasket { =head3 NewBasket -=over 4 - -$basket = &NewBasket( $booksellerid, $authorizedby, $basketname, $basketnote, $basketbooksellernote, $basketcontractnumber ); - -=back + $basket = &NewBasket( $booksellerid, $authorizedby, $basketname, + $basketnote, $basketbooksellernote, $basketcontractnumber ); Create a new basket in aqbasket table -=over 2 +=over =item C<$booksellerid> is a foreign key in the aqbasket table @@ -204,14 +196,10 @@ sub NewBasket { =head3 CloseBasket -=over 4 - -&CloseBasket($basketno); + &CloseBasket($basketno); close a basket (becomes unmodifiable,except for recieves) -=back - =cut sub CloseBasket { @@ -230,15 +218,12 @@ sub CloseBasket { =head3 GetBasketAsCSV -=over 4 - -&GetBasketAsCSV($basketno); + &GetBasketAsCSV($basketno); Export a basket as CSV -=back - =cut + sub GetBasketAsCSV { my ($basketno) = @_; my $basket = GetBasket($basketno); @@ -290,14 +275,10 @@ sub GetBasketAsCSV { =head3 CloseBasketgroup -=over 4 - -&CloseBasketgroup($basketgroupno); + &CloseBasketgroup($basketgroupno); close a basketgroup -=back - =cut sub CloseBasketgroup { @@ -315,14 +296,10 @@ sub CloseBasketgroup { =head3 ReOpenBaskergroup($basketgroupno) -=over 4 - -&ReOpenBaskergroup($basketgroupno); + &ReOpenBaskergroup($basketgroupno); reopen a basketgroup -=back - =cut sub ReOpenBasketgroup { @@ -341,21 +318,18 @@ sub ReOpenBasketgroup { =head3 DelBasket -=over 4 - -&DelBasket($basketno); + &DelBasket($basketno); Deletes the basket that has basketno field $basketno in the aqbasket table. -=over 2 +=over =item C<$basketno> is the primary key of the basket in the aqbasket table. =back -=back - =cut + sub DelBasket { my ( $basketno ) = @_; my $query = "DELETE FROM aqbasket WHERE basketno=?"; @@ -369,21 +343,18 @@ sub DelBasket { =head3 ModBasket -=over 4 - -&ModBasket($basketinfo); + &ModBasket($basketinfo); Modifies a basket, using a hashref $basketinfo for the relevant information, only $basketinfo->{'basketno'} is required. -=over 2 +=over =item C<$basketno> is the primary key of the basket in the aqbasket table. =back -=back - =cut + sub ModBasket { my $basketinfo = shift; my $query = "UPDATE aqbasket SET "; @@ -412,13 +383,11 @@ sub ModBasket { =head3 ModBasketHeader -=over 4 - -&ModBasketHeader($basketno, $basketname, $note, $booksellernote, $contractnumber); + &ModBasketHeader($basketno, $basketname, $note, $booksellernote, $contractnumber); Modifies a basket's header. -=over 2 +=over =item C<$basketno> is the "basketno" field in the "aqbasket" table; @@ -432,9 +401,8 @@ Modifies a basket's header. =back -=back - =cut + sub ModBasketHeader { my ($basketno, $basketname, $note, $booksellernote, $contractnumber) = @_; my $query = "UPDATE aqbasket SET basketname=?, note=?, booksellernote=? WHERE basketno=?"; @@ -454,24 +422,20 @@ sub ModBasketHeader { =head3 GetBasketsByBookseller -=over 4 - - at results = &GetBasketsByBookseller($booksellerid, $extra); + @results = &GetBasketsByBookseller($booksellerid, $extra); Returns a list of hashes of all the baskets that belong to bookseller 'booksellerid'. -=over 2 +=over =item C<$booksellerid> is the 'id' field of the bookseller in the aqbooksellers table =item C<$extra> is the extra sql parameters, can be -- $extra->{groupby}: group baskets by column + $extra->{groupby}: group baskets by column ex. $extra->{groupby} = aqbasket.basketgroupid -- $extra->{orderby}: order baskets by column -- $extra->{limit}: limit number of results (can be helpful for pagination) - -=back + $extra->{orderby}: order baskets by column + $extra->{limit}: limit number of results (can be helpful for pagination) =back @@ -503,18 +467,10 @@ sub GetBasketsByBookseller { =head3 GetBasketsByBasketgroup -=over 4 - -$baskets = &GetBasketsByBasketgroup($basketgroupid); - -=over 2 + $baskets = &GetBasketsByBasketgroup($basketgroupid); Returns a reference to all baskets that belong to basketgroup $basketgroupid. -=back - -=back - =cut sub GetBasketsByBasketgroup { @@ -533,11 +489,7 @@ sub GetBasketsByBasketgroup { =head3 NewBasketgroup -=over 4 - -$basketgroupid = NewBasketgroup(\%hashref); - -=over 2 + $basketgroupid = NewBasketgroup(\%hashref); Adds a basketgroup to the aqbasketgroups table, and add the initial baskets to it. @@ -553,10 +505,6 @@ $hashref->{'deliverycomment'} is the 'deliverycomment' field of the basketgroup $hashref->{'closed'} is the 'closed' field of the aqbasketgroups table, it is false if 0, true otherwise. -=back - -=back - =cut sub NewBasketgroup { @@ -594,11 +542,7 @@ sub NewBasketgroup { =head3 ModBasketgroup -=over 4 - -ModBasketgroup(\%hashref); - -=over 2 + ModBasketgroup(\%hashref); Modifies a basketgroup in the aqbasketgroups table, and add the baskets to it. @@ -616,10 +560,6 @@ $hashref->{'deliverycomment'} is the 'deliverycomment' field of the basketgroup $hashref->{'closed'} is the 'closed' field of the aqbasketgroups table, it is false if 0, true otherwise. -=back - -=back - =cut sub ModBasketgroup { @@ -658,15 +598,11 @@ sub ModBasketgroup { =head3 DelBasketgroup -=over 4 - -DelBasketgroup($basketgroupid); - -=back + DelBasketgroup($basketgroupid); Deletes a basketgroup in the aqbasketgroups table, and removes the reference to it from the baskets, -=over 2 +=over =item C<$basketgroupid> is the 'id' field of the basket in the aqbasketgroup table @@ -689,26 +625,12 @@ sub DelBasketgroup { =head2 FUNCTIONS ABOUT ORDERS -=over 2 - -=cut - -=back - =head3 GetBasketgroup -=over 4 - -$basketgroup = &GetBasketgroup($basketgroupid); - -=over 2 + $basketgroup = &GetBasketgroup($basketgroupid); Returns a reference to the hash containing all infermation about the basketgroup. -=back - -=back - =cut sub GetBasketgroup { @@ -727,18 +649,10 @@ sub GetBasketgroup { =head3 GetBasketgroups -=over 4 - -$basketgroups = &GetBasketgroups($booksellerid); - -=over 2 + $basketgroups = &GetBasketgroups($booksellerid); Returns a reference to the array of all the basketgroups of bookseller $booksellerid. -=back - -=back - =cut sub GetBasketgroups { @@ -763,9 +677,7 @@ sub GetBasketgroups { =head3 GetPendingOrders -=over 4 - -$orders = &GetPendingOrders($booksellerid, $grouped, $owner); + $orders = &GetPendingOrders($booksellerid, $grouped, $owner); Finds pending orders from the bookseller with the given ID. Ignores completed and cancelled orders. @@ -779,7 +691,7 @@ reference-to-hash with the following fields: C<$grouped> is a boolean that, if set to 1 will group all order lines of the same basket in a single result line -=over 2 +=over =item C @@ -787,12 +699,10 @@ in a single result line =item C -These give the value of the corresponding field in the aqorders table -of the Koha database. - =back -=back +These give the value of the corresponding field in the aqorders table +of the Koha database. Results are ordered from most to least recent. @@ -847,9 +757,7 @@ sub GetPendingOrders { =head3 GetOrders -=over 4 - - at orders = &GetOrders($basketnumber, $orderby); + @orders = &GetOrders($basketnumber, $orderby); Looks up the pending (non-cancelled) orders with the given basket number. If C<$booksellerID> is non-empty, only orders from that seller @@ -860,8 +768,6 @@ C<&basket> returns a two-element array. C<@orders> is an array of references-to-hash, whose keys are the fields from the aqorders, biblio, and biblioitems tables in the Koha database. -=back - =cut sub GetOrders { @@ -893,23 +799,20 @@ sub GetOrders { =head3 GetOrderNumber -=over 4 - -$ordernumber = &GetOrderNumber($biblioitemnumber, $biblionumber); - -=back + $ordernumber = &GetOrderNumber($biblioitemnumber, $biblionumber); Looks up the ordernumber with the given biblionumber and biblioitemnumber. Returns the number of this order. -=over 4 +=over =item C<$ordernumber> is the order number. =back =cut + sub GetOrderNumber { my ( $biblionumber,$biblioitemnumber ) = @_; my $dbh = C4::Context->dbh; @@ -929,17 +832,13 @@ sub GetOrderNumber { =head3 GetOrder -=over 4 - -$order = &GetOrder($ordernumber); + $order = &GetOrder($ordernumber); Looks up an order by order number. Returns a reference-to-hash describing the order. The keys of C<$order> are fields from the biblio, biblioitems, aqorders tables of the Koha database. -=back - =cut sub GetOrder { @@ -964,19 +863,16 @@ sub GetOrder { =head3 NewOrder -=over 4 - -&NewOrder(\%hashref); + &NewOrder(\%hashref); Adds a new order to the database. Any argument that isn't described below is the new value of the field with the same name in the aqorders table of the Koha database. -=over 4 +=over =item $hashref->{'basketno'} is the basketno foreign key in aqorders, it is mandatory - =item $hashref->{'ordernumber'} is a "minimum order number." =item $hashref->{'budgetdate'} is effectively ignored. @@ -993,8 +889,6 @@ The following keys are used: "biblionumber", "title", "basketno", "quantity", "n =back -=back - =cut sub NewOrder { @@ -1029,12 +923,7 @@ sub NewOrder { =head3 NewOrderItem -=over 4 - -&NewOrderItem(); - - -=back + &NewOrderItem(); =cut @@ -1055,19 +944,12 @@ sub NewOrderItem { =head3 ModOrder -=over 4 - -&ModOrder(\%hashref); - -=over 2 + &ModOrder(\%hashref); Modifies an existing order. Updates the order with order number -$hashref->{'ordernumber'} and biblionumber $hashref->{'biblionumber'}. All other keys of the hash -update the fields with the same name in the aqorders table of the Koha database. - -=back - -=back +$hashref->{'ordernumber'} and biblionumber $hashref->{'biblionumber'}. All +other keys of the hash update the fields with the same name in the aqorders +table of the Koha database. =cut @@ -1106,18 +988,15 @@ sub ModOrder { =head3 ModOrderItem -=over 4 - -&ModOrderItem(\%hashref); - -=over 2 + &ModOrderItem(\%hashref); Modifies the itemnumber in the aqorders_items table. The input hash needs three entities: -- itemnumber: the old itemnumber -- ordernumber: the order this item is attached to -- newitemnumber: the new itemnumber we want to attach the line to -=back +=over + +=item - itemnumber: the old itemnumber +=item - ordernumber: the order this item is attached to +=item - newitemnumber: the new itemnumber we want to attach the line to =back @@ -1145,15 +1024,11 @@ sub ModOrderItem { =head3 ModOrderBibliotemNumber -=over 4 - -&ModOrderBiblioitemNumber($biblioitemnumber,$ordernumber, $biblionumber); + &ModOrderBiblioitemNumber($biblioitemnumber,$ordernumber, $biblionumber); Modifies the biblioitemnumber for an existing order. Updates the order with order number C<$ordernum> and biblionumber C<$biblionumber>. -=back - =cut #FIXME: is this used at all? @@ -1173,9 +1048,7 @@ sub ModOrderBiblioitemNumber { =head3 ModReceiveOrder -=over 4 - -&ModReceiveOrder($biblionumber, $ordernumber, $quantityreceived, $user, + &ModReceiveOrder($biblionumber, $ordernumber, $quantityreceived, $user, $unitprice, $booksellerinvoicenumber, $biblioitemnumber, $freight, $bookfund, $rrp); @@ -1189,8 +1062,6 @@ portion must have a booksellerinvoicenumber. Updates the order with bibilionumber C<$biblionumber> and ordernumber C<$ordernumber>. -=back - =cut @@ -1331,16 +1202,12 @@ sub SearchOrder { =head3 DelOrder -=over 4 - -&DelOrder($biblionumber, $ordernumber); + &DelOrder($biblionumber, $ordernumber); Cancel the order with the given order and biblio numbers. It does not delete any entries in the aqorders table, it merely marks them as cancelled. -=back - =cut sub DelOrder { @@ -1364,9 +1231,7 @@ sub DelOrder { =head3 GetParcel -=over 4 - - at results = &GetParcel($booksellerid, $code, $date); + @results = &GetParcel($booksellerid, $code, $date); Looks up all of the received items from the supplier with the given bookseller ID at the given date, for the given code (bookseller Invoice number). Ignores cancelled and completed orders. @@ -1376,8 +1241,6 @@ the aqorders, biblio, and biblioitems tables of the Koha database. C<@results> is sorted alphabetically by book title. -=back - =cut sub GetParcel { @@ -1437,16 +1300,13 @@ sub GetParcel { =head3 GetParcels -=over 4 + $results = &GetParcels($bookseller, $order, $code, $datefrom, $dateto); -$results = &GetParcels($bookseller, $order, $code, $datefrom, $dateto); get a lists of parcels. -=back - * Input arg : -=over 4 +=over =item $bookseller is the bookseller this function has to get parcels. @@ -1460,9 +1320,13 @@ is the booksellerinvoicenumber. =item $datefrom & $dateto to know on what date this function has to filter its search. +=back + * return: a pointer on a hash list containing parcel informations as such : +=over + =item Creation date =item Last operation @@ -1523,17 +1387,13 @@ sub GetParcels { =head3 GetLateOrders -=over 4 - - at results = &GetLateOrders; + @results = &GetLateOrders; Searches for bookseller with late orders. return: the table of supplier with late issues. This table is full of hashref. -=back - =cut sub GetLateOrders { @@ -1625,9 +1485,7 @@ sub GetLateOrders { =head3 GetHistory -=over 4 - -(\@order_loop, $total_qty, $total_price, $total_qtyreceived) = GetHistory( $title, $author, $name, $from_placed_on, $to_placed_on ); + (\@order_loop, $total_qty, $total_price, $total_qtyreceived) = GetHistory( $title, $author, $name, $from_placed_on, $to_placed_on ); Retreives some acquisition history information @@ -1653,8 +1511,6 @@ returns: $total_price is the cost of each in $order_loop times the quantity $total_qtyreceived is the sum of all of the quantityreceived entries in $order_loop -=back - =cut sub GetHistory { @@ -1751,7 +1607,7 @@ sub GetHistory { =head2 GetRecentAcqui -$results = GetRecentAcqui($days); + $results = GetRecentAcqui($days); C<$results> is a ref to a table which containts hashref @@ -1774,17 +1630,13 @@ sub GetRecentAcqui { =head3 GetContracts -=over 4 - -$contractlist = &GetContracts($booksellerid, $activeonly); - -=back + $contractlist = &GetContracts($booksellerid, $activeonly); Looks up the contracts that belong to a bookseller Returns a list of contracts -=over 2 +=over =item C<$booksellerid> is the "id" field in the "aqbooksellers" table. @@ -1793,6 +1645,7 @@ Returns a list of contracts =back =cut + sub GetContracts { my ( $booksellerid, $activeonly ) = @_; my $dbh = C4::Context->dbh; @@ -1823,17 +1676,14 @@ sub GetContracts { =head3 GetContract -=over 4 - -$contract = &GetContract($contractID); + $contract = &GetContract($contractID); Looks up the contract that has PRIMKEY (contractnumber) value $contractID Returns a contract -=back - =cut + sub GetContract { my ( $contractno ) = @_; my $dbh = C4::Context->dbh; diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index 5de02c4..f276987 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -64,18 +64,20 @@ BEGIN { ); } + +=head1 NAME + +C4::AuthoritiesMarc + =head2 GetAuthMARCFromKohaField -=over 4 + ( $tag, $subfield ) = &GetAuthMARCFromKohaField ($kohafield,$authtypecode); -( $tag, $subfield ) = &GetAuthMARCFromKohaField ($kohafield,$authtypecode); returns tag and subfield linked to kohafield Comment : Suppose Kohafield is only linked to ONE subfield -=back - =cut sub GetAuthMARCFromKohaField { @@ -94,13 +96,11 @@ sub GetAuthMARCFromKohaField { =head2 SearchAuthorities -=over 4 + (\@finalresult, $nbresults)= &SearchAuthorities($tags, $and_or, + $excluding, $operator, $value, $offset,$length,$authtypecode,$sortby) -(\@finalresult, $nbresults)= &SearchAuthorities($tags, $and_or, $excluding, $operator, $value, $offset,$length,$authtypecode,$sortby) returns ref to array result and count of results returned -=back - =cut sub SearchAuthorities { @@ -344,13 +344,10 @@ sub SearchAuthorities { =head2 CountUsage -=over 4 + $count= &CountUsage($authid) -$count= &CountUsage($authid) counts Usage of Authid in bibliorecords. -=back - =cut sub CountUsage { @@ -371,13 +368,10 @@ sub CountUsage { =head2 CountUsageChildren -=over 4 + $count= &CountUsageChildren($authid) -$count= &CountUsageChildren($authid) counts Usage of narrower terms of Authid in bibliorecords. -=back - =cut sub CountUsageChildren { @@ -386,13 +380,10 @@ sub CountUsageChildren { =head2 GetAuthTypeCode -=over 4 + $authtypecode= &GetAuthTypeCode($authid) -$authtypecode= &GetAuthTypeCode($authid) returns authtypecode of an authid -=back - =cut sub GetAuthTypeCode { @@ -407,11 +398,7 @@ sub GetAuthTypeCode { =head2 GuessAuthTypeCode -=over 4 - -my $authtypecode = GuessAuthTypeCode($record); - -=back + my $authtypecode = GuessAuthTypeCode($record); Get the record and tries to guess the adequate authtypecode from its content. @@ -486,11 +473,7 @@ my $heading_fields = { =head2 GuessAuthId -=over 4 - -my $authtid = GuessAuthId($record); - -=back + my $authtid = GuessAuthId($record); Get the record and tries to guess the adequate authtypecode from its content. @@ -508,14 +491,16 @@ sub GuessAuthId { =head2 GetTagsLabels -=over 4 + $tagslabel= &GetTagsLabels($forlibrarian,$authtypecode) -$tagslabel= &GetTagsLabels($forlibrarian,$authtypecode) returns a ref to hashref of authorities tag and subfield structure. tagslabel usage : -$tagslabel->{$tag}->{$subfield}->{'attribute'} + + $tagslabel->{$tag}->{$subfield}->{'attribute'} + where attribute takes values in : + lib tab mandatory @@ -529,8 +514,6 @@ where attribute takes values in : isurl link -=back - =cut sub GetTagsLabels { @@ -605,14 +588,10 @@ ORDER BY tagfield,tagsubfield" =head2 AddAuthority -=over 4 - -$authid= &AddAuthority($record, $authid,$authtypecode) -returns authid of the newly created authority + $authid= &AddAuthority($record, $authid,$authtypecode) Either Create Or Modify existing authority. - -=back +returns authid of the newly created authority =cut @@ -722,16 +701,12 @@ sub AddAuthority { =head2 DelAuthority -=over 4 + $authid= &DelAuthority($authid) -$authid= &DelAuthority($authid) Deletes $authid -=back - =cut - sub DelAuthority { my ($authid) = @_; my $dbh=C4::Context->dbh; @@ -771,13 +746,10 @@ sub ModAuthority { =head2 GetAuthorityXML -=over 4 + $marcxml= &GetAuthorityXML( $authid) -$marcxml= &GetAuthorityXML( $authid) returns xml form of record $authid -=back - =cut sub GetAuthorityXML { @@ -804,13 +776,10 @@ sub GetAuthorityXML { =head2 GetAuthority -=over 4 + $record= &GetAuthority( $authid) -$record= &GetAuthority( $authid) Returns MARC::Record of the authority passed in parameter. -=back - =cut sub GetAuthority { @@ -832,11 +801,7 @@ sub GetAuthority { =head2 GetAuthType -=over 4 - -$result = &GetAuthType($authtypecode) - -=back + $result = &GetAuthType($authtypecode) If the authority type specified by C<$authtypecode> exists, returns a hashref of the type's fields. If the type @@ -909,15 +874,12 @@ sub AUTHhtml2marc { =head2 FindDuplicateAuthority -=over 4 + $record= &FindDuplicateAuthority( $record, $authtypecode) -$record= &FindDuplicateAuthority( $record, $authtypecode) return $authid,Summary if duplicate is found. Comments : an improvement would be to return All the records that match. -=back - =cut sub FindDuplicateAuthority { @@ -951,17 +913,14 @@ sub FindDuplicateAuthority { =head2 BuildSummary -=over 4 + $text= &BuildSummary( $record, $authid, $authtypecode) -$text= &BuildSummary( $record, $authid, $authtypecode) return HTML encoded Summary Comment : authtypecode can be infered from both record and authid. Moreover, authid can also be inferred from $record. Would it be interesting to delete those things. -=back - =cut sub BuildSummary{ @@ -1133,17 +1092,14 @@ sub BuildSummary{ =head2 BuildUnimarcHierarchies -=over 4 + $text= &BuildUnimarcHierarchies( $authid, $force) -$text= &BuildUnimarcHierarchies( $authid, $force) return text containing trees for hierarchies for them to be stored in auth_header Example of text: 122,1314,2452;1324,2342,3,2452 -=back - =cut sub BuildUnimarcHierarchies{ @@ -1192,9 +1148,8 @@ sub BuildUnimarcHierarchies{ =head2 BuildUnimarcHierarchy -=over 4 + $ref= &BuildUnimarcHierarchy( $record, $class,$authid) -$ref= &BuildUnimarcHierarchy( $record, $class,$authid) return a hashref in order to display hierarchy for record and final Authid $authid "loopparents" @@ -1208,8 +1163,6 @@ return a hashref in order to display hierarchy for record and final Authid $auth "ifchildren" Those two latest ones should disappear soon. -=back - =cut sub BuildUnimarcHierarchy{ @@ -1244,13 +1197,10 @@ sub BuildUnimarcHierarchy{ =head2 GetHeaderAuthority -=over 4 + $ref= &GetHeaderAuthority( $authid) -$ref= &GetHeaderAuthority( $authid) return a hashref in order auth_header table data -=back - =cut sub GetHeaderAuthority{ @@ -1265,13 +1215,10 @@ sub GetHeaderAuthority{ =head2 AddAuthorityTrees -=over 4 + $ref= &AddAuthorityTrees( $authid, $trees) -$ref= &AddAuthorityTrees( $authid, $trees) return success or failure -=back - =cut sub AddAuthorityTrees{ @@ -1285,16 +1232,11 @@ sub AddAuthorityTrees{ =head2 merge -=over 4 - -$ref= &merge(mergefrom,$MARCfrom,$mergeto,$MARCto) - + $ref= &merge(mergefrom,$MARCfrom,$mergeto,$MARCto) Could add some feature : Migrating from a typecode to an other for instance. Then we should add some new parameter : bibliotargettag, authtargettag -=back - =cut sub merge { @@ -1465,11 +1407,7 @@ sub merge { =head2 get_auth_type_location -=over 4 - -my ($tag, $subfield) = get_auth_type_location($auth_type_code); - -=back + my ($tag, $subfield) = get_auth_type_location($auth_type_code); Get the tag and subfield used to store the heading type for indexing purposes. The C<$auth_type> parameter is diff --git a/C4/Koha.pm b/C4/Koha.pm index 11c7850..cb93034 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -71,16 +71,15 @@ memoize('GetAuthorisedValues'); =head1 NAME - C4::Koha - Perl Module containing convenience functions for Koha scripts +C4::Koha - Perl Module containing convenience functions for Koha scripts =head1 SYNOPSIS - use C4::Koha; - +use C4::Koha; =head1 DESCRIPTION - Koha.pm provides many functions for Koha scripts. +Koha.pm provides many functions for Koha scripts. =head1 FUNCTIONS @@ -90,8 +89,8 @@ memoize('GetAuthorisedValues'); $slash_date = &slashifyDate($dash_date); - Takes a string of the form "DD-MM-YYYY" (or anything separated by - dashes), converts it to the form "YYYY/MM/DD", and returns the result. +Takes a string of the form "DD-MM-YYYY" (or anything separated by +dashes), converts it to the form "YYYY/MM/DD", and returns the result. =cut @@ -106,7 +105,7 @@ sub slashifyDate { =head2 DisplayISBN - my $string = DisplayISBN( $isbn ); + my $string = DisplayISBN( $isbn ); =cut @@ -220,7 +219,6 @@ sub subfield_is_koha_internal_p ($) { Returns a string with the name of the itemtype. - =cut sub GetSupportName{ @@ -396,21 +394,21 @@ build a HTML select with the following code : =head3 in PERL SCRIPT -my $authtypes = getauthtypes; -my @authtypesloop; -foreach my $thisauthtype (keys %$authtypes) { - my $selected = 1 if $thisauthtype eq $authtype; - my %row =(value => $thisauthtype, + my $authtypes = getauthtypes; + my @authtypesloop; + foreach my $thisauthtype (keys %$authtypes) { + my $selected = 1 if $thisauthtype eq $authtype; + my %row =(value => $thisauthtype, selected => $selected, authtypetext => $authtypes->{$thisauthtype}->{'authtypetext'}, ); - push @authtypesloop, \%row; -} -$template->param(itemtypeloop => \@itemtypesloop); + push @authtypesloop, \%row; + } + $template->param(itemtypeloop => \@itemtypesloop); =head3 in TEMPLATE -
    + "> -
    + =cut @@ -458,21 +456,21 @@ build a HTML select with the following code : =head3 in PERL SCRIPT -my $frameworks = frameworks(); -my @frameworkloop; -foreach my $thisframework (keys %$frameworks) { + my $frameworks = frameworks(); + my @frameworkloop; + foreach my $thisframework (keys %$frameworks) { my $selected = 1 if $thisframework eq $frameworkcode; my %row =(value => $thisframework, selected => $selected, description => $frameworks->{$thisframework}->{'frameworktext'}, ); push @frameworksloop, \%row; -} -$template->param(frameworkloop => \@frameworksloop); + } + $template->param(frameworkloop => \@frameworksloop); =head3 in TEMPLATE -
    + "> -
    - + =cut @@ -539,18 +536,12 @@ sub getitemtypeinfo { =head2 getitemtypeimagedir -=over - -=item 4 - my $directory = getitemtypeimagedir( 'opac' ); pass in 'opac' or 'intranet'. Defaults to 'opac'. returns the full path to the appropriate directory containing images. -=back - =cut sub getitemtypeimagedir { @@ -585,17 +576,16 @@ sub getitemtypeimagelocation($$) { =head3 _getImagesFromDirectory - Find all of the image files in a directory in the filesystem +Find all of the image files in a directory in the filesystem - parameters: - a directory name +parameters: a directory name - returns: a list of images in that directory. +returns: a list of images in that directory. - Notes: this does not traverse into subdirectories. See - _getSubdirectoryNames for help with that. - Images are assumed to be files with .gif or .png file extensions. - The image names returned do not have the directory name on them. +Notes: this does not traverse into subdirectories. See +_getSubdirectoryNames for help with that. +Images are assumed to be files with .gif or .png file extensions. +The image names returned do not have the directory name on them. =cut @@ -616,17 +606,15 @@ sub _getImagesFromDirectory { =head3 _getSubdirectoryNames - Find all of the directories in a directory in the filesystem +Find all of the directories in a directory in the filesystem - parameters: - a directory name +parameters: a directory name - returns: a list of subdirectories in that directory. +returns: a list of subdirectories in that directory. - Notes: this does not traverse into subdirectories. Only the first - level of subdirectories are returned. - The directory names returned don't have the parent directory name - on them. +Notes: this does not traverse into subdirectories. Only the first +level of subdirectories are returned. +The directory names returned don't have the parent directory name on them. =cut @@ -647,18 +635,20 @@ sub _getSubdirectoryNames { =head3 getImageSets - returns: a listref of hashrefs. Each hash represents another collection of images. - { imagesetname => 'npl', # the name of the image set (npl is the original one) - images => listref of image hashrefs - } - - each image is represented by a hashref like this: - { KohaImage => 'npl/image.gif', - StaffImageUrl => '/intranet-tmpl/prog/img/itemtypeimg/npl/image.gif', - OpacImageURL => '/opac-tmpl/prog/itemtypeimg/npl/image.gif' - checked => 0 or 1: was this the image passed to this method? - Note: I'd like to remove this somehow. - } +returns: a listref of hashrefs. Each hash represents another collection of images. + + { imagesetname => 'npl', # the name of the image set (npl is the original one) + images => listref of image hashrefs + } + +each image is represented by a hashref like this: + + { KohaImage => 'npl/image.gif', + StaffImageUrl => '/intranet-tmpl/prog/img/itemtypeimg/npl/image.gif', + OpacImageURL => '/opac-tmpl/prog/itemtypeimg/npl/image.gif' + checked => 0 or 1: was this the image passed to this method? + Note: I'd like to remove this somehow. + } =cut @@ -722,7 +712,7 @@ sub GetPrinters { =head2 GetPrinter -$printer = GetPrinter( $query, $printers ); + $printer = GetPrinter( $query, $printers ); =cut @@ -978,15 +968,9 @@ SELECT lib, =head2 displayServers -=over 4 - -my $servers = displayServers(); - -my $servers = displayServers( $position ); - -my $servers = displayServers( $position, $type ); - -=back + my $servers = displayServers(); + my $servers = displayServers( $position ); + my $servers = displayServers( $position, $type ); displayServers returns a listref of hashrefs, each containing information about available z3950 servers. Each hashref has a format @@ -1004,7 +988,6 @@ like: 'zed' => 1, }, - =cut sub displayServers { @@ -1052,7 +1035,7 @@ sub displayServers { =head2 GetAuthValCode -$authvalcode = GetAuthValCode($kohafield,$frameworkcode); + $authvalcode = GetAuthValCode($kohafield,$frameworkcode); =cut @@ -1068,7 +1051,7 @@ sub GetAuthValCode { =head2 GetAuthValCodeFromField -$authvalcode = GetAuthValCodeFromField($field,$subfield,$frameworkcode); + $authvalcode = GetAuthValCodeFromField($field,$subfield,$frameworkcode); C<$subfield> can be undefined @@ -1092,7 +1075,7 @@ sub GetAuthValCodeFromField { =head2 GetAuthorisedValues -$authvalues = GetAuthorisedValues([$category], [$selected]); + $authvalues = GetAuthorisedValues([$category], [$selected]); This function returns all authorised values from the'authorised_value' table in a reference to array of hashrefs. @@ -1126,7 +1109,7 @@ sub GetAuthorisedValues { =head2 GetAuthorisedValueCategories -$auth_categories = GetAuthorisedValueCategories(); + $auth_categories = GetAuthorisedValueCategories(); Return an arrayref of all of the available authorised value categories. @@ -1145,12 +1128,14 @@ sub GetAuthorisedValueCategories { } =head2 GetKohaAuthorisedValues - - Takes $kohafield, $fwcode as parameters. - If $opac parameter is set to a true value, displays OPAC descriptions rather than normal ones when they exist. - Returns hashref of Code => description - Returns undef - if no authorised value category is defined for the kohafield. + +Takes $kohafield, $fwcode as parameters. + +If $opac parameter is set to a true value, displays OPAC descriptions rather than normal ones when they exist. + +Returns hashref of Code => description + +Returns undef if no authorised value category is defined for the kohafield. =cut @@ -1173,13 +1158,15 @@ sub GetKohaAuthorisedValues { } =head2 GetKohaAuthorisedValuesFromField - - Takes $field, $subfield $fwcode as parameters. - If $opac parameter is set to a true value, displays OPAC descriptions rather than normal ones when they exist. - $subfield can be undefined - Returns hashref of Code => description - Returns undef - if no authorised value category is defined for the given field and subfield + +Takes $field, $subfield, $fwcode as parameters. + +If $opac parameter is set to a true value, displays OPAC descriptions rather than normal ones when they exist. +$subfield can be undefined + +Returns hashref of Code => description + +Returns undef if no authorised value category is defined for the given field and subfield =cut @@ -1203,12 +1190,9 @@ sub GetKohaAuthorisedValuesFromField { =head2 display_marc_indicators -=over 4 - -# field is a MARC::Field object -my $display_form = C4::Koha::display_marc_indicators($field); + my $display_form = C4::Koha::display_marc_indicators($field); -=back +C<$field> is a MARC::Field object Generate a display form of the indicators of a variable MARC field, replacing any blanks with '#'. -- 1.7.0.4 From nengard at gmail.com Sat Jun 5 17:10:45 2010 From: nengard at gmail.com (Nicole Engard) Date: Sat, 5 Jun 2010 11:10:45 -0400 Subject: [Koha-patches] [PATCH] bug 2434 remove upcoming messaging option from db In-Reply-To: <1275411175-9829-1-git-send-email-nengard@bywatersolutions.com> References: <1275411175-9829-1-git-send-email-nengard@bywatersolutions.com> Message-ID: Please ignore this patch and instead use the one I'm about to send since it is more inclusive. Nicole On Tue, Jun 1, 2010 at 12:52 PM, Nicole Engard wrote: > This message was never implemented and so it shouldn't > be in the database as it causes confusion for patrons > and librarians a like. > --- > ?.../optional/sample_notices_message_attributes.sql | ? ?1 - > ?.../sample_notices_message_attributes.sql ? ? ? ? ?| ? ?1 - > ?installer/data/mysql/updatedatabase.pl ? ? ? ? ? ? | ? ?8 ++++++++ > ?3 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql > index 5d1ecb6..1834063 100644 > --- a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql > +++ b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql > @@ -3,7 +3,6 @@ insert into `message_attributes` > ?values > ?(1, 'Item DUE', 0), > ?(2, 'Advance Notice', 1), > -(3, 'Upcoming Events', 1), > ?(4, 'Hold Filled', 0), > ?(5, 'Item Check-in', 0), > ?(6, 'Item Checkout', 0); > diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql > index 5d1ecb6..1834063 100644 > --- a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql > +++ b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql > @@ -3,7 +3,6 @@ insert into `message_attributes` > ?values > ?(1, 'Item DUE', 0), > ?(2, 'Advance Notice', 1), > -(3, 'Upcoming Events', 1), > ?(4, 'Hold Filled', 0), > ?(5, 'Item Check-in', 0), > ?(6, 'Item Checkout', 0); > diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl > index 1d90656..1b66e15 100755 > --- a/installer/data/mysql/updatedatabase.pl > +++ b/installer/data/mysql/updatedatabase.pl > @@ -3624,6 +3624,14 @@ INSERT INTO permissions (module_bit, code, description) VALUES > ? ? SetVersion ($DBversion); > ?} > > +$DBversion = 'XXX'; > +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ > + ? ?$dbh->do(qq{ > +Delete from message_attributes where message_attribute_id=3;}); > + ? ?print "Upgrade to $DBversion done Remove upcoming events messaging option (bug 2434)"; > + ? ?SetVersion ($DBversion); > +} > + > > ?=item DropAllForeignKeys($table) > > -- > 1.5.6.5 > > _______________________________________________ > Koha-patches mailing list > Koha-patches at lists.koha-community.org > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches > From nengard at bywatersolutions.com Wed Jun 2 13:58:07 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Wed, 2 Jun 2010 07:58:07 -0400 Subject: [Koha-patches] [PATCH] bug 2434 remove upcoming events messages Message-ID: <1275479887-12291-1-git-send-email-nengard@bywatersolutions.com> this patch removed the template for the upcoming events message and the upcoming events message from the options for enhanced messages because this messaging preference has not been implemented --- .../data/mysql/en/mandatory/sample_notices.sql | 4 +--- .../optional/sample_notices_message_attributes.sql | 1 - .../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 1 - .../sample_notices_message_attributes.sql | 1 - installer/data/mysql/updatedatabase.pl | 8 ++++++++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql index 66947f2..64e2564 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.sql +++ b/installer/data/mysql/en/mandatory/sample_notices.sql @@ -5,10 +5,8 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> <> <>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser: <>\r\nPassword: <>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <> <>,\r\n\r\nThe following item is now due:\r\n\r\n<>, <> (<>)'), ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due'), -('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)' -), +('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)'), ('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), -('circulation','EVENT','Upcoming Library Event','Upcoming Library Event','Dear <> <>,\r\n\r\nThis is a reminder of an upcoming library event in which you have expressed interest.'), ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>\r\n<> <>'), ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<>\r\n<>\r\n<>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <>\r\n<>\r\n<> <>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <> <>\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\n'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), diff --git a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql index 5d1ecb6..1834063 100644 --- a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql +++ b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql @@ -3,7 +3,6 @@ insert into `message_attributes` values (1, 'Item DUE', 0), (2, 'Advance Notice', 1), -(3, 'Upcoming Events', 1), (4, 'Hold Filled', 0), (5, 'Item Check-in', 0), (6, 'Item Checkout', 0); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql index 023df9b..80f3ea3 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql @@ -9,7 +9,6 @@ VALUES ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due'), ('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)'), ('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), -('circulation','EVENT','Upcoming Library Event','Upcoming Library Event','Dear <> <>,\r\n\r\nThis is a reminder of an upcoming library event in which you have expressed interest.'), ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>'), ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<>\r\n<>\r\n<>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <>\r\n<>\r\n<> <>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <> <>\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\n'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql index 5d1ecb6..1834063 100644 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql +++ b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql @@ -3,7 +3,6 @@ insert into `message_attributes` values (1, 'Item DUE', 0), (2, 'Advance Notice', 1), -(3, 'Upcoming Events', 1), (4, 'Hold Filled', 0), (5, 'Item Check-in', 0), (6, 'Item Checkout', 0); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 1d90656..4787d3e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3624,6 +3624,14 @@ INSERT INTO permissions (module_bit, code, description) VALUES SetVersion ($DBversion); } +$DBversion = 'XXX'; +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ + $dbh->do(qq{DELETE FROM message_attributes WHERE message_attribute_id=3;}); + $dbh->do(qq{DELETE FROM letter WHERE code='EVENT' AND title='Upcoming Library Event';}); + print "Upgrade to $DBversion done Remove upcoming events messaging option (bug 2434)"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) -- 1.5.6.5 From nengard at bywatersolutions.com Sat Jun 5 17:26:31 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Sat, 5 Jun 2010 11:26:31 -0400 Subject: [Koha-patches] [PATCH] bug 2434 remove upcoming events messages In-Reply-To: <1275479887-12291-1-git-send-email-nengard@bywatersolutions.com> References: <1275479887-12291-1-git-send-email-nengard@bywatersolutions.com> Message-ID: So sorry - I didn't update all of the languages, so this patch should also be ignored - the final corrected one is on its way ... sorry again! ---------------------------------------------- Nicole C. Engard Director of Open Source Education ByWater Solutions nengard at bywatersolutions.com http://bywatersolutions.com See us at ALA : BOOTH # 817 On Wed, Jun 2, 2010 at 7:58 AM, Nicole Engard wrote: > this patch removed the template for the upcoming events > message and the upcoming events message from the options > for enhanced messages because this messaging preference > has not been implemented > --- > ?.../data/mysql/en/mandatory/sample_notices.sql ? ? | ? ?4 +--- > ?.../optional/sample_notices_message_attributes.sql | ? ?1 - > ?.../mysql/fr-FR/1-Obligatoire/sample_notices.sql ? | ? ?1 - > ?.../sample_notices_message_attributes.sql ? ? ? ? ?| ? ?1 - > ?installer/data/mysql/updatedatabase.pl ? ? ? ? ? ? | ? ?8 ++++++++ > ?5 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql > index 66947f2..64e2564 100644 > --- a/installer/data/mysql/en/mandatory/sample_notices.sql > +++ b/installer/data/mysql/en/mandatory/sample_notices.sql > @@ -5,10 +5,8 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear < ?('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <> <> <>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser: ?<>\r\nPassword: <>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), > ?('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <> <>,\r\n\r\nThe following item is now due:\r\n\r\n<>, <> (<>)'), > ?('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due'), > -('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)' > -), > +('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)'), > ?('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), > -('circulation','EVENT','Upcoming Library Event','Upcoming Library Event','Dear <> <>,\r\n\r\nThis is a reminder of an upcoming library event in which you have expressed interest.'), > ?('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>\r\n<> <>'), > ?('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<>\r\n<>\r\n<>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <>\r\n<>\r\n<> <>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <> <>\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\n'), > ?('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), > diff --git a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql > index 5d1ecb6..1834063 100644 > --- a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql > +++ b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql > @@ -3,7 +3,6 @@ insert into `message_attributes` > ?values > ?(1, 'Item DUE', 0), > ?(2, 'Advance Notice', 1), > -(3, 'Upcoming Events', 1), > ?(4, 'Hold Filled', 0), > ?(5, 'Item Check-in', 0), > ?(6, 'Item Checkout', 0); > diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql > index 023df9b..80f3ea3 100644 > --- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql > +++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql > @@ -9,7 +9,6 @@ VALUES > ?('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due'), > ?('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)'), > ?('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), > -('circulation','EVENT','Upcoming Library Event','Upcoming Library Event','Dear <> <>,\r\n\r\nThis is a reminder of an upcoming library event in which you have expressed interest.'), > ?('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>'), > ?('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<>\r\n<>\r\n<>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <>\r\n<>\r\n<> <>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <> <>\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\n'), > ?('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), > diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql > index 5d1ecb6..1834063 100644 > --- a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql > +++ b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql > @@ -3,7 +3,6 @@ insert into `message_attributes` > ?values > ?(1, 'Item DUE', 0), > ?(2, 'Advance Notice', 1), > -(3, 'Upcoming Events', 1), > ?(4, 'Hold Filled', 0), > ?(5, 'Item Check-in', 0), > ?(6, 'Item Checkout', 0); > diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl > index 1d90656..4787d3e 100755 > --- a/installer/data/mysql/updatedatabase.pl > +++ b/installer/data/mysql/updatedatabase.pl > @@ -3624,6 +3624,14 @@ INSERT INTO permissions (module_bit, code, description) VALUES > ? ? SetVersion ($DBversion); > ?} > > +$DBversion = 'XXX'; > +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ > + ? ?$dbh->do(qq{DELETE FROM message_attributes WHERE message_attribute_id=3;}); > + ? ?$dbh->do(qq{DELETE FROM letter WHERE code='EVENT' AND title='Upcoming Library Event';}); > + ? ?print "Upgrade to $DBversion done Remove upcoming events messaging option (bug 2434)"; > + ? ?SetVersion ($DBversion); > +} > + > > ?=item DropAllForeignKeys($table) > > -- > 1.5.6.5 > > From nengard at bywatersolutions.com Sat Jun 5 17:36:05 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Sat, 5 Jun 2010 11:36:05 -0400 Subject: [Koha-patches] [PATCH] bug 2434 remove upcoming events for all languages Message-ID: From nengard at bywatersolutions.com Wed Jun 2 14:19:08 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Wed, 2 Jun 2010 08:19:08 -0400 Subject: [PATCH] bug 2434 remove upcoming events for all languages Message-ID: this patch removed the upcoming events messaging option and the upcoming event message from the system for all languages since it was never implemented and confuses librarians and patrons alike --- .../data/mysql/de-DE/mandatory/sample_notices.sql | 1 - .../optional/sample_notices_message_attributes.sql | 1 - .../data/mysql/en/mandatory/sample_notices.sql | 4 +--- .../optional/sample_notices_message_attributes.sql | 1 - .../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 1 - .../sample_notices_message_attributes.sql | 1 - .../data/mysql/pl-PL/mandatory/sample_notices.sql | 10 +++++----- .../optional/sample_notices_message_attributes.sql | 3 +-- .../data/mysql/ru-RU/mandatory/sample_notices.sql | 6 ++---- .../data/mysql/ru-RU/optional/sample_notices.sql | 4 +--- .../optional/sample_notices_message_attributes.sql | 3 +-- .../data/mysql/uk-UA/mandatory/sample_notices.sql | 6 ++---- .../data/mysql/uk-UA/optional/sample_notices.sql | 4 +--- .../optional/sample_notices_message_attributes.sql | 3 +-- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 15 files changed, 23 insertions(+), 33 deletions(-) diff --git a/installer/data/mysql/de-DE/mandatory/sample_notices.sql b/installer/data/mysql/de-DE/mandatory/sample_notices.sql index e044477..a724a7a 100644 --- a/installer/data/mysql/de-DE/mandatory/sample_notices.sql +++ b/installer/data/mysql/de-DE/mandatory/sample_notices.sql @@ -7,7 +7,6 @@ VALUES ('circulation','ODUE','Mahnung','Mahnung','Liebe/r < ('circulation','DUEDGST','F=C3=A4lligkeitsbenachrichtigung (Zusammenfassung)','F=C3=A4lligkeitsbenachrichtigung','Sie haben <> =C3=BCberf=C3=A4llige Medien.'), ('circulation','PREDUE','Erinnerungsbenachrichtigung','Erinnerungsbenachri= chtigung','Liebe/r <> <>,\r\n\r\nFolgende Ausleihe wird bald f=C3=A4llig:\r\n\r\n<>, <> (<>)'), ('circulation','PREDUEDGST','Erinnerungsbenachrichtigung (Zusammenfassung)','Erinnerungsbenachrichtigung','Sie haben <> Ausleihen, die bald f=C3=A4llig werden.'), -('circulation','EVENT','Veranstaltungshinweis','Veranstaltungshinweis','Li= ebe/r <> <>,\r\n\r\nDies ist eine Erinnerung an die Veranstaltung, f=C3=BCr die Sie sich interessiert hatten.'), ('reserves', 'HOLD', 'Vormerkbenachrichtigung', 'Vormerkung abholbereit in <>', 'Liebe/r <> <>,\r\n\r\nF=C3=BCr Sie liegt seit <> eine Vormerkung zur Abholung bereit:\r\n\r\nTitel: <>\r\nVerfasser: <>\r\nExemplar: <>\r\nStandort: <>\r\n<>\r\n<>\r\n<>\r\n<> <>'), ('reserves', 'HOLD_PRINT', 'Vormerkbenachrichtigung (gedruckte Benachrichtigung)', 'Vormerkung abholbereit (gedruckte Benachrichtigung)', '<>\r\n<>\r\n<>\r\n\r\n\r\n=C3=84nderung angefra\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <>\r\n<>\r\n<> <>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <> <>\r\n\r\nF=C3=BCr Sie liegt seit dem <> eine Vormerkung zur Abholung bereit:\r\n\r\nTitel: <>\r\nVerfasser: <>\r\nExemplar: <>\r\n'), ('circulation','CHECKIN','R=C3=BCckgabequittung (Zusammenfassung)','R=C3=BCckgabequittung','Die folgenden Medien wurden zur=C3=BCckgegeben:\r\n----\r\n<>\r\n----\r\nVielen Dank.'), diff --git a/installer/data/mysql/de-DE/optional/sample_notices_message_att= ributes.sql b/installer/data/mysql/de-DE/optional/sample_notices_message_attributes.sql index f38630d..a1eb0e8 100644 --- a/installer/data/mysql/de-DE/optional/sample_notices_message_attributes= .sql +++ b/installer/data/mysql/de-DE/optional/sample_notices_message_attributes= .sql @@ -3,7 +3,6 @@ values (1, 'F=C3=A4lligkeitsbenachrichtigung', 0), (2, 'Erinnerungsbenachrichtigung', 1), -(3, 'Veranstaltungshinweise', 1), (4, 'Vormerkbenachrichtigung', 0), (5, 'R=C3=BCckgabequittung', 0), (6, 'Ausleihquittung', 0); diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql index 66947f2..64e2564 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.sql +++ b/installer/data/mysql/en/mandatory/sample_notices.sql @@ -5,10 +5,8 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> <> <>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser: <>\r\nPassword: <>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <> <>,\r\n\r\nThe following item is now due:\r\n\r\n<>, <> (<>)'), ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due'), -('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)' -), +('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)'), ('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), -('circulation','EVENT','Upcoming Library Event','Upcoming Library Event','Dear <> <>,\r\n\r\nThis is a reminder of an upcoming library event in which you have expressed interest.'), ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>\r\n<> <>'), ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<>\r\n<>\r\n<>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <>\r\n<>\r\n<> <>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <> <>\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\n'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), diff --git a/installer/data/mysql/en/optional/sample_notices_message_attrib= utes.sql b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql index 5d1ecb6..1834063 100644 --- a/installer/data/mysql/en/optional/sample_notices_message_attributes.sq= l +++ b/installer/data/mysql/en/optional/sample_notices_message_attributes.sq= l @@ -3,7 +3,6 @@ insert into `message_attributes` values (1, 'Item DUE', 0), (2, 'Advance Notice', 1), -(3, 'Upcoming Events', 1), (4, 'Hold Filled', 0), (5, 'Item Check-in', 0), (6, 'Item Checkout', 0); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql index 023df9b..80f3ea3 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql @@ -9,7 +9,6 @@ VALUES ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due'), ('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)'), ('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), -('circulation','EVENT','Upcoming Library Event','Upcoming Library Event','Dear <> <>,\r\n\r\nThis is a reminder of an upcoming library event in which you have expressed interest.'), ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>'), ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<>\r\n<>\r\n<>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <>\r\n<>\r\n<> <>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <> <>\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\n'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_a= ttributes.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.s= ql index 5d1ecb6..1834063 100644 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attribut= es.sql +++ b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attribut= es.sql @@ -3,7 +3,6 @@ insert into `message_attributes` values (1, 'Item DUE', 0), (2, 'Advance Notice', 1), -(3, 'Upcoming Events', 1), (4, 'Hold Filled', 0), (5, 'Item Check-in', 0), (6, 'Item Checkout', 0); diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql index 66947f2..07cfb3c 100644 --- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql +++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql @@ -1,14 +1,14 @@ -INSERT INTO `letter` (module, code, name, title, content) -VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> <>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<>\n<= >\n<> <>\nPhone: <>\nFax: <>\nEmail: <>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n"<>" by <>, <>, Barcode: <> Fine: GBP\n\nThank-you for your prompt attention to this matter.\n\n<> Staff\n'), +=EF=BB=BFINSERT INTO `letter` (module, code, name, title, content) +VALUES +('circulation','ODUE','Overdue Notice', +'Item Overdue','Dear <> <>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<>\n<>\n<> <>\nPhone: <>\nFax: <>\nEmail: <>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n"<>" by <>, <>, Barcode: <> Fine: GBP\n\nThank-you for your prompt attention to this matter.\n\n<> Staff\n'), ('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nOrdernumber <> (<>) (<> ordered) ($<> each) has not been received.'), ('serial','RLIST','Routing List','Serial is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.'), ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <> <> <>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser: <>\r\nPassword: <>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <> <>,\r\n\r\nThe following item is now due:\r\n\r\n<>, <> (<>)'), ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due'), -('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)' -), +('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)'), ('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), -('circulation','EVENT','Upcoming Library Event','Upcoming Library Event','Dear <> <>,\r\n\r\nThis is a reminder of an upcoming library event in which you have expressed interest.'), ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>\r\n<> <>'), ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<>\r\n<>\r\n<>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <>\r\n<>\r\n<> <>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <> <>\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\n'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), diff --git a/installer/data/mysql/pl-PL/optional/sample_notices_message_att= ributes.sql b/installer/data/mysql/pl-PL/optional/sample_notices_message_attributes.sql index 5d1ecb6..d2d97aa 100644 --- a/installer/data/mysql/pl-PL/optional/sample_notices_message_attributes= .sql +++ b/installer/data/mysql/pl-PL/optional/sample_notices_message_attributes= .sql @@ -1,9 +1,8 @@ -insert into `message_attributes` +=EF=BB=BFinsert into `message_attributes` (`message_attribute_id`, message_name, `takes_days`) values (1, 'Item DUE', 0), (2, 'Advance Notice', 1), -(3, 'Upcoming Events', 1), (4, 'Hold Filled', 0), (5, 'Item Check-in', 0), (6, 'Item Checkout', 0); diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql index 66947f2..0777f85 100644 --- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql +++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql @@ -1,14 +1,12 @@ -INSERT INTO `letter` (module, code, name, title, content) +=EF=BB=BFINSERT INTO `letter` (module, code, name, title, content) VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> <>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<>\n<= >\n<> <>\nPhone: <>\nFax: <>\nEmail: <>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n"<>" by <>, <>, Barcode: <> Fine: GBP\n\nThank-you for your prompt attention to this matter.\n\n<> Staff\n'), ('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nOrdernumber <> (<>) (<> ordered) ($<> each) has not been received.'), ('serial','RLIST','Routing List','Serial is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.'), ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <> <> <>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser: <>\r\nPassword: <>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <> <>,\r\n\r\nThe following item is now due:\r\n\r\n<>, <> (<>)'), ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due'), -('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)' -), +('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)'), ('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), -('circulation','EVENT','Upcoming Library Event','Upcoming Library Event','Dear <> <>,\r\n\r\nThis is a reminder of an upcoming library event in which you have expressed interest.'), ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>\r\n<> <>'), ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<>\r\n<>\r\n<>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <>\r\n<>\r\n<> <>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <> <>\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\n'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), diff --git a/installer/data/mysql/ru-RU/optional/sample_notices.sql b/installer/data/mysql/ru-RU/optional/sample_notices.sql index f06e303..7be800a 100644 --- a/installer/data/mysql/ru-RU/optional/sample_notices.sql +++ b/installer/data/mysql/ru-RU/optional/sample_notices.sql @@ -1,4 +1,4 @@ -truncate letter; +=EF=BB=BFtruncate letter; INSERT INTO `letter` (module, code, name, title, content) @@ -19,8 +19,6 @@ VALUES ('circulation','PREDUEDGST','=D0=9F=D1=80=D0=B5=D0=B4=D0=B2=D0=B0=D1=80=D0= =B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5 =D1=83=D0=B2=D0=B5=D0=B4=D0= =BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5 =D0=BE =D0=B7=D0=B0=D0=B4=D0=BE=D0=BB=D0=B6=D0=B5=D0=BD=D0=BD=D0=BE=D1=81=D1=82=D0= =B8 =D0=B5=D0=B4=D0=B8=D0=BD=D0=B8=D1=86=D1=8B (=D1=81=D0=B1=D0=BE=D1=80=D0= =BD=D0=B8=D0=BA)','=D0=9F=D1=80=D0=B5=D0=B4=D0=B2=D0=B0=D1=80=D0=B8=D1=82= =D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5 =D1=83=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC= =D0=BB=D0=B5=D0=BD=D0=B8=D0=B5 =D0=BE =D0=B7=D0=B0=D0=B4=D0=BE=D0=BB=D0=B6=D0=B5=D0=BD=D0=BD=D0=BE=D1=81=D1=82=D0= =B8 =D0=B5=D0=B4=D0=B8=D0=BD=D0=B8=D1=86=D1=8B','=D0=92 =D0=B1=D0=BB=D0=B8= =D0=B6=D0=B0=D0=B9=D1=88=D0=B5=D0=BC =D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD= =D0=B8 =D0=92=D0=B0=D0=BC =D0=BD=D1=83=D0=B6=D0=BD=D0=BE =D0=B2=D0=BE=D0=B7= =D0=B2=D1=80=D0=B0=D1=82=D0=B8=D1=82=D1=8C <> =D0=B5=D0=B4=D0=B8=D0=BD=D0=B8=D1=86'), -('circulation','EVENT','=D0=9F=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=BE=D1=8F= =D1=89=D0=B5=D0=B5 =D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D1=87= =D0=BD=D0=BE=D0=B5 =D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B5','=D0=9F=D1=80=D0=B5=D0=B4=D1=81= =D1=82=D0=BE=D1=8F=D1=89=D0=B5=D0=B5 =D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE= =D1=82=D0=B5=D1=87=D0=BD=D0=BE=D0=B5 =D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8= =D0=B5','=D0=9B=D1=8E=D0=B1=D0=B5=D0=B7=D0=BD=D1=8B=D0=B9 <> <>,\r\n\r\n=D0=AD=D1=82=D0=BE = =D0=BD=D0=B0=D0=BF=D0=BE=D0=BC=D0=B8=D0=BD=D0=B0=D0=BD=D0=B8=D0=B5 =D0=BE =D0=BF=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=BE=D1=8F=D1=89=D0=B5=D0=BC = =D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D1=87=D0=BD=D0=BE=D0=BC = =D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B8, =D0=B2 =D0=BA=D0=BE=D1=82=D0=BE= =D1=80=D0=BE=D0=BC =D0=92=D1=8B =D0=BF=D1=80=D0=BE=D1=8F=D0=B2=D0=B8=D0=BB= =D0=B8 =D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=B5=D1=81.'), - ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), diff --git a/installer/data/mysql/ru-RU/optional/sample_notices_message_att= ributes.sql b/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes.sql index cfc4740..39c3df3 100644 --- a/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes= .sql +++ b/installer/data/mysql/ru-RU/optional/sample_notices_message_attributes= .sql @@ -1,11 +1,10 @@ -truncate message_attributes; +=EF=BB=BFtruncate message_attributes; insert into `message_attributes` (`message_attribute_id`, message_name, `takes_days`) values (1, '=D0=95=D0=B4=D0=B8=D0=BD=D0=B8=D1=86=D0=B0 =D0=B7=D0=B0=D0=B4=D0=BE= =D0=BB=D0=B6=D0=B5=D0=BD=D0=B0', 0), (2, '=D0=9F=D1=80=D0=B5=D0=B4=D0=B2=D0=B0=D1=80=D0=B8=D1=82=D0=B5=D0=BB=D1= =8C=D0=BD=D0=BE=D0=B5 =D1=83=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0= =BD=D0=B8=D0=B5', 1), -(3, '=D0=9F=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=BE=D1=8F=D1=89=D0=B8=D0=B5 = =D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F', 1), (4, 'Hold Filled', 0), (5, 'Item Check-in', 0), (6, 'Item Checkout', 0); diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql index 9da390e..a2569b5 100644 --- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql +++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql @@ -1,14 +1,12 @@ -INSERT INTO `letter` (module, code, name, title, content) +=EF=BB=BFINSERT INTO `letter` (module, code, name, title, content) VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> <>,\n\nAccording to our current records, you have items that are overdue.Your library does not charge late fines, but please return or renew them at the branch below as soon as possible.\n\n<>\n<= >\n<> <>\nPhone: <>\nFax: <>\nEmail: <>\n\nIf you have registered a password with the library, and you have a renewal available, you may renew online. If an item becomes more than 30 days overdue, you will be unable to use your library card until the item is returned.\n\nThe following item(s) is/are currently overdue:\n\n"<>" by <>, <>, Barcode: <> Fine: GBP\n\nThank-you for your prompt attention to this matter.\n\n<> Staff\n'), ('claimacquisition','ACQCLAIM','Acquisition Claim','Item Not Received','<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n<>\r\n\r\nOrdernumber <> (<>) (<> ordered) ($<> each) has not been received.'), ('serial','RLIST','Routing List','Serial is now available','<> <>,\r\n\r\nThe following issue is now available:\r\n\r\n<>, <> (<>)\r\n\r\nPlease pick it up at your convenience.'), ('members','ACCTDETAILS','Account Details Template - DEFAULT','Your new Koha account details.','Hello <> <> <>.\r\n\r\nYour new Koha account details are:\r\n\r\nUser: <>\r\nPassword: <>\r\n\r\nIf you have any problems or questions regarding your account, please contact your Koha Administrator.\r\n\r\nThank you,\r\nKoha Administrator\r\nkohaadmin at yoursite.org'), ('circulation','DUE','Item Due Reminder','Item Due Reminder','Dear <> <>,\r\n\r\nThe following item is now due:\r\n\r\n<>, <> (<>)'), ('circulation','DUEDGST','Item Due Reminder (Digest)','Item Due Reminder','You have <> items due'), -('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)' -), +('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)'), ('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), -('circulation','EVENT','Upcoming Library Event','Upcoming Library Event','Dear <> <>,\r\n\r\nThis is a reminder of an upcoming library event in which you have expressed interest.'), ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>\r\n<> <>'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<>\r\n----\r\nThank you for visiting <>.'), diff --git a/installer/data/mysql/uk-UA/optional/sample_notices.sql b/installer/data/mysql/uk-UA/optional/sample_notices.sql index 73896ba..eb9509e 100644 --- a/installer/data/mysql/uk-UA/optional/sample_notices.sql +++ b/installer/data/mysql/uk-UA/optional/sample_notices.sql @@ -1,4 +1,4 @@ -truncate letter; +=EF=BB=BFtruncate letter; INSERT INTO `letter` (module, code, name, title, content) @@ -19,8 +19,6 @@ VALUES ('circulation','PREDUEDGST','=D0=9F=D0=BE=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0= =BD=D1=94 =D0=BF=D0=BE=D0=B2=D1=96=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0= =BD=D1=8F =D0=BF=D1=80=D0=BE =D0=B7=D0=B0=D0=B1=D0=BE=D1=80=D0=B3=D0=BE=D0=B2=D0=B0=D0=BD=D1=96=D1=81=D1= =82=D1=8C =D0=BE=D0=B4=D0=B8=D0=BD=D0=B8=D1=86=D1=96 (=D0=B7=D0=B1=D1=96=D1= =80=D0=BA=D0=B0)','=D0=9F=D0=BE=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=BD=D1=94 = =D0=BF=D0=BE=D0=B2=D1=96=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=BD=D1=8F = =D0=BF=D1=80=D0=BE =D0=B7=D0=B0=D0=B1=D0=BE=D1=80=D0=B3=D0=BE=D0=B2=D0=B0=D0=BD=D1=96=D1=81=D1= =82=D1=8C =D0=BE=D0=B4=D0=B8=D0=BD=D0=B8=D1=86=D1=96','=D0=92 =D0=BD=D0=B0= =D0=B9=D0=B1=D0=BB=D0=B8=D0=B6=D1=87=D0=BE=D0=BC=D1=83 =D1=87=D0=B0=D1=81= =D1=96 =D0=92=D0=B0=D0=BC =D0=BF=D0=BE=D1=82=D1=80=D1=96=D0=B1=D0=BD=D0=BE = =D0=BF=D0=BE=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D1=82=D0=B8 <> =D0=BE=D0=B4=D0=B8=D0=BD=D0=B8=D1=86=D1=8C'), -('circulation','EVENT','=D0=9C=D0=B0=D0=B9=D0=B1=D1=83=D1=82=D0=BD=D1=8F = =D0=B1=D1=96=D0=B1=D0=BB=D1=96=D0=BE=D1=82=D0=B5=D1=87=D0=BD=D0=B0 =D0=BF= =D0=BE=D0=B4=D1=96=D1=8F','=D0=9C=D0=B0=D0=B9=D0=B1=D1=83=D1=82=D0=BD=D1=8F =D0=B1=D1=96=D0=B1=D0=BB=D1=96=D0=BE=D1=82=D0=B5=D1=87=D0=BD=D0=B0 =D0=BF= =D0=BE=D0=B4=D1=96=D1=8F','=D0=94=D0=BE=D0=B1=D1=80=D0=BE=D0=B4=D1=96=D0=B9= <> <>,\r\n\r\n=D0=A6=D0=B5 =D0=BD=D0=B0=D0=B3=D0=B0=D0=B4= =D1=83=D0=B2=D0=B0=D0=BD=D0=BD=D1=8F =D0=BF=D1=80=D0=BE =D0=BC=D0=B0=D0=B9= =D0=B1=D1=83=D1=82=D0=BD=D1=8E =D0=B1=D1=96=D0=B1=D0=BB=D1=96=D0=BE=D1=82= =D0=B5=D1=87=D0=BD=D1=83 =D0=BF=D0=BE=D0=B4=D1=96=D1=8E, =D0=B4=D0=BE =D1=8F=D0=BA=D0=BE=D1=97 =D0= =92=D0=B8 =D0=BF=D1=80=D0=BE=D1=8F=D0=B2=D0=B8=D0=BB=D0=B8 =D1=96=D0=BD=D1= =82=D0=B5=D1=80=D0=B5=D1=81.'), - ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), diff --git a/installer/data/mysql/uk-UA/optional/sample_notices_message_att= ributes.sql b/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes.sql index 28e2ec5..2a5ae86 100644 --- a/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes= .sql +++ b/installer/data/mysql/uk-UA/optional/sample_notices_message_attributes= .sql @@ -1,11 +1,10 @@ -truncate message_attributes; +=EF=BB=BFtruncate message_attributes; insert into `message_attributes` (`message_attribute_id`, `message_name`, `takes_days`) values (1, '=D0=9E=D0=B4=D0=B8=D0=BD=D0=B8=D1=86=D1=8F =D0=B7=D0=B0=D0=B1=D0=BE= =D1=80=D0=B3=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0' , 0), (2, '=D0=9F=D0=BE=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=BD=D1=94 =D0=BF=D0=BE= =D0=B2=D1=96=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=BD=D1=8F', 1), -(3, '=D0=9C=D0=B0=D0=B9=D0=B1=D1=83=D1=82=D0=BD=D1=96 =D0=BF=D0=BE=D0=B4= =D1=96=D1=97' , 1), (4, 'Hold Filled' , 0), (5, 'Item Check-in' , 0), (6, 'Item Checkout' , 0); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 1d90656..4787d3e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3624,6 +3624,14 @@ INSERT INTO permissions (module_bit, code, description) VALUES SetVersion ($DBversion); } +$DBversion =3D 'XXX'; +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ + $dbh->do(qq{DELETE FROM message_attributes WHERE message_attribute_id= =3D3;}); + $dbh->do(qq{DELETE FROM letter WHERE code=3D'EVENT' AND title=3D'Upcoming Library Event';}); + print "Upgrade to $DBversion done Remove upcoming events messaging option (bug 2434)"; + SetVersion ($DBversion); +} + =3Ditem DropAllForeignKeys($table) --=20 1.5.6.5 --00163646d7c8d1627904884a33ce Content-Type: application/octet-stream; name="0001-bug-2434-remove-upcoming-events-for-all-languages.patch" Content-Disposition: attachment; filename="0001-bug-2434-remove-upcoming-events-for-all-languages.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ga2luuin0 RnJvbSA1ZjVkZjllMzA5MTAxOWI5ZmJlMmQ5NDMyODFhMzdlZTY5OTdmODdiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGUgRW5nYXJkIDxuZW5nYXJkQGJ5d2F0ZXJzb2x1dGlv bnMuY29tPgpEYXRlOiBXZWQsIDIgSnVuIDIwMTAgMDg6MTk6MDggLTA0MDAKU3ViamVjdDogW1BB VENIXSBidWcgMjQzNCByZW1vdmUgdXBjb21pbmcgZXZlbnRzIGZvciBhbGwgbGFuZ3VhZ2VzCkNv bnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0idXRmLTgiCgp0aGlzIHBhdGNoIHJlbW92 ZWQgdGhlIHVwY29taW5nIGV2ZW50cyBtZXNzYWdpbmcgb3B0aW9uCmFuZCB0aGUgdXBjb21pbmcg ZXZlbnQgbWVzc2FnZSBmcm9tIHRoZSBzeXN0ZW0gZm9yIGFsbApsYW5ndWFnZXMgc2luY2UgaXQg d2FzIG5ldmVyIGltcGxlbWVudGVkIGFuZCBjb25mdXNlcwpsaWJyYXJpYW5zIGFuZCBwYXRyb25z IGFsaWtlCi0tLQogLi4uL2RhdGEvbXlzcWwvZGUtREUvbWFuZGF0b3J5L3NhbXBsZV9ub3RpY2Vz LnNxbCAgfCAgICAxIC0KIC4uLi9vcHRpb25hbC9zYW1wbGVfbm90aWNlc19tZXNzYWdlX2F0dHJp YnV0ZXMuc3FsIHwgICAgMSAtCiAuLi4vZGF0YS9teXNxbC9lbi9tYW5kYXRvcnkvc2FtcGxlX25v dGljZXMuc3FsICAgICB8ICAgIDQgKy0tLQogLi4uL29wdGlvbmFsL3NhbXBsZV9ub3RpY2VzX21l c3NhZ2VfYXR0cmlidXRlcy5zcWwgfCAgICAxIC0KIC4uLi9teXNxbC9mci1GUi8xLU9ibGlnYXRv aXJlL3NhbXBsZV9ub3RpY2VzLnNxbCAgIHwgICAgMSAtCiAuLi4vc2FtcGxlX25vdGljZXNfbWVz c2FnZV9hdHRyaWJ1dGVzLnNxbCAgICAgICAgICB8ICAgIDEgLQogLi4uL2RhdGEvbXlzcWwvcGwt UEwvbWFuZGF0b3J5L3NhbXBsZV9ub3RpY2VzLnNxbCAgfCAgIDEwICsrKysrLS0tLS0KIC4uLi9v cHRpb25hbC9zYW1wbGVfbm90aWNlc19tZXNzYWdlX2F0dHJpYnV0ZXMuc3FsIHwgICAgMyArLS0K IC4uLi9kYXRhL215c3FsL3J1LVJVL21hbmRhdG9yeS9zYW1wbGVfbm90aWNlcy5zcWwgIHwgICAg NiArKy0tLS0KIC4uLi9kYXRhL215c3FsL3J1LVJVL29wdGlvbmFsL3NhbXBsZV9ub3RpY2VzLnNx bCAgIHwgICAgNCArLS0tCiAuLi4vb3B0aW9uYWwvc2FtcGxlX25vdGljZXNfbWVzc2FnZV9hdHRy aWJ1dGVzLnNxbCB8ICAgIDMgKy0tCiAuLi4vZGF0YS9teXNxbC91ay1VQS9tYW5kYXRvcnkvc2Ft cGxlX25vdGljZXMuc3FsICB8ICAgIDYgKystLS0tCiAuLi4vZGF0YS9teXNxbC91ay1VQS9vcHRp b25hbC9zYW1wbGVfbm90aWNlcy5zcWwgICB8ICAgIDQgKy0tLQogLi4uL29wdGlvbmFsL3NhbXBs ZV9ub3RpY2VzX21lc3NhZ2VfYXR0cmlidXRlcy5zcWwgfCAgICAzICstLQogaW5zdGFsbGVyL2Rh dGEvbXlzcWwvdXBkYXRlZGF0YWJhc2UucGwgICAgICAgICAgICAgfCAgICA4ICsrKysrKysrCiAx NSBmaWxlcyBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9pbnN0YWxsZXIvZGF0YS9teXNxbC9kZS1ERS9tYW5kYXRvcnkvc2FtcGxlX25vdGlj ZXMuc3FsIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZGUtREUvbWFuZGF0b3J5L3NhbXBsZV9ub3Rp Y2VzLnNxbAppbmRleCBlMDQ0NDc3Li5hNzI0YTdhIDEwMDY0NAotLS0gYS9pbnN0YWxsZXIvZGF0 YS9teXNxbC9kZS1ERS9tYW5kYXRvcnkvc2FtcGxlX25vdGljZXMuc3FsCisrKyBiL2luc3RhbGxl ci9kYXRhL215c3FsL2RlLURFL21hbmRhdG9yeS9zYW1wbGVfbm90aWNlcy5zcWwKQEAgLTcsNyAr Nyw2IEBAIFZBTFVFUyAoJ2NpcmN1bGF0aW9uJywnT0RVRScsJ01haG51bmcnLCdNYWhudW5nJywn TGllYmUvciA8PGJvcnJvd2Vycy5maXJzdG5hbWU+CiAoJ2NpcmN1bGF0aW9uJywnRFVFREdTVCcs J0bDpGxsaWdrZWl0c2JlbmFjaHJpY2h0aWd1bmcgKFp1c2FtbWVuZmFzc3VuZyknLCdGw6RsbGln a2VpdHNiZW5hY2hyaWNodGlndW5nJywnU2llIGhhYmVuIDw8Y291bnQ+PiDDvGJlcmbDpGxsaWdl IE1lZGllbi4nKSwgCiAoJ2NpcmN1bGF0aW9uJywnUFJFRFVFJywnRXJpbm5lcnVuZ3NiZW5hY2hy aWNodGlndW5nJywnRXJpbm5lcnVuZ3NiZW5hY2hyaWNodGlndW5nJywnTGllYmUvciA8PGJvcnJv d2Vycy5maXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj4sXHJcblxyXG5Gb2xnZW5kZSBB dXNsZWloZSB3aXJkIGJhbGQgZsOkbGxpZzpcclxuXHJcbjw8YmlibGlvLnRpdGxlPj4sIDw8Ymli bGlvLmF1dGhvcj4+ICg8PGl0ZW1zLmJhcmNvZGU+PiknKSwgCiAoJ2NpcmN1bGF0aW9uJywnUFJF RFVFREdTVCcsJ0VyaW5uZXJ1bmdzYmVuYWNocmljaHRpZ3VuZyAoWnVzYW1tZW5mYXNzdW5nKScs J0VyaW5uZXJ1bmdzYmVuYWNocmljaHRpZ3VuZycsJ1NpZSBoYWJlbiA8PGNvdW50Pj4gQXVzbGVp aGVuLCBkaWUgYmFsZCBmw6RsbGlnIHdlcmRlbi4nKSwKLSgnY2lyY3VsYXRpb24nLCdFVkVOVCcs J1ZlcmFuc3RhbHR1bmdzaGlud2VpcycsJ1ZlcmFuc3RhbHR1bmdzaGlud2VpcycsJ0xpZWJlL3Ig PDxib3Jyb3dlcnMuZmlyc3RuYW1lPj4gPDxib3Jyb3dlcnMuc3VybmFtZT4+LFxyXG5cclxuRGll cyBpc3QgZWluZSBFcmlubmVydW5nIGFuIGRpZSBWZXJhbnN0YWx0dW5nLCBmw7xyIGRpZSBTaWUg c2ljaCBpbnRlcmVzc2llcnQgaGF0dGVuLicpLAogKCdyZXNlcnZlcycsICdIT0xEJywgJ1Zvcm1l cmtiZW5hY2hyaWNodGlndW5nJywgJ1Zvcm1lcmt1bmcgYWJob2xiZXJlaXQgaW4gPDxicmFuY2hl cy5icmFuY2huYW1lPj4nLCAnTGllYmUvciA8PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJv d2Vycy5zdXJuYW1lPj4sXHJcblxyXG5Gw7xyIFNpZSBsaWVndCBzZWl0IDw8cmVzZXJ2ZXMud2Fp dGluZ2RhdGU+PiBlaW5lIFZvcm1lcmt1bmcgenVyIEFiaG9sdW5nIGJlcmVpdDpcclxuXHJcblRp dGVsOiA8PGJpYmxpby50aXRsZT4+XHJcblZlcmZhc3NlcjogPDxiaWJsaW8uYXV0aG9yPj5cclxu RXhlbXBsYXI6IDw8aXRlbXMuY29weW51bWJlcj4+XHJcblN0YW5kb3J0OiA8PGJyYW5jaGVzLmJy YW5jaG5hbWU+PlxyXG48PGJyYW5jaGVzLmJyYW5jaGFkZHJlc3MxPj5cclxuPDxicmFuY2hlcy5i cmFuY2hhZGRyZXNzMj4+XHJcbjw8YnJhbmNoZXMuYnJhbmNoYWRkcmVzczM+PlxyXG48PGJyYW5j aGVzLmJyYW5jaGNpdHk+PiA8PGJyYW5jaGVzLmJyYW5jaHppcD4+JyksCiAoJ3Jlc2VydmVzJywg J0hPTERfUFJJTlQnLCAnVm9ybWVya2JlbmFjaHJpY2h0aWd1bmcgKGdlZHJ1Y2t0ZSBCZW5hY2hy aWNodGlndW5nKScsICdWb3JtZXJrdW5nIGFiaG9sYmVyZWl0IChnZWRydWNrdGUgQmVuYWNocmlj aHRpZ3VuZyknLCAnPDxicmFuY2hlcy5icmFuY2huYW1lPj5cclxuPDxicmFuY2hlcy5icmFuY2hh ZGRyZXNzMT4+XHJcbjw8YnJhbmNoZXMuYnJhbmNoYWRkcmVzczI+PlxyXG5cclxuXHJcbsOEbmRl cnVuZyBhbmdlZnJhXHJcblxyXG5cclxuXHJcblxyXG5cclxuXHJcblxyXG48PGJvcnJvd2Vycy5m aXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj5cclxuPDxib3Jyb3dlcnMuYWRkcmVzcz4+ XHJcbjw8Ym9ycm93ZXJzLmNpdHk+PiA8PGJvcnJvd2Vycy56aXBjb2RlPj5cclxuXHJcblxyXG5c clxuXHJcblxyXG5cclxuXHJcblxyXG5cclxuXHJcbjw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8 Ym9ycm93ZXJzLnN1cm5hbWU+PiA8PGJvcnJvd2Vycy5jYXJkbnVtYmVyPj5cclxuXHJcbkbDvHIg U2llIGxpZWd0IHNlaXQgZGVtIDw8cmVzZXJ2ZXMud2FpdGluZ2RhdGU+PiBlaW5lIFZvcm1lcmt1 bmcgenVyIEFiaG9sdW5nIGJlcmVpdDpcclxuXHJcblRpdGVsOiA8PGJpYmxpby50aXRsZT4+XHJc blZlcmZhc3NlcjogPDxiaWJsaW8uYXV0aG9yPj5cclxuRXhlbXBsYXI6IDw8aXRlbXMuY29weW51 bWJlcj4+XHJcbicpLAogKCdjaXJjdWxhdGlvbicsJ0NIRUNLSU4nLCdSw7xja2dhYmVxdWl0dHVu ZyAoWnVzYW1tZW5mYXNzdW5nKScsJ1LDvGNrZ2FiZXF1aXR0dW5nJywnRGllIGZvbGdlbmRlbiBN ZWRpZW4gd3VyZGVuIHp1csO8Y2tnZWdlYmVuOlxyXG4tLS0tXHJcbjw8YmlibGlvLnRpdGxlPj5c clxuLS0tLVxyXG5WaWVsZW4gRGFuay4nKSwKZGlmZiAtLWdpdCBhL2luc3RhbGxlci9kYXRhL215 c3FsL2RlLURFL29wdGlvbmFsL3NhbXBsZV9ub3RpY2VzX21lc3NhZ2VfYXR0cmlidXRlcy5zcWwg Yi9pbnN0YWxsZXIvZGF0YS9teXNxbC9kZS1ERS9vcHRpb25hbC9zYW1wbGVfbm90aWNlc19tZXNz YWdlX2F0dHJpYnV0ZXMuc3FsCmluZGV4IGYzODYzMGQuLmExZWIwZTggMTAwNjQ0Ci0tLSBhL2lu c3RhbGxlci9kYXRhL215c3FsL2RlLURFL29wdGlvbmFsL3NhbXBsZV9ub3RpY2VzX21lc3NhZ2Vf YXR0cmlidXRlcy5zcWwKKysrIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZGUtREUvb3B0aW9uYWwv c2FtcGxlX25vdGljZXNfbWVzc2FnZV9hdHRyaWJ1dGVzLnNxbApAQCAtMyw3ICszLDYgQEAKIHZh bHVlcwogKDEsICdGw6RsbGlna2VpdHNiZW5hY2hyaWNodGlndW5nJywgMCksCiAoMiwgJ0VyaW5u ZXJ1bmdzYmVuYWNocmljaHRpZ3VuZycsIDEpLAotKDMsICdWZXJhbnN0YWx0dW5nc2hpbndlaXNl JywgMSksCiAoNCwgJ1Zvcm1lcmtiZW5hY2hyaWNodGlndW5nJywgMCksCiAoNSwgJ1LDvGNrZ2Fi ZXF1aXR0dW5nJywgMCksCiAoNiwgJ0F1c2xlaWhxdWl0dHVuZycsIDApOwpkaWZmIC0tZ2l0IGEv aW5zdGFsbGVyL2RhdGEvbXlzcWwvZW4vbWFuZGF0b3J5L3NhbXBsZV9ub3RpY2VzLnNxbCBiL2lu c3RhbGxlci9kYXRhL215c3FsL2VuL21hbmRhdG9yeS9zYW1wbGVfbm90aWNlcy5zcWwKaW5kZXgg NjY5NDdmMi4uNjRlMjU2NCAxMDA2NDQKLS0tIGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZW4vbWFu ZGF0b3J5L3NhbXBsZV9ub3RpY2VzLnNxbAorKysgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC9lbi9t YW5kYXRvcnkvc2FtcGxlX25vdGljZXMuc3FsCkBAIC01LDEwICs1LDggQEAgVkFMVUVTICgnY2ly Y3VsYXRpb24nLCdPRFVFJywnT3ZlcmR1ZSBOb3RpY2UnLCdJdGVtIE92ZXJkdWUnLCdEZWFyIDw8 Ym9ycm93ZXJzLmYKICgnbWVtYmVycycsJ0FDQ1RERVRBSUxTJywnQWNjb3VudCBEZXRhaWxzIFRl bXBsYXRlIC0gREVGQVVMVCcsJ1lvdXIgbmV3IEtvaGEgYWNjb3VudCBkZXRhaWxzLicsJ0hlbGxv IDw8Ym9ycm93ZXJzLnRpdGxlPj4gPDxib3Jyb3dlcnMuZmlyc3RuYW1lPj4gPDxib3Jyb3dlcnMu c3VybmFtZT4+LlxyXG5cclxuWW91ciBuZXcgS29oYSBhY2NvdW50IGRldGFpbHMgYXJlOlxyXG5c clxuVXNlcjogIDw8Ym9ycm93ZXJzLnVzZXJpZD4+XHJcblBhc3N3b3JkOiA8PGJvcnJvd2Vycy5w YXNzd29yZD4+XHJcblxyXG5JZiB5b3UgaGF2ZSBhbnkgcHJvYmxlbXMgb3IgcXVlc3Rpb25zIHJl Z2FyZGluZyB5b3VyIGFjY291bnQsIHBsZWFzZSBjb250YWN0IHlvdXIgS29oYSBBZG1pbmlzdHJh dG9yLlxyXG5cclxuVGhhbmsgeW91LFxyXG5Lb2hhIEFkbWluaXN0cmF0b3Jcclxua29oYWFkbWlu QHlvdXJzaXRlLm9yZycpLCAKICgnY2lyY3VsYXRpb24nLCdEVUUnLCdJdGVtIER1ZSBSZW1pbmRl cicsJ0l0ZW0gRHVlIFJlbWluZGVyJywnRGVhciA8PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJv cnJvd2Vycy5zdXJuYW1lPj4sXHJcblxyXG5UaGUgZm9sbG93aW5nIGl0ZW0gaXMgbm93IGR1ZTpc clxuXHJcbjw8YmlibGlvLnRpdGxlPj4sIDw8YmlibGlvLmF1dGhvcj4+ICg8PGl0ZW1zLmJhcmNv ZGU+PiknKSwgCiAoJ2NpcmN1bGF0aW9uJywnRFVFREdTVCcsJ0l0ZW0gRHVlIFJlbWluZGVyIChE aWdlc3QpJywnSXRlbSBEdWUgUmVtaW5kZXInLCdZb3UgaGF2ZSA8PGNvdW50Pj4gaXRlbXMgZHVl JyksIAotKCdjaXJjdWxhdGlvbicsJ1BSRURVRScsJ0FkdmFuY2UgTm90aWNlIG9mIEl0ZW0gRHVl JywnQWR2YW5jZSBOb3RpY2Ugb2YgSXRlbSBEdWUnLCdEZWFyIDw8Ym9ycm93ZXJzLmZpcnN0bmFt ZT4+IDw8Ym9ycm93ZXJzLnN1cm5hbWU+PixcclxuXHJcblRoZSBmb2xsb3dpbmcgaXRlbSB3aWxs IGJlIGR1ZSBzb29uOlxyXG5cclxuPDxiaWJsaW8udGl0bGU+PiwgPDxiaWJsaW8uYXV0aG9yPj4g KDw8aXRlbXMuYmFyY29kZT4+KScKLSksIAorKCdjaXJjdWxhdGlvbicsJ1BSRURVRScsJ0FkdmFu Y2UgTm90aWNlIG9mIEl0ZW0gRHVlJywnQWR2YW5jZSBOb3RpY2Ugb2YgSXRlbSBEdWUnLCdEZWFy IDw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5hbWU+PixcclxuXHJcblRo ZSBmb2xsb3dpbmcgaXRlbSB3aWxsIGJlIGR1ZSBzb29uOlxyXG5cclxuPDxiaWJsaW8udGl0bGU+ PiwgPDxiaWJsaW8uYXV0aG9yPj4gKDw8aXRlbXMuYmFyY29kZT4+KScpLCAKICgnY2lyY3VsYXRp b24nLCdQUkVEVUVER1NUJywnQWR2YW5jZSBOb3RpY2Ugb2YgSXRlbSBEdWUgKERpZ2VzdCknLCdB ZHZhbmNlIE5vdGljZSBvZiBJdGVtIER1ZScsJ1lvdSBoYXZlIDw8Y291bnQ+PiBpdGVtcyBkdWUg c29vbicpLAotKCdjaXJjdWxhdGlvbicsJ0VWRU5UJywnVXBjb21pbmcgTGlicmFyeSBFdmVudCcs J1VwY29taW5nIExpYnJhcnkgRXZlbnQnLCdEZWFyIDw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8 Ym9ycm93ZXJzLnN1cm5hbWU+PixcclxuXHJcblRoaXMgaXMgYSByZW1pbmRlciBvZiBhbiB1cGNv bWluZyBsaWJyYXJ5IGV2ZW50IGluIHdoaWNoIHlvdSBoYXZlIGV4cHJlc3NlZCBpbnRlcmVzdC4n KSwKICgncmVzZXJ2ZXMnLCAnSE9MRCcsICdIb2xkIEF2YWlsYWJsZSBmb3IgUGlja3VwJywgJ0hv bGQgQXZhaWxhYmxlIGZvciBQaWNrdXAgYXQgPDxicmFuY2hlcy5icmFuY2huYW1lPj4nLCAnRGVh ciA8PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj4sXHJcblxyXG5Z b3UgaGF2ZSBhIGhvbGQgYXZhaWxhYmxlIGZvciBwaWNrdXAgYXMgb2YgPDxyZXNlcnZlcy53YWl0 aW5nZGF0ZT4+OlxyXG5cclxuVGl0bGU6IDw8YmlibGlvLnRpdGxlPj5cclxuQXV0aG9yOiA8PGJp Ymxpby5hdXRob3I+PlxyXG5Db3B5OiA8PGl0ZW1zLmNvcHludW1iZXI+PlxyXG5Mb2NhdGlvbjog PDxicmFuY2hlcy5icmFuY2huYW1lPj5cclxuPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMT4+XHJc bjw8YnJhbmNoZXMuYnJhbmNoYWRkcmVzczI+PlxyXG48PGJyYW5jaGVzLmJyYW5jaGFkZHJlc3Mz Pj5cclxuPDxicmFuY2hlcy5icmFuY2hjaXR5Pj4gPDxicmFuY2hlcy5icmFuY2h6aXA+PicpLAog KCdyZXNlcnZlcycsICdIT0xEX1BSSU5UJywgJ0hvbGQgQXZhaWxhYmxlIGZvciBQaWNrdXAgKHBy aW50IG5vdGljZSknLCAnSG9sZCBBdmFpbGFibGUgZm9yIFBpY2t1cCAocHJpbnQgbm90aWNlKScs ICc8PGJyYW5jaGVzLmJyYW5jaG5hbWU+PlxyXG48PGJyYW5jaGVzLmJyYW5jaGFkZHJlc3MxPj5c clxuPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMj4+XHJcblxyXG5cclxuQ2hhbmdlIFNlcnZpY2Ug UmVxdWVzdGVkXHJcblxyXG5cclxuXHJcblxyXG5cclxuXHJcblxyXG48PGJvcnJvd2Vycy5maXJz dG5hbWU+PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj5cclxuPDxib3Jyb3dlcnMuYWRkcmVzcz4+XHJc bjw8Ym9ycm93ZXJzLmNpdHk+PiA8PGJvcnJvd2Vycy56aXBjb2RlPj5cclxuXHJcblxyXG5cclxu XHJcblxyXG5cclxuXHJcblxyXG5cclxuXHJcbjw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8Ym9y cm93ZXJzLnN1cm5hbWU+PiA8PGJvcnJvd2Vycy5jYXJkbnVtYmVyPj5cclxuXHJcbllvdSBoYXZl IGEgaG9sZCBhdmFpbGFibGUgZm9yIHBpY2t1cCBhcyBvZiA8PHJlc2VydmVzLndhaXRpbmdkYXRl Pj46XHJcblxyXG5UaXRsZTogPDxiaWJsaW8udGl0bGU+PlxyXG5BdXRob3I6IDw8YmlibGlvLmF1 dGhvcj4+XHJcbkNvcHk6IDw8aXRlbXMuY29weW51bWJlcj4+XHJcbicpLAogKCdjaXJjdWxhdGlv bicsJ0NIRUNLSU4nLCdJdGVtIENoZWNrLWluIChEaWdlc3QpJywnQ2hlY2staW5zJywnVGhlIGZv bGxvd2luZyBpdGVtcyBoYXZlIGJlZW4gY2hlY2tlZCBpbjpcclxuLS0tLVxyXG48PGJpYmxpby50 aXRsZT4+XHJcbi0tLS1cclxuVGhhbmsgeW91LicpLApkaWZmIC0tZ2l0IGEvaW5zdGFsbGVyL2Rh dGEvbXlzcWwvZW4vb3B0aW9uYWwvc2FtcGxlX25vdGljZXNfbWVzc2FnZV9hdHRyaWJ1dGVzLnNx bCBiL2luc3RhbGxlci9kYXRhL215c3FsL2VuL29wdGlvbmFsL3NhbXBsZV9ub3RpY2VzX21lc3Nh Z2VfYXR0cmlidXRlcy5zcWwKaW5kZXggNWQxZWNiNi4uMTgzNDA2MyAxMDA2NDQKLS0tIGEvaW5z dGFsbGVyL2RhdGEvbXlzcWwvZW4vb3B0aW9uYWwvc2FtcGxlX25vdGljZXNfbWVzc2FnZV9hdHRy aWJ1dGVzLnNxbAorKysgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC9lbi9vcHRpb25hbC9zYW1wbGVf bm90aWNlc19tZXNzYWdlX2F0dHJpYnV0ZXMuc3FsCkBAIC0zLDcgKzMsNiBAQCBpbnNlcnQgaW50 byBgbWVzc2FnZV9hdHRyaWJ1dGVzYAogdmFsdWVzCiAoMSwgJ0l0ZW0gRFVFJywgMCksCiAoMiwg J0FkdmFuY2UgTm90aWNlJywgMSksCi0oMywgJ1VwY29taW5nIEV2ZW50cycsIDEpLAogKDQsICdI b2xkIEZpbGxlZCcsIDApLAogKDUsICdJdGVtIENoZWNrLWluJywgMCksCiAoNiwgJ0l0ZW0gQ2hl Y2tvdXQnLCAwKTsKZGlmZiAtLWdpdCBhL2luc3RhbGxlci9kYXRhL215c3FsL2ZyLUZSLzEtT2Js aWdhdG9pcmUvc2FtcGxlX25vdGljZXMuc3FsIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZnItRlIv MS1PYmxpZ2F0b2lyZS9zYW1wbGVfbm90aWNlcy5zcWwKaW5kZXggMDIzZGY5Yi4uODBmM2VhMyAx MDA2NDQKLS0tIGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZnItRlIvMS1PYmxpZ2F0b2lyZS9zYW1w bGVfbm90aWNlcy5zcWwKKysrIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZnItRlIvMS1PYmxpZ2F0 b2lyZS9zYW1wbGVfbm90aWNlcy5zcWwKQEAgLTksNyArOSw2IEBAIFZBTFVFUwogKCdjaXJjdWxh dGlvbicsJ0RVRURHU1QnLCdJdGVtIER1ZSBSZW1pbmRlciAoRGlnZXN0KScsJ0l0ZW0gRHVlIFJl bWluZGVyJywnWW91IGhhdmUgPDxjb3VudD4+IGl0ZW1zIGR1ZScpLAogKCdjaXJjdWxhdGlvbics J1BSRURVRScsJ0FkdmFuY2UgTm90aWNlIG9mIEl0ZW0gRHVlJywnQWR2YW5jZSBOb3RpY2Ugb2Yg SXRlbSBEdWUnLCdEZWFyIDw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5h bWU+PixcclxuXHJcblRoZSBmb2xsb3dpbmcgaXRlbSB3aWxsIGJlIGR1ZSBzb29uOlxyXG5cclxu PDxiaWJsaW8udGl0bGU+PiwgPDxiaWJsaW8uYXV0aG9yPj4gKDw8aXRlbXMuYmFyY29kZT4+KScp LAogKCdjaXJjdWxhdGlvbicsJ1BSRURVRURHU1QnLCdBZHZhbmNlIE5vdGljZSBvZiBJdGVtIER1 ZSAoRGlnZXN0KScsJ0FkdmFuY2UgTm90aWNlIG9mIEl0ZW0gRHVlJywnWW91IGhhdmUgPDxjb3Vu dD4+IGl0ZW1zIGR1ZSBzb29uJyksCi0oJ2NpcmN1bGF0aW9uJywnRVZFTlQnLCdVcGNvbWluZyBM aWJyYXJ5IEV2ZW50JywnVXBjb21pbmcgTGlicmFyeSBFdmVudCcsJ0RlYXIgPDxib3Jyb3dlcnMu Zmlyc3RuYW1lPj4gPDxib3Jyb3dlcnMuc3VybmFtZT4+LFxyXG5cclxuVGhpcyBpcyBhIHJlbWlu ZGVyIG9mIGFuIHVwY29taW5nIGxpYnJhcnkgZXZlbnQgaW4gd2hpY2ggeW91IGhhdmUgZXhwcmVz c2VkIGludGVyZXN0LicpLAogKCdyZXNlcnZlcycsICdIT0xEJywgJ0hvbGQgQXZhaWxhYmxlIGZv ciBQaWNrdXAnLCAnSG9sZCBBdmFpbGFibGUgZm9yIFBpY2t1cCBhdCA8PGJyYW5jaGVzLmJyYW5j aG5hbWU+PicsICdEZWFyIDw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5h bWU+PixcclxuXHJcbllvdSBoYXZlIGEgaG9sZCBhdmFpbGFibGUgZm9yIHBpY2t1cCBhcyBvZiA8 PHJlc2VydmVzLndhaXRpbmdkYXRlPj46XHJcblxyXG5UaXRsZTogPDxiaWJsaW8udGl0bGU+Plxy XG5BdXRob3I6IDw8YmlibGlvLmF1dGhvcj4+XHJcbkNvcHk6IDw8aXRlbXMuY29weW51bWJlcj4+ XHJcbkxvY2F0aW9uOiA8PGJyYW5jaGVzLmJyYW5jaG5hbWU+PlxyXG48PGJyYW5jaGVzLmJyYW5j aGFkZHJlc3MxPj5cclxuPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMj4+XHJcbjw8YnJhbmNoZXMu YnJhbmNoYWRkcmVzczM+PicpLAogKCdyZXNlcnZlcycsICdIT0xEX1BSSU5UJywgJ0hvbGQgQXZh aWxhYmxlIGZvciBQaWNrdXAgKHByaW50IG5vdGljZSknLCAnSG9sZCBBdmFpbGFibGUgZm9yIFBp Y2t1cCAocHJpbnQgbm90aWNlKScsICc8PGJyYW5jaGVzLmJyYW5jaG5hbWU+PlxyXG48PGJyYW5j aGVzLmJyYW5jaGFkZHJlc3MxPj5cclxuPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMj4+XHJcblxy XG5cclxuQ2hhbmdlIFNlcnZpY2UgUmVxdWVzdGVkXHJcblxyXG5cclxuXHJcblxyXG5cclxuXHJc blxyXG48PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj5cclxuPDxi b3Jyb3dlcnMuYWRkcmVzcz4+XHJcbjw8Ym9ycm93ZXJzLmNpdHk+PiA8PGJvcnJvd2Vycy56aXBj b2RlPj5cclxuXHJcblxyXG5cclxuXHJcblxyXG5cclxuXHJcblxyXG5cclxuXHJcbjw8Ym9ycm93 ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5hbWU+PiA8PGJvcnJvd2Vycy5jYXJkbnVt YmVyPj5cclxuXHJcbllvdSBoYXZlIGEgaG9sZCBhdmFpbGFibGUgZm9yIHBpY2t1cCBhcyBvZiA8 PHJlc2VydmVzLndhaXRpbmdkYXRlPj46XHJcblxyXG5UaXRsZTogPDxiaWJsaW8udGl0bGU+Plxy XG5BdXRob3I6IDw8YmlibGlvLmF1dGhvcj4+XHJcbkNvcHk6IDw8aXRlbXMuY29weW51bWJlcj4+ XHJcbicpLAogKCdjaXJjdWxhdGlvbicsJ0NIRUNLSU4nLCdJdGVtIENoZWNrLWluIChEaWdlc3Qp JywnQ2hlY2staW5zJywnVGhlIGZvbGxvd2luZyBpdGVtcyBoYXZlIGJlZW4gY2hlY2tlZCBpbjpc clxuLS0tLVxyXG48PGJpYmxpby50aXRsZT4+XHJcbi0tLS1cclxuVGhhbmsgeW91LicpLApkaWZm IC0tZ2l0IGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZnItRlIvMi1PcHRpb25lbC9zYW1wbGVfbm90 aWNlc19tZXNzYWdlX2F0dHJpYnV0ZXMuc3FsIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvZnItRlIv Mi1PcHRpb25lbC9zYW1wbGVfbm90aWNlc19tZXNzYWdlX2F0dHJpYnV0ZXMuc3FsCmluZGV4IDVk MWVjYjYuLjE4MzQwNjMgMTAwNjQ0Ci0tLSBhL2luc3RhbGxlci9kYXRhL215c3FsL2ZyLUZSLzIt T3B0aW9uZWwvc2FtcGxlX25vdGljZXNfbWVzc2FnZV9hdHRyaWJ1dGVzLnNxbAorKysgYi9pbnN0 YWxsZXIvZGF0YS9teXNxbC9mci1GUi8yLU9wdGlvbmVsL3NhbXBsZV9ub3RpY2VzX21lc3NhZ2Vf YXR0cmlidXRlcy5zcWwKQEAgLTMsNyArMyw2IEBAIGluc2VydCBpbnRvIGBtZXNzYWdlX2F0dHJp YnV0ZXNgCiB2YWx1ZXMKICgxLCAnSXRlbSBEVUUnLCAwKSwKICgyLCAnQWR2YW5jZSBOb3RpY2Un LCAxKSwKLSgzLCAnVXBjb21pbmcgRXZlbnRzJywgMSksCiAoNCwgJ0hvbGQgRmlsbGVkJywgMCks CiAoNSwgJ0l0ZW0gQ2hlY2staW4nLCAwKSwKICg2LCAnSXRlbSBDaGVja291dCcsIDApOwpkaWZm IC0tZ2l0IGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvcGwtUEwvbWFuZGF0b3J5L3NhbXBsZV9ub3Rp Y2VzLnNxbCBiL2luc3RhbGxlci9kYXRhL215c3FsL3BsLVBML21hbmRhdG9yeS9zYW1wbGVfbm90 aWNlcy5zcWwKaW5kZXggNjY5NDdmMi4uMDdjZmIzYyAxMDA2NDQKLS0tIGEvaW5zdGFsbGVyL2Rh dGEvbXlzcWwvcGwtUEwvbWFuZGF0b3J5L3NhbXBsZV9ub3RpY2VzLnNxbAorKysgYi9pbnN0YWxs ZXIvZGF0YS9teXNxbC9wbC1QTC9tYW5kYXRvcnkvc2FtcGxlX25vdGljZXMuc3FsCkBAIC0xLDE0 ICsxLDE0IEBACi1JTlNFUlQgSU5UTyBgbGV0dGVyYCAobW9kdWxlLCBjb2RlLCBuYW1lLCB0aXRs ZSwgY29udGVudCkgCi1WQUxVRVMgKCdjaXJjdWxhdGlvbicsJ09EVUUnLCdPdmVyZHVlIE5vdGlj ZScsJ0l0ZW0gT3ZlcmR1ZScsJ0RlYXIgPDxib3Jyb3dlcnMuZmlyc3RuYW1lPj4gPDxib3Jyb3dl cnMuc3VybmFtZT4+LFxuXG5BY2NvcmRpbmcgdG8gb3VyIGN1cnJlbnQgcmVjb3JkcywgeW91IGhh dmUgaXRlbXMgdGhhdCBhcmUgb3ZlcmR1ZS5Zb3VyIGxpYnJhcnkgZG9lcyBub3QgY2hhcmdlIGxh dGUgZmluZXMsIGJ1dCBwbGVhc2UgcmV0dXJuIG9yIHJlbmV3IHRoZW0gYXQgdGhlIGJyYW5jaCBi ZWxvdyBhcyBzb29uIGFzIHBvc3NpYmxlLlxuXG48PGJyYW5jaGVzLmJyYW5jaG5hbWU+PlxuPDxi cmFuY2hlcy5icmFuY2hhZGRyZXNzMT4+XG48PGJyYW5jaGVzLmJyYW5jaGFkZHJlc3MyPj4gPDxi cmFuY2hlcy5icmFuY2hhZGRyZXNzMz4+XG5QaG9uZTogPDxicmFuY2hlcy5icmFuY2hwaG9uZT4+ XG5GYXg6IDw8YnJhbmNoZXMuYnJhbmNoZmF4Pj5cbkVtYWlsOiA8PGJyYW5jaGVzLmJyYW5jaGVt YWlsPj5cblxuSWYgeW91IGhhdmUgcmVnaXN0ZXJlZCBhIHBhc3N3b3JkIHdpdGggdGhlIGxpYnJh cnksIGFuZCB5b3UgaGF2ZSBhIHJlbmV3YWwgYXZhaWxhYmxlLCB5b3UgbWF5IHJlbmV3IG9ubGlu ZS4gSWYgYW4gaXRlbSBiZWNvbWVzIG1vcmUgdGhhbiAzMCBkYXlzIG92ZXJkdWUsIHlvdSB3aWxs IGJlIHVuYWJsZSB0byB1c2UgeW91ciBsaWJyYXJ5IGNhcmQgdW50aWwgdGhlIGl0ZW0gaXMgcmV0 dXJuZWQuXG5cblRoZSBmb2xsb3dpbmcgaXRlbShzKSBpcy9hcmUgY3VycmVudGx5IG92ZXJkdWU6 XG5cbjxpdGVtPiI8PGJpYmxpby50aXRsZT4+IiBieSA8PGJpYmxpby5hdXRob3I+PiwgPDxpdGVt cy5pdGVtY2FsbG51bWJlcj4+LCBCYXJjb2RlOiA8PGl0ZW1zLmJhcmNvZGU+PiBGaW5lOiA8Zmlu ZT5HQlA8L2ZpbmU+PC9pdGVtPlxuXG5UaGFuay15b3UgZm9yIHlvdXIgcHJvbXB0IGF0dGVudGlv biB0byB0aGlzIG1hdHRlci5cblxuPDxicmFuY2hlcy5icmFuY2huYW1lPj4gU3RhZmZcbicpLAor 77u/SU5TRVJUIElOVE8gYGxldHRlcmAgKG1vZHVsZSwgY29kZSwgbmFtZSwgdGl0bGUsIGNvbnRl bnQpIAorVkFMVUVTIAorKCdjaXJjdWxhdGlvbicsJ09EVUUnLCdPdmVyZHVlIE5vdGljZScsCisn SXRlbSBPdmVyZHVlJywnRGVhciA8PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5z dXJuYW1lPj4sXG5cbkFjY29yZGluZyB0byBvdXIgY3VycmVudCByZWNvcmRzLCB5b3UgaGF2ZSBp dGVtcyB0aGF0IGFyZSBvdmVyZHVlLllvdXIgbGlicmFyeSBkb2VzIG5vdCBjaGFyZ2UgbGF0ZSBm aW5lcywgYnV0IHBsZWFzZSByZXR1cm4gb3IgcmVuZXcgdGhlbSBhdCB0aGUgYnJhbmNoIGJlbG93 IGFzIHNvb24gYXMgcG9zc2libGUuXG5cbjw8YnJhbmNoZXMuYnJhbmNobmFtZT4+XG48PGJyYW5j aGVzLmJyYW5jaGFkZHJlc3MxPj5cbjw8YnJhbmNoZXMuYnJhbmNoYWRkcmVzczI+PiA8PGJyYW5j aGVzLmJyYW5jaGFkZHJlc3MzPj5cblBob25lOiA8PGJyYW5jaGVzLmJyYW5jaHBob25lPj5cbkZh eDogPDxicmFuY2hlcy5icmFuY2hmYXg+PlxuRW1haWw6IDw8YnJhbmNoZXMuYnJhbmNoZW1haWw+ PlxuXG5JZiB5b3UgaGF2ZSByZWdpc3RlcmVkIGEgcGFzc3dvcmQgd2l0aCB0aGUgbGlicmFyeSwg YW5kIHlvdSBoYXZlIGEgcmVuZXdhbCBhdmFpbGFibGUsIHlvdSBtYXkgcmVuZXcgb25saW5lLiBJ ZiBhbiBpdGVtIGJlY29tZXMgbW9yZSB0aGFuIDMwIGRheXMgb3ZlcmR1ZSwgeW91IHdpbGwgYmUg dW5hYmxlIHRvIHVzZSB5b3VyIGxpYnJhcnkgY2FyZCB1bnRpbCB0aGUgaXRlbSBpcyByZXR1cm5l ZC5cblxuVGhlIGZvbGxvd2luZyBpdGVtKHMpIGlzL2FyZSBjdXJyZW50bHkgb3ZlcmR1ZTpcblxu PGl0ZW0+Ijw8YmlibGlvLnRpdGxlPj4iIGJ5IDw8YmlibGlvLmF1dGhvcj4+LCA8PGl0ZW1zLml0 ZW1jYWxsbnVtYmVyPj4sIEJhcmNvZGU6IDw8aXRlbXMuYmFyY29kZT4+IEZpbmU6IDxmaW5lPkdC UDwvZmluZT48L2l0ZW0+XG5cblRoYW5rLXlvdSBmb3IgeW91ciBwcm9tcHQgYXR0ZW50aW9uIHRv IHRoaXMgbWF0dGVyLlxuXG48PGJyYW5jaGVzLmJyYW5jaG5hbWU+PiBTdGFmZlxuJyksCiAoJ2Ns YWltYWNxdWlzaXRpb24nLCdBQ1FDTEFJTScsJ0FjcXVpc2l0aW9uIENsYWltJywnSXRlbSBOb3Qg UmVjZWl2ZWQnLCc8PGFxYm9va3NlbGxlcnMubmFtZT4+XHJcbjw8YXFib29rc2VsbGVycy5hZGRy ZXNzMT4+XHJcbjw8YXFib29rc2VsbGVycy5hZGRyZXNzMj4+XHJcbjw8YXFib29rc2VsbGVycy5h ZGRyZXNzMz4+XHJcbjw8YXFib29rc2VsbGVycy5hZGRyZXNzND4+XHJcbjw8YXFib29rc2VsbGVy cy5waG9uZT4+XHJcblxyXG5PcmRlcm51bWJlciA8PGFxb3JkZXJzLm9yZGVybnVtYmVyPj4gKDw8 YXFvcmRlcnMudGl0bGU+PikgKDw8YXFvcmRlcnMucXVhbnRpdHk+PiBvcmRlcmVkKSAoJDw8YXFv cmRlcnMubGlzdHByaWNlPj4gZWFjaCkgaGFzIG5vdCBiZWVuIHJlY2VpdmVkLicpLAogKCdzZXJp YWwnLCdSTElTVCcsJ1JvdXRpbmcgTGlzdCcsJ1NlcmlhbCBpcyBub3cgYXZhaWxhYmxlJywnPDxi b3Jyb3dlcnMuZmlyc3RuYW1lPj4gPDxib3Jyb3dlcnMuc3VybmFtZT4+LFxyXG5cclxuVGhlIGZv bGxvd2luZyBpc3N1ZSBpcyBub3cgYXZhaWxhYmxlOlxyXG5cclxuPDxiaWJsaW8udGl0bGU+Piwg PDxiaWJsaW8uYXV0aG9yPj4gKDw8aXRlbXMuYmFyY29kZT4+KVxyXG5cclxuUGxlYXNlIHBpY2sg aXQgdXAgYXQgeW91ciBjb252ZW5pZW5jZS4nKSwKICgnbWVtYmVycycsJ0FDQ1RERVRBSUxTJywn QWNjb3VudCBEZXRhaWxzIFRlbXBsYXRlIC0gREVGQVVMVCcsJ1lvdXIgbmV3IEtvaGEgYWNjb3Vu dCBkZXRhaWxzLicsJ0hlbGxvIDw8Ym9ycm93ZXJzLnRpdGxlPj4gPDxib3Jyb3dlcnMuZmlyc3Ru YW1lPj4gPDxib3Jyb3dlcnMuc3VybmFtZT4+LlxyXG5cclxuWW91ciBuZXcgS29oYSBhY2NvdW50 IGRldGFpbHMgYXJlOlxyXG5cclxuVXNlcjogIDw8Ym9ycm93ZXJzLnVzZXJpZD4+XHJcblBhc3N3 b3JkOiA8PGJvcnJvd2Vycy5wYXNzd29yZD4+XHJcblxyXG5JZiB5b3UgaGF2ZSBhbnkgcHJvYmxl bXMgb3IgcXVlc3Rpb25zIHJlZ2FyZGluZyB5b3VyIGFjY291bnQsIHBsZWFzZSBjb250YWN0IHlv dXIgS29oYSBBZG1pbmlzdHJhdG9yLlxyXG5cclxuVGhhbmsgeW91LFxyXG5Lb2hhIEFkbWluaXN0 cmF0b3Jcclxua29oYWFkbWluQHlvdXJzaXRlLm9yZycpLCAKICgnY2lyY3VsYXRpb24nLCdEVUUn LCdJdGVtIER1ZSBSZW1pbmRlcicsJ0l0ZW0gRHVlIFJlbWluZGVyJywnRGVhciA8PGJvcnJvd2Vy cy5maXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj4sXHJcblxyXG5UaGUgZm9sbG93aW5n IGl0ZW0gaXMgbm93IGR1ZTpcclxuXHJcbjw8YmlibGlvLnRpdGxlPj4sIDw8YmlibGlvLmF1dGhv cj4+ICg8PGl0ZW1zLmJhcmNvZGU+PiknKSwgCiAoJ2NpcmN1bGF0aW9uJywnRFVFREdTVCcsJ0l0 ZW0gRHVlIFJlbWluZGVyIChEaWdlc3QpJywnSXRlbSBEdWUgUmVtaW5kZXInLCdZb3UgaGF2ZSA8 PGNvdW50Pj4gaXRlbXMgZHVlJyksIAotKCdjaXJjdWxhdGlvbicsJ1BSRURVRScsJ0FkdmFuY2Ug Tm90aWNlIG9mIEl0ZW0gRHVlJywnQWR2YW5jZSBOb3RpY2Ugb2YgSXRlbSBEdWUnLCdEZWFyIDw8 Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5hbWU+PixcclxuXHJcblRoZSBm b2xsb3dpbmcgaXRlbSB3aWxsIGJlIGR1ZSBzb29uOlxyXG5cclxuPDxiaWJsaW8udGl0bGU+Piwg PDxiaWJsaW8uYXV0aG9yPj4gKDw8aXRlbXMuYmFyY29kZT4+KScKLSksIAorKCdjaXJjdWxhdGlv bicsJ1BSRURVRScsJ0FkdmFuY2UgTm90aWNlIG9mIEl0ZW0gRHVlJywnQWR2YW5jZSBOb3RpY2Ug b2YgSXRlbSBEdWUnLCdEZWFyIDw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1 cm5hbWU+PixcclxuXHJcblRoZSBmb2xsb3dpbmcgaXRlbSB3aWxsIGJlIGR1ZSBzb29uOlxyXG5c clxuPDxiaWJsaW8udGl0bGU+PiwgPDxiaWJsaW8uYXV0aG9yPj4gKDw8aXRlbXMuYmFyY29kZT4+ KScpLCAKICgnY2lyY3VsYXRpb24nLCdQUkVEVUVER1NUJywnQWR2YW5jZSBOb3RpY2Ugb2YgSXRl bSBEdWUgKERpZ2VzdCknLCdBZHZhbmNlIE5vdGljZSBvZiBJdGVtIER1ZScsJ1lvdSBoYXZlIDw8 Y291bnQ+PiBpdGVtcyBkdWUgc29vbicpLAotKCdjaXJjdWxhdGlvbicsJ0VWRU5UJywnVXBjb21p bmcgTGlicmFyeSBFdmVudCcsJ1VwY29taW5nIExpYnJhcnkgRXZlbnQnLCdEZWFyIDw8Ym9ycm93 ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5hbWU+PixcclxuXHJcblRoaXMgaXMgYSBy ZW1pbmRlciBvZiBhbiB1cGNvbWluZyBsaWJyYXJ5IGV2ZW50IGluIHdoaWNoIHlvdSBoYXZlIGV4 cHJlc3NlZCBpbnRlcmVzdC4nKSwKICgncmVzZXJ2ZXMnLCAnSE9MRCcsICdIb2xkIEF2YWlsYWJs ZSBmb3IgUGlja3VwJywgJ0hvbGQgQXZhaWxhYmxlIGZvciBQaWNrdXAgYXQgPDxicmFuY2hlcy5i cmFuY2huYW1lPj4nLCAnRGVhciA8PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5z dXJuYW1lPj4sXHJcblxyXG5Zb3UgaGF2ZSBhIGhvbGQgYXZhaWxhYmxlIGZvciBwaWNrdXAgYXMg b2YgPDxyZXNlcnZlcy53YWl0aW5nZGF0ZT4+OlxyXG5cclxuVGl0bGU6IDw8YmlibGlvLnRpdGxl Pj5cclxuQXV0aG9yOiA8PGJpYmxpby5hdXRob3I+PlxyXG5Db3B5OiA8PGl0ZW1zLmNvcHludW1i ZXI+PlxyXG5Mb2NhdGlvbjogPDxicmFuY2hlcy5icmFuY2huYW1lPj5cclxuPDxicmFuY2hlcy5i cmFuY2hhZGRyZXNzMT4+XHJcbjw8YnJhbmNoZXMuYnJhbmNoYWRkcmVzczI+PlxyXG48PGJyYW5j aGVzLmJyYW5jaGFkZHJlc3MzPj5cclxuPDxicmFuY2hlcy5icmFuY2hjaXR5Pj4gPDxicmFuY2hl cy5icmFuY2h6aXA+PicpLAogKCdyZXNlcnZlcycsICdIT0xEX1BSSU5UJywgJ0hvbGQgQXZhaWxh YmxlIGZvciBQaWNrdXAgKHByaW50IG5vdGljZSknLCAnSG9sZCBBdmFpbGFibGUgZm9yIFBpY2t1 cCAocHJpbnQgbm90aWNlKScsICc8PGJyYW5jaGVzLmJyYW5jaG5hbWU+PlxyXG48PGJyYW5jaGVz LmJyYW5jaGFkZHJlc3MxPj5cclxuPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMj4+XHJcblxyXG5c clxuQ2hhbmdlIFNlcnZpY2UgUmVxdWVzdGVkXHJcblxyXG5cclxuXHJcblxyXG5cclxuXHJcblxy XG48PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj5cclxuPDxib3Jy b3dlcnMuYWRkcmVzcz4+XHJcbjw8Ym9ycm93ZXJzLmNpdHk+PiA8PGJvcnJvd2Vycy56aXBjb2Rl Pj5cclxuXHJcblxyXG5cclxuXHJcblxyXG5cclxuXHJcblxyXG5cclxuXHJcbjw8Ym9ycm93ZXJz LmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5hbWU+PiA8PGJvcnJvd2Vycy5jYXJkbnVtYmVy Pj5cclxuXHJcbllvdSBoYXZlIGEgaG9sZCBhdmFpbGFibGUgZm9yIHBpY2t1cCBhcyBvZiA8PHJl c2VydmVzLndhaXRpbmdkYXRlPj46XHJcblxyXG5UaXRsZTogPDxiaWJsaW8udGl0bGU+PlxyXG5B dXRob3I6IDw8YmlibGlvLmF1dGhvcj4+XHJcbkNvcHk6IDw8aXRlbXMuY29weW51bWJlcj4+XHJc bicpLAogKCdjaXJjdWxhdGlvbicsJ0NIRUNLSU4nLCdJdGVtIENoZWNrLWluIChEaWdlc3QpJywn Q2hlY2staW5zJywnVGhlIGZvbGxvd2luZyBpdGVtcyBoYXZlIGJlZW4gY2hlY2tlZCBpbjpcclxu LS0tLVxyXG48PGJpYmxpby50aXRsZT4+XHJcbi0tLS1cclxuVGhhbmsgeW91LicpLApkaWZmIC0t Z2l0IGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvcGwtUEwvb3B0aW9uYWwvc2FtcGxlX25vdGljZXNf bWVzc2FnZV9hdHRyaWJ1dGVzLnNxbCBiL2luc3RhbGxlci9kYXRhL215c3FsL3BsLVBML29wdGlv bmFsL3NhbXBsZV9ub3RpY2VzX21lc3NhZ2VfYXR0cmlidXRlcy5zcWwKaW5kZXggNWQxZWNiNi4u ZDJkOTdhYSAxMDA2NDQKLS0tIGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvcGwtUEwvb3B0aW9uYWwv c2FtcGxlX25vdGljZXNfbWVzc2FnZV9hdHRyaWJ1dGVzLnNxbAorKysgYi9pbnN0YWxsZXIvZGF0 YS9teXNxbC9wbC1QTC9vcHRpb25hbC9zYW1wbGVfbm90aWNlc19tZXNzYWdlX2F0dHJpYnV0ZXMu c3FsCkBAIC0xLDkgKzEsOCBAQAotaW5zZXJ0IGludG8gYG1lc3NhZ2VfYXR0cmlidXRlc2AKK++7 v2luc2VydCBpbnRvIGBtZXNzYWdlX2F0dHJpYnV0ZXNgCiAoYG1lc3NhZ2VfYXR0cmlidXRlX2lk YCwgbWVzc2FnZV9uYW1lLCBgdGFrZXNfZGF5c2ApCiB2YWx1ZXMKICgxLCAnSXRlbSBEVUUnLCAw KSwKICgyLCAnQWR2YW5jZSBOb3RpY2UnLCAxKSwKLSgzLCAnVXBjb21pbmcgRXZlbnRzJywgMSks CiAoNCwgJ0hvbGQgRmlsbGVkJywgMCksCiAoNSwgJ0l0ZW0gQ2hlY2staW4nLCAwKSwKICg2LCAn SXRlbSBDaGVja291dCcsIDApOwpkaWZmIC0tZ2l0IGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvcnUt UlUvbWFuZGF0b3J5L3NhbXBsZV9ub3RpY2VzLnNxbCBiL2luc3RhbGxlci9kYXRhL215c3FsL3J1 LVJVL21hbmRhdG9yeS9zYW1wbGVfbm90aWNlcy5zcWwKaW5kZXggNjY5NDdmMi4uMDc3N2Y4NSAx MDA2NDQKLS0tIGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvcnUtUlUvbWFuZGF0b3J5L3NhbXBsZV9u b3RpY2VzLnNxbAorKysgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC9ydS1SVS9tYW5kYXRvcnkvc2Ft cGxlX25vdGljZXMuc3FsCkBAIC0xLDE0ICsxLDEyIEBACi1JTlNFUlQgSU5UTyBgbGV0dGVyYCAo bW9kdWxlLCBjb2RlLCBuYW1lLCB0aXRsZSwgY29udGVudCkgCivvu79JTlNFUlQgSU5UTyBgbGV0 dGVyYCAobW9kdWxlLCBjb2RlLCBuYW1lLCB0aXRsZSwgY29udGVudCkgCiBWQUxVRVMgKCdjaXJj dWxhdGlvbicsJ09EVUUnLCdPdmVyZHVlIE5vdGljZScsJ0l0ZW0gT3ZlcmR1ZScsJ0RlYXIgPDxi b3Jyb3dlcnMuZmlyc3RuYW1lPj4gPDxib3Jyb3dlcnMuc3VybmFtZT4+LFxuXG5BY2NvcmRpbmcg dG8gb3VyIGN1cnJlbnQgcmVjb3JkcywgeW91IGhhdmUgaXRlbXMgdGhhdCBhcmUgb3ZlcmR1ZS5Z b3VyIGxpYnJhcnkgZG9lcyBub3QgY2hhcmdlIGxhdGUgZmluZXMsIGJ1dCBwbGVhc2UgcmV0dXJu IG9yIHJlbmV3IHRoZW0gYXQgdGhlIGJyYW5jaCBiZWxvdyBhcyBzb29uIGFzIHBvc3NpYmxlLlxu XG48PGJyYW5jaGVzLmJyYW5jaG5hbWU+PlxuPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMT4+XG48 PGJyYW5jaGVzLmJyYW5jaGFkZHJlc3MyPj4gPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMz4+XG5Q aG9uZTogPDxicmFuY2hlcy5icmFuY2hwaG9uZT4+XG5GYXg6IDw8YnJhbmNoZXMuYnJhbmNoZmF4 Pj5cbkVtYWlsOiA8PGJyYW5jaGVzLmJyYW5jaGVtYWlsPj5cblxuSWYgeW91IGhhdmUgcmVnaXN0 ZXJlZCBhIHBhc3N3b3JkIHdpdGggdGhlIGxpYnJhcnksIGFuZCB5b3UgaGF2ZSBhIHJlbmV3YWwg YXZhaWxhYmxlLCB5b3UgbWF5IHJlbmV3IG9ubGluZS4gSWYgYW4gaXRlbSBiZWNvbWVzIG1vcmUg dGhhbiAzMCBkYXlzIG92ZXJkdWUsIHlvdSB3aWxsIGJlIHVuYWJsZSB0byB1c2UgeW91ciBsaWJy YXJ5IGNhcmQgdW50aWwgdGhlIGl0ZW0gaXMgcmV0dXJuZWQuXG5cblRoZSBmb2xsb3dpbmcgaXRl bShzKSBpcy9hcmUgY3VycmVudGx5IG92ZXJkdWU6XG5cbjxpdGVtPiI8PGJpYmxpby50aXRsZT4+ IiBieSA8PGJpYmxpby5hdXRob3I+PiwgPDxpdGVtcy5pdGVtY2FsbG51bWJlcj4+LCBCYXJjb2Rl OiA8PGl0ZW1zLmJhcmNvZGU+PiBGaW5lOiA8ZmluZT5HQlA8L2ZpbmU+PC9pdGVtPlxuXG5UaGFu ay15b3UgZm9yIHlvdXIgcHJvbXB0IGF0dGVudGlvbiB0byB0aGlzIG1hdHRlci5cblxuPDxicmFu Y2hlcy5icmFuY2huYW1lPj4gU3RhZmZcbicpLAogKCdjbGFpbWFjcXVpc2l0aW9uJywnQUNRQ0xB SU0nLCdBY3F1aXNpdGlvbiBDbGFpbScsJ0l0ZW0gTm90IFJlY2VpdmVkJywnPDxhcWJvb2tzZWxs ZXJzLm5hbWU+PlxyXG48PGFxYm9va3NlbGxlcnMuYWRkcmVzczE+PlxyXG48PGFxYm9va3NlbGxl cnMuYWRkcmVzczI+PlxyXG48PGFxYm9va3NlbGxlcnMuYWRkcmVzczM+PlxyXG48PGFxYm9va3Nl bGxlcnMuYWRkcmVzczQ+PlxyXG48PGFxYm9va3NlbGxlcnMucGhvbmU+PlxyXG5cclxuT3JkZXJu dW1iZXIgPDxhcW9yZGVycy5vcmRlcm51bWJlcj4+ICg8PGFxb3JkZXJzLnRpdGxlPj4pICg8PGFx b3JkZXJzLnF1YW50aXR5Pj4gb3JkZXJlZCkgKCQ8PGFxb3JkZXJzLmxpc3RwcmljZT4+IGVhY2gp IGhhcyBub3QgYmVlbiByZWNlaXZlZC4nKSwKICgnc2VyaWFsJywnUkxJU1QnLCdSb3V0aW5nIExp c3QnLCdTZXJpYWwgaXMgbm93IGF2YWlsYWJsZScsJzw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8 Ym9ycm93ZXJzLnN1cm5hbWU+PixcclxuXHJcblRoZSBmb2xsb3dpbmcgaXNzdWUgaXMgbm93IGF2 YWlsYWJsZTpcclxuXHJcbjw8YmlibGlvLnRpdGxlPj4sIDw8YmlibGlvLmF1dGhvcj4+ICg8PGl0 ZW1zLmJhcmNvZGU+PilcclxuXHJcblBsZWFzZSBwaWNrIGl0IHVwIGF0IHlvdXIgY29udmVuaWVu Y2UuJyksCiAoJ21lbWJlcnMnLCdBQ0NUREVUQUlMUycsJ0FjY291bnQgRGV0YWlscyBUZW1wbGF0 ZSAtIERFRkFVTFQnLCdZb3VyIG5ldyBLb2hhIGFjY291bnQgZGV0YWlscy4nLCdIZWxsbyA8PGJv cnJvd2Vycy50aXRsZT4+IDw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5h bWU+Pi5cclxuXHJcbllvdXIgbmV3IEtvaGEgYWNjb3VudCBkZXRhaWxzIGFyZTpcclxuXHJcblVz ZXI6ICA8PGJvcnJvd2Vycy51c2VyaWQ+PlxyXG5QYXNzd29yZDogPDxib3Jyb3dlcnMucGFzc3dv cmQ+PlxyXG5cclxuSWYgeW91IGhhdmUgYW55IHByb2JsZW1zIG9yIHF1ZXN0aW9ucyByZWdhcmRp bmcgeW91ciBhY2NvdW50LCBwbGVhc2UgY29udGFjdCB5b3VyIEtvaGEgQWRtaW5pc3RyYXRvci5c clxuXHJcblRoYW5rIHlvdSxcclxuS29oYSBBZG1pbmlzdHJhdG9yXHJcbmtvaGFhZG1pbkB5b3Vy c2l0ZS5vcmcnKSwgCiAoJ2NpcmN1bGF0aW9uJywnRFVFJywnSXRlbSBEdWUgUmVtaW5kZXInLCdJ dGVtIER1ZSBSZW1pbmRlcicsJ0RlYXIgPDxib3Jyb3dlcnMuZmlyc3RuYW1lPj4gPDxib3Jyb3dl cnMuc3VybmFtZT4+LFxyXG5cclxuVGhlIGZvbGxvd2luZyBpdGVtIGlzIG5vdyBkdWU6XHJcblxy XG48PGJpYmxpby50aXRsZT4+LCA8PGJpYmxpby5hdXRob3I+PiAoPDxpdGVtcy5iYXJjb2RlPj4p JyksIAogKCdjaXJjdWxhdGlvbicsJ0RVRURHU1QnLCdJdGVtIER1ZSBSZW1pbmRlciAoRGlnZXN0 KScsJ0l0ZW0gRHVlIFJlbWluZGVyJywnWW91IGhhdmUgPDxjb3VudD4+IGl0ZW1zIGR1ZScpLCAK LSgnY2lyY3VsYXRpb24nLCdQUkVEVUUnLCdBZHZhbmNlIE5vdGljZSBvZiBJdGVtIER1ZScsJ0Fk dmFuY2UgTm90aWNlIG9mIEl0ZW0gRHVlJywnRGVhciA8PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8 PGJvcnJvd2Vycy5zdXJuYW1lPj4sXHJcblxyXG5UaGUgZm9sbG93aW5nIGl0ZW0gd2lsbCBiZSBk dWUgc29vbjpcclxuXHJcbjw8YmlibGlvLnRpdGxlPj4sIDw8YmlibGlvLmF1dGhvcj4+ICg8PGl0 ZW1zLmJhcmNvZGU+PiknCi0pLCAKKygnY2lyY3VsYXRpb24nLCdQUkVEVUUnLCdBZHZhbmNlIE5v dGljZSBvZiBJdGVtIER1ZScsJ0FkdmFuY2UgTm90aWNlIG9mIEl0ZW0gRHVlJywnRGVhciA8PGJv cnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj4sXHJcblxyXG5UaGUgZm9s bG93aW5nIGl0ZW0gd2lsbCBiZSBkdWUgc29vbjpcclxuXHJcbjw8YmlibGlvLnRpdGxlPj4sIDw8 YmlibGlvLmF1dGhvcj4+ICg8PGl0ZW1zLmJhcmNvZGU+PiknKSwgCiAoJ2NpcmN1bGF0aW9uJywn UFJFRFVFREdTVCcsJ0FkdmFuY2UgTm90aWNlIG9mIEl0ZW0gRHVlIChEaWdlc3QpJywnQWR2YW5j ZSBOb3RpY2Ugb2YgSXRlbSBEdWUnLCdZb3UgaGF2ZSA8PGNvdW50Pj4gaXRlbXMgZHVlIHNvb24n KSwKLSgnY2lyY3VsYXRpb24nLCdFVkVOVCcsJ1VwY29taW5nIExpYnJhcnkgRXZlbnQnLCdVcGNv bWluZyBMaWJyYXJ5IEV2ZW50JywnRGVhciA8PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJv d2Vycy5zdXJuYW1lPj4sXHJcblxyXG5UaGlzIGlzIGEgcmVtaW5kZXIgb2YgYW4gdXBjb21pbmcg bGlicmFyeSBldmVudCBpbiB3aGljaCB5b3UgaGF2ZSBleHByZXNzZWQgaW50ZXJlc3QuJyksCiAo J3Jlc2VydmVzJywgJ0hPTEQnLCAnSG9sZCBBdmFpbGFibGUgZm9yIFBpY2t1cCcsICdIb2xkIEF2 YWlsYWJsZSBmb3IgUGlja3VwIGF0IDw8YnJhbmNoZXMuYnJhbmNobmFtZT4+JywgJ0RlYXIgPDxi b3Jyb3dlcnMuZmlyc3RuYW1lPj4gPDxib3Jyb3dlcnMuc3VybmFtZT4+LFxyXG5cclxuWW91IGhh dmUgYSBob2xkIGF2YWlsYWJsZSBmb3IgcGlja3VwIGFzIG9mIDw8cmVzZXJ2ZXMud2FpdGluZ2Rh dGU+PjpcclxuXHJcblRpdGxlOiA8PGJpYmxpby50aXRsZT4+XHJcbkF1dGhvcjogPDxiaWJsaW8u YXV0aG9yPj5cclxuQ29weTogPDxpdGVtcy5jb3B5bnVtYmVyPj5cclxuTG9jYXRpb246IDw8YnJh bmNoZXMuYnJhbmNobmFtZT4+XHJcbjw8YnJhbmNoZXMuYnJhbmNoYWRkcmVzczE+PlxyXG48PGJy YW5jaGVzLmJyYW5jaGFkZHJlc3MyPj5cclxuPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMz4+XHJc bjw8YnJhbmNoZXMuYnJhbmNoY2l0eT4+IDw8YnJhbmNoZXMuYnJhbmNoemlwPj4nKSwKICgncmVz ZXJ2ZXMnLCAnSE9MRF9QUklOVCcsICdIb2xkIEF2YWlsYWJsZSBmb3IgUGlja3VwIChwcmludCBu b3RpY2UpJywgJ0hvbGQgQXZhaWxhYmxlIGZvciBQaWNrdXAgKHByaW50IG5vdGljZSknLCAnPDxi cmFuY2hlcy5icmFuY2huYW1lPj5cclxuPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMT4+XHJcbjw8 YnJhbmNoZXMuYnJhbmNoYWRkcmVzczI+PlxyXG5cclxuXHJcbkNoYW5nZSBTZXJ2aWNlIFJlcXVl c3RlZFxyXG5cclxuXHJcblxyXG5cclxuXHJcblxyXG5cclxuPDxib3Jyb3dlcnMuZmlyc3RuYW1l Pj4gPDxib3Jyb3dlcnMuc3VybmFtZT4+XHJcbjw8Ym9ycm93ZXJzLmFkZHJlc3M+PlxyXG48PGJv cnJvd2Vycy5jaXR5Pj4gPDxib3Jyb3dlcnMuemlwY29kZT4+XHJcblxyXG5cclxuXHJcblxyXG5c clxuXHJcblxyXG5cclxuXHJcblxyXG48PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJvd2Vy cy5zdXJuYW1lPj4gPDxib3Jyb3dlcnMuY2FyZG51bWJlcj4+XHJcblxyXG5Zb3UgaGF2ZSBhIGhv bGQgYXZhaWxhYmxlIGZvciBwaWNrdXAgYXMgb2YgPDxyZXNlcnZlcy53YWl0aW5nZGF0ZT4+Olxy XG5cclxuVGl0bGU6IDw8YmlibGlvLnRpdGxlPj5cclxuQXV0aG9yOiA8PGJpYmxpby5hdXRob3I+ PlxyXG5Db3B5OiA8PGl0ZW1zLmNvcHludW1iZXI+PlxyXG4nKSwKICgnY2lyY3VsYXRpb24nLCdD SEVDS0lOJywnSXRlbSBDaGVjay1pbiAoRGlnZXN0KScsJ0NoZWNrLWlucycsJ1RoZSBmb2xsb3dp bmcgaXRlbXMgaGF2ZSBiZWVuIGNoZWNrZWQgaW46XHJcbi0tLS1cclxuPDxiaWJsaW8udGl0bGU+ PlxyXG4tLS0tXHJcblRoYW5rIHlvdS4nKSwKZGlmZiAtLWdpdCBhL2luc3RhbGxlci9kYXRhL215 c3FsL3J1LVJVL29wdGlvbmFsL3NhbXBsZV9ub3RpY2VzLnNxbCBiL2luc3RhbGxlci9kYXRhL215 c3FsL3J1LVJVL29wdGlvbmFsL3NhbXBsZV9ub3RpY2VzLnNxbAppbmRleCBmMDZlMzAzLi43YmU4 MDBhIDEwMDY0NAotLS0gYS9pbnN0YWxsZXIvZGF0YS9teXNxbC9ydS1SVS9vcHRpb25hbC9zYW1w bGVfbm90aWNlcy5zcWwKKysrIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvcnUtUlUvb3B0aW9uYWwv c2FtcGxlX25vdGljZXMuc3FsCkBAIC0xLDQgKzEsNCBAQAotdHJ1bmNhdGUgbGV0dGVyOwor77u/ dHJ1bmNhdGUgbGV0dGVyOwogCiBJTlNFUlQgSU5UTyBgbGV0dGVyYAogKG1vZHVsZSwgY29kZSwg bmFtZSwgdGl0bGUsIGNvbnRlbnQpCkBAIC0xOSw4ICsxOSw2IEBAIFZBTFVFUwogCiAoJ2NpcmN1 bGF0aW9uJywnUFJFRFVFREdTVCcsJ9Cf0YDQtdC00LLQsNGA0LjRgtC10LvRjNC90L7QtSDRg9Cy 0LXQtNC+0LzQu9C10L3QuNC1INC+INC30LDQtNC+0LvQttC10L3QvdC+0YHRgtC4INC10LTQuNC9 0LjRhtGLICjRgdCx0L7RgNC90LjQuiknLCfQn9GA0LXQtNCy0LDRgNC40YLQtdC70YzQvdC+0LUg 0YPQstC10LTQvtC80LvQtdC90LjQtSDQviDQt9Cw0LTQvtC70LbQtdC90L3QvtGB0YLQuCDQtdC0 0LjQvdC40YbRiycsJ9CSINCx0LvQuNC20LDQudGI0LXQvCDQstGA0LXQvNC10L3QuCDQktCw0Lwg 0L3Rg9C20L3QviDQstC+0LfQstGA0LDRgtC40YLRjCA8PGNvdW50Pj4g0LXQtNC40L3QuNGGJyks CiAKLSgnY2lyY3VsYXRpb24nLCdFVkVOVCcsJ9Cf0YDQtdC00YHRgtC+0Y/RidC10LUg0LHQuNCx 0LvQuNC+0YLQtdGH0L3QvtC1INGB0L7QsdGL0YLQuNC1Jywn0J/RgNC10LTRgdGC0L7Rj9GJ0LXQ tSDQsdC40LHQu9C40L7RgtC10YfQvdC+0LUg0YHQvtCx0YvRgtC40LUnLCfQm9GO0LHQtdC30L3R i9C5IDw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5hbWU+PixcclxuXHJc btCt0YLQviDQvdCw0L/QvtC80LjQvdCw0L3QuNC1INC+INC/0YDQtdC00YHRgtC+0Y/RidC10Lwg 0LHQuNCx0LvQuNC+0YLQtdGH0L3QvtC8INGB0L7QsdGL0YLQuNC4LCDQsiDQutC+0YLQvtGA0L7Q vCDQktGLINC/0YDQvtGP0LLQuNC70Lgg0LjQvdGC0LXRgNC10YEuJyksCi0KICgncmVzZXJ2ZXMn LCAnSE9MRCcsICdIb2xkIEF2YWlsYWJsZSBmb3IgUGlja3VwJywgJ0hvbGQgQXZhaWxhYmxlIGZv ciBQaWNrdXAgYXQgPDxicmFuY2hlcy5icmFuY2huYW1lPj4nLCAnRGVhciA8PGJvcnJvd2Vycy5m aXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj4sXHJcblxyXG5Zb3UgaGF2ZSBhIGhvbGQg YXZhaWxhYmxlIGZvciBwaWNrdXAgYXMgb2YgPDxyZXNlcnZlcy53YWl0aW5nZGF0ZT4+OlxyXG5c clxuVGl0bGU6IDw8YmlibGlvLnRpdGxlPj5cclxuQXV0aG9yOiA8PGJpYmxpby5hdXRob3I+Plxy XG5Db3B5OiA8PGl0ZW1zLmNvcHludW1iZXI+PlxyXG5Mb2NhdGlvbjogPDxicmFuY2hlcy5icmFu Y2huYW1lPj5cclxuPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMT4+XHJcbjw8YnJhbmNoZXMuYnJh bmNoYWRkcmVzczI+PlxyXG48PGJyYW5jaGVzLmJyYW5jaGFkZHJlc3MzPj4nKSwKIAogKCdjaXJj dWxhdGlvbicsJ0NIRUNLSU4nLCdJdGVtIENoZWNrLWluIChEaWdlc3QpJywnQ2hlY2staW5zJywn VGhlIGZvbGxvd2luZyBpdGVtcyBoYXZlIGJlZW4gY2hlY2tlZCBpbjpcclxuLS0tLVxyXG48PGJp Ymxpby50aXRsZT4+XHJcbi0tLS1cclxuVGhhbmsgeW91LicpLApkaWZmIC0tZ2l0IGEvaW5zdGFs bGVyL2RhdGEvbXlzcWwvcnUtUlUvb3B0aW9uYWwvc2FtcGxlX25vdGljZXNfbWVzc2FnZV9hdHRy aWJ1dGVzLnNxbCBiL2luc3RhbGxlci9kYXRhL215c3FsL3J1LVJVL29wdGlvbmFsL3NhbXBsZV9u b3RpY2VzX21lc3NhZ2VfYXR0cmlidXRlcy5zcWwKaW5kZXggY2ZjNDc0MC4uMzljM2RmMyAxMDA2 NDQKLS0tIGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvcnUtUlUvb3B0aW9uYWwvc2FtcGxlX25vdGlj ZXNfbWVzc2FnZV9hdHRyaWJ1dGVzLnNxbAorKysgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC9ydS1S VS9vcHRpb25hbC9zYW1wbGVfbm90aWNlc19tZXNzYWdlX2F0dHJpYnV0ZXMuc3FsCkBAIC0xLDEx ICsxLDEwIEBACi10cnVuY2F0ZSBtZXNzYWdlX2F0dHJpYnV0ZXM7Civvu790cnVuY2F0ZSBtZXNz YWdlX2F0dHJpYnV0ZXM7CiAKIGluc2VydCBpbnRvIGBtZXNzYWdlX2F0dHJpYnV0ZXNgCiAoYG1l c3NhZ2VfYXR0cmlidXRlX2lkYCwgbWVzc2FnZV9uYW1lLCBgdGFrZXNfZGF5c2ApCiB2YWx1ZXMK ICgxLCAn0JXQtNC40L3QuNGG0LAg0LfQsNC00L7Qu9C20LXQvdCwJywgICAgICAgICAgIDApLAog KDIsICfQn9GA0LXQtNCy0LDRgNC40YLQtdC70YzQvdC+0LUg0YPQstC10LTQvtC80LvQtdC90LjQ tScsIDEpLAotKDMsICfQn9GA0LXQtNGB0YLQvtGP0YnQuNC1INGB0L7QsdGL0YLQuNGPJywgICAg ICAgICAxKSwKICg0LCAnSG9sZCBGaWxsZWQnLCAgICAgICAgICAgICAgICAgMCksCiAoNSwgJ0l0 ZW0gQ2hlY2staW4nLCAgICAgICAgICAgICAgIDApLAogKDYsICdJdGVtIENoZWNrb3V0JywgICAg ICAgICAgICAgICAwKTsKZGlmZiAtLWdpdCBhL2luc3RhbGxlci9kYXRhL215c3FsL3VrLVVBL21h bmRhdG9yeS9zYW1wbGVfbm90aWNlcy5zcWwgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC91ay1VQS9t YW5kYXRvcnkvc2FtcGxlX25vdGljZXMuc3FsCmluZGV4IDlkYTM5MGUuLmEyNTY5YjUgMTAwNjQ0 Ci0tLSBhL2luc3RhbGxlci9kYXRhL215c3FsL3VrLVVBL21hbmRhdG9yeS9zYW1wbGVfbm90aWNl cy5zcWwKKysrIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvdWstVUEvbWFuZGF0b3J5L3NhbXBsZV9u b3RpY2VzLnNxbApAQCAtMSwxNCArMSwxMiBAQAotSU5TRVJUIElOVE8gYGxldHRlcmAgKG1vZHVs ZSwgY29kZSwgbmFtZSwgdGl0bGUsIGNvbnRlbnQpIAor77u/SU5TRVJUIElOVE8gYGxldHRlcmAg KG1vZHVsZSwgY29kZSwgbmFtZSwgdGl0bGUsIGNvbnRlbnQpIAogVkFMVUVTICgnY2lyY3VsYXRp b24nLCdPRFVFJywnT3ZlcmR1ZSBOb3RpY2UnLCdJdGVtIE92ZXJkdWUnLCdEZWFyIDw8Ym9ycm93 ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5hbWU+PixcblxuQWNjb3JkaW5nIHRvIG91 ciBjdXJyZW50IHJlY29yZHMsIHlvdSBoYXZlIGl0ZW1zIHRoYXQgYXJlIG92ZXJkdWUuWW91ciBs aWJyYXJ5IGRvZXMgbm90IGNoYXJnZSBsYXRlIGZpbmVzLCBidXQgcGxlYXNlIHJldHVybiBvciBy ZW5ldyB0aGVtIGF0IHRoZSBicmFuY2ggYmVsb3cgYXMgc29vbiBhcyBwb3NzaWJsZS5cblxuPDxi cmFuY2hlcy5icmFuY2huYW1lPj5cbjw8YnJhbmNoZXMuYnJhbmNoYWRkcmVzczE+PlxuPDxicmFu Y2hlcy5icmFuY2hhZGRyZXNzMj4+IDw8YnJhbmNoZXMuYnJhbmNoYWRkcmVzczM+PlxuUGhvbmU6 IDw8YnJhbmNoZXMuYnJhbmNocGhvbmU+PlxuRmF4OiA8PGJyYW5jaGVzLmJyYW5jaGZheD4+XG5F bWFpbDogPDxicmFuY2hlcy5icmFuY2hlbWFpbD4+XG5cbklmIHlvdSBoYXZlIHJlZ2lzdGVyZWQg YSBwYXNzd29yZCB3aXRoIHRoZSBsaWJyYXJ5LCBhbmQgeW91IGhhdmUgYSByZW5ld2FsIGF2YWls YWJsZSwgeW91IG1heSByZW5ldyBvbmxpbmUuIElmIGFuIGl0ZW0gYmVjb21lcyBtb3JlIHRoYW4g MzAgZGF5cyBvdmVyZHVlLCB5b3Ugd2lsbCBiZSB1bmFibGUgdG8gdXNlIHlvdXIgbGlicmFyeSBj YXJkIHVudGlsIHRoZSBpdGVtIGlzIHJldHVybmVkLlxuXG5UaGUgZm9sbG93aW5nIGl0ZW0ocykg aXMvYXJlIGN1cnJlbnRseSBvdmVyZHVlOlxuXG48aXRlbT4iPDxiaWJsaW8udGl0bGU+PiIgYnkg PDxiaWJsaW8uYXV0aG9yPj4sIDw8aXRlbXMuaXRlbWNhbGxudW1iZXI+PiwgQmFyY29kZTogPDxp dGVtcy5iYXJjb2RlPj4gRmluZTogPGZpbmU+R0JQPC9maW5lPjwvaXRlbT5cblxuVGhhbmsteW91 IGZvciB5b3VyIHByb21wdCBhdHRlbnRpb24gdG8gdGhpcyBtYXR0ZXIuXG5cbjw8YnJhbmNoZXMu YnJhbmNobmFtZT4+IFN0YWZmXG4nKSwKICgnY2xhaW1hY3F1aXNpdGlvbicsJ0FDUUNMQUlNJywn QWNxdWlzaXRpb24gQ2xhaW0nLCdJdGVtIE5vdCBSZWNlaXZlZCcsJzw8YXFib29rc2VsbGVycy5u YW1lPj5cclxuPDxhcWJvb2tzZWxsZXJzLmFkZHJlc3MxPj5cclxuPDxhcWJvb2tzZWxsZXJzLmFk ZHJlc3MyPj5cclxuPDxhcWJvb2tzZWxsZXJzLmFkZHJlc3MzPj5cclxuPDxhcWJvb2tzZWxsZXJz LmFkZHJlc3M0Pj5cclxuPDxhcWJvb2tzZWxsZXJzLnBob25lPj5cclxuXHJcbk9yZGVybnVtYmVy IDw8YXFvcmRlcnMub3JkZXJudW1iZXI+PiAoPDxhcW9yZGVycy50aXRsZT4+KSAoPDxhcW9yZGVy cy5xdWFudGl0eT4+IG9yZGVyZWQpICgkPDxhcW9yZGVycy5saXN0cHJpY2U+PiBlYWNoKSBoYXMg bm90IGJlZW4gcmVjZWl2ZWQuJyksCiAoJ3NlcmlhbCcsJ1JMSVNUJywnUm91dGluZyBMaXN0Jywn U2VyaWFsIGlzIG5vdyBhdmFpbGFibGUnLCc8PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJv d2Vycy5zdXJuYW1lPj4sXHJcblxyXG5UaGUgZm9sbG93aW5nIGlzc3VlIGlzIG5vdyBhdmFpbGFi bGU6XHJcblxyXG48PGJpYmxpby50aXRsZT4+LCA8PGJpYmxpby5hdXRob3I+PiAoPDxpdGVtcy5i YXJjb2RlPj4pXHJcblxyXG5QbGVhc2UgcGljayBpdCB1cCBhdCB5b3VyIGNvbnZlbmllbmNlLicp LAogKCdtZW1iZXJzJywnQUNDVERFVEFJTFMnLCdBY2NvdW50IERldGFpbHMgVGVtcGxhdGUgLSBE RUZBVUxUJywnWW91ciBuZXcgS29oYSBhY2NvdW50IGRldGFpbHMuJywnSGVsbG8gPDxib3Jyb3dl cnMudGl0bGU+PiA8PGJvcnJvd2Vycy5maXJzdG5hbWU+PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj4u XHJcblxyXG5Zb3VyIG5ldyBLb2hhIGFjY291bnQgZGV0YWlscyBhcmU6XHJcblxyXG5Vc2VyOiAg PDxib3Jyb3dlcnMudXNlcmlkPj5cclxuUGFzc3dvcmQ6IDw8Ym9ycm93ZXJzLnBhc3N3b3JkPj5c clxuXHJcbklmIHlvdSBoYXZlIGFueSBwcm9ibGVtcyBvciBxdWVzdGlvbnMgcmVnYXJkaW5nIHlv dXIgYWNjb3VudCwgcGxlYXNlIGNvbnRhY3QgeW91ciBLb2hhIEFkbWluaXN0cmF0b3IuXHJcblxy XG5UaGFuayB5b3UsXHJcbktvaGEgQWRtaW5pc3RyYXRvclxyXG5rb2hhYWRtaW5AeW91cnNpdGUu b3JnJyksIAogKCdjaXJjdWxhdGlvbicsJ0RVRScsJ0l0ZW0gRHVlIFJlbWluZGVyJywnSXRlbSBE dWUgUmVtaW5kZXInLCdEZWFyIDw8Ym9ycm93ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1 cm5hbWU+PixcclxuXHJcblRoZSBmb2xsb3dpbmcgaXRlbSBpcyBub3cgZHVlOlxyXG5cclxuPDxi aWJsaW8udGl0bGU+PiwgPDxiaWJsaW8uYXV0aG9yPj4gKDw8aXRlbXMuYmFyY29kZT4+KScpLCAK ICgnY2lyY3VsYXRpb24nLCdEVUVER1NUJywnSXRlbSBEdWUgUmVtaW5kZXIgKERpZ2VzdCknLCdJ dGVtIER1ZSBSZW1pbmRlcicsJ1lvdSBoYXZlIDw8Y291bnQ+PiBpdGVtcyBkdWUnKSwgCi0oJ2Np cmN1bGF0aW9uJywnUFJFRFVFJywnQWR2YW5jZSBOb3RpY2Ugb2YgSXRlbSBEdWUnLCdBZHZhbmNl IE5vdGljZSBvZiBJdGVtIER1ZScsJ0RlYXIgPDxib3Jyb3dlcnMuZmlyc3RuYW1lPj4gPDxib3Jy b3dlcnMuc3VybmFtZT4+LFxyXG5cclxuVGhlIGZvbGxvd2luZyBpdGVtIHdpbGwgYmUgZHVlIHNv b246XHJcblxyXG48PGJpYmxpby50aXRsZT4+LCA8PGJpYmxpby5hdXRob3I+PiAoPDxpdGVtcy5i YXJjb2RlPj4pJwotKSwgCisoJ2NpcmN1bGF0aW9uJywnUFJFRFVFJywnQWR2YW5jZSBOb3RpY2Ug b2YgSXRlbSBEdWUnLCdBZHZhbmNlIE5vdGljZSBvZiBJdGVtIER1ZScsJ0RlYXIgPDxib3Jyb3dl cnMuZmlyc3RuYW1lPj4gPDxib3Jyb3dlcnMuc3VybmFtZT4+LFxyXG5cclxuVGhlIGZvbGxvd2lu ZyBpdGVtIHdpbGwgYmUgZHVlIHNvb246XHJcblxyXG48PGJpYmxpby50aXRsZT4+LCA8PGJpYmxp by5hdXRob3I+PiAoPDxpdGVtcy5iYXJjb2RlPj4pJyksIAogKCdjaXJjdWxhdGlvbicsJ1BSRURV RURHU1QnLCdBZHZhbmNlIE5vdGljZSBvZiBJdGVtIER1ZSAoRGlnZXN0KScsJ0FkdmFuY2UgTm90 aWNlIG9mIEl0ZW0gRHVlJywnWW91IGhhdmUgPDxjb3VudD4+IGl0ZW1zIGR1ZSBzb29uJyksCi0o J2NpcmN1bGF0aW9uJywnRVZFTlQnLCdVcGNvbWluZyBMaWJyYXJ5IEV2ZW50JywnVXBjb21pbmcg TGlicmFyeSBFdmVudCcsJ0RlYXIgPDxib3Jyb3dlcnMuZmlyc3RuYW1lPj4gPDxib3Jyb3dlcnMu c3VybmFtZT4+LFxyXG5cclxuVGhpcyBpcyBhIHJlbWluZGVyIG9mIGFuIHVwY29taW5nIGxpYnJh cnkgZXZlbnQgaW4gd2hpY2ggeW91IGhhdmUgZXhwcmVzc2VkIGludGVyZXN0LicpLAogKCdyZXNl cnZlcycsICdIT0xEJywgJ0hvbGQgQXZhaWxhYmxlIGZvciBQaWNrdXAnLCAnSG9sZCBBdmFpbGFi bGUgZm9yIFBpY2t1cCBhdCA8PGJyYW5jaGVzLmJyYW5jaG5hbWU+PicsICdEZWFyIDw8Ym9ycm93 ZXJzLmZpcnN0bmFtZT4+IDw8Ym9ycm93ZXJzLnN1cm5hbWU+PixcclxuXHJcbllvdSBoYXZlIGEg aG9sZCBhdmFpbGFibGUgZm9yIHBpY2t1cCBhcyBvZiA8PHJlc2VydmVzLndhaXRpbmdkYXRlPj46 XHJcblxyXG5UaXRsZTogPDxiaWJsaW8udGl0bGU+PlxyXG5BdXRob3I6IDw8YmlibGlvLmF1dGhv cj4+XHJcbkNvcHk6IDw8aXRlbXMuY29weW51bWJlcj4+XHJcbkxvY2F0aW9uOiA8PGJyYW5jaGVz LmJyYW5jaG5hbWU+PlxyXG48PGJyYW5jaGVzLmJyYW5jaGFkZHJlc3MxPj5cclxuPDxicmFuY2hl cy5icmFuY2hhZGRyZXNzMj4+XHJcbjw8YnJhbmNoZXMuYnJhbmNoYWRkcmVzczM+PlxyXG48PGJy YW5jaGVzLmJyYW5jaGNpdHk+PiA8PGJyYW5jaGVzLmJyYW5jaHppcD4+JyksCiAoJ2NpcmN1bGF0 aW9uJywnQ0hFQ0tJTicsJ0l0ZW0gQ2hlY2staW4gKERpZ2VzdCknLCdDaGVjay1pbnMnLCdUaGUg Zm9sbG93aW5nIGl0ZW1zIGhhdmUgYmVlbiBjaGVja2VkIGluOlxyXG4tLS0tXHJcbjw8YmlibGlv LnRpdGxlPj5cclxuLS0tLVxyXG5UaGFuayB5b3UuJyksCiAoJ2NpcmN1bGF0aW9uJywnQ0hFQ0tP VVQnLCdJdGVtIENoZWNrLW91dCAoRGlnZXN0KScsJ0NoZWNrb3V0cycsJ1RoZSBmb2xsb3dpbmcg aXRlbXMgaGF2ZSBiZWVuIGNoZWNrZWQgb3V0OlxyXG4tLS0tXHJcbjw8YmlibGlvLnRpdGxlPj5c clxuLS0tLVxyXG5UaGFuayB5b3UgZm9yIHZpc2l0aW5nIDw8YnJhbmNoZXMuYnJhbmNobmFtZT4+ LicpLApkaWZmIC0tZ2l0IGEvaW5zdGFsbGVyL2RhdGEvbXlzcWwvdWstVUEvb3B0aW9uYWwvc2Ft cGxlX25vdGljZXMuc3FsIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvdWstVUEvb3B0aW9uYWwvc2Ft cGxlX25vdGljZXMuc3FsCmluZGV4IDczODk2YmEuLmViOTUwOWUgMTAwNjQ0Ci0tLSBhL2luc3Rh bGxlci9kYXRhL215c3FsL3VrLVVBL29wdGlvbmFsL3NhbXBsZV9ub3RpY2VzLnNxbAorKysgYi9p bnN0YWxsZXIvZGF0YS9teXNxbC91ay1VQS9vcHRpb25hbC9zYW1wbGVfbm90aWNlcy5zcWwKQEAg LTEsNCArMSw0IEBACi10cnVuY2F0ZSBsZXR0ZXI7Civvu790cnVuY2F0ZSBsZXR0ZXI7CiAKIElO U0VSVCBJTlRPIGBsZXR0ZXJgCiAobW9kdWxlLCBjb2RlLCBuYW1lLCB0aXRsZSwgY29udGVudCkK QEAgLTE5LDggKzE5LDYgQEAgVkFMVUVTCiAKICgnY2lyY3VsYXRpb24nLCdQUkVEVUVER1NUJywn 0J/QvtC/0LXRgNC10LTQvdGUINC/0L7QstGW0LTQvtC80LvQtdC90L3RjyDQv9GA0L4g0LfQsNCx 0L7RgNCz0L7QstCw0L3RltGB0YLRjCDQvtC00LjQvdC40YbRliAo0LfQsdGW0YDQutCwKScsJ9Cf 0L7Qv9C10YDQtdC00L3RlCDQv9C+0LLRltC00L7QvNC70LXQvdC90Y8g0L/RgNC+INC30LDQsdC+ 0YDQs9C+0LLQsNC90ZbRgdGC0Ywg0L7QtNC40L3QuNGG0ZYnLCfQkiDQvdCw0LnQsdC70LjQttGH 0L7QvNGDINGH0LDRgdGWINCS0LDQvCDQv9C+0YLRgNGW0LHQvdC+INC/0L7QstC10YDQvdGD0YLQ uCA8PGNvdW50Pj4g0L7QtNC40L3QuNGG0YwnKSwKIAotKCdjaXJjdWxhdGlvbicsJ0VWRU5UJywn 0JzQsNC50LHRg9GC0L3RjyDQsdGW0LHQu9GW0L7RgtC10YfQvdCwINC/0L7QtNGW0Y8nLCfQnNCw 0LnQsdGD0YLQvdGPINCx0ZbQsdC70ZbQvtGC0LXRh9C90LAg0L/QvtC00ZbRjycsJ9CU0L7QsdGA 0L7QtNGW0LkgPDxib3Jyb3dlcnMuZmlyc3RuYW1lPj4gPDxib3Jyb3dlcnMuc3VybmFtZT4+LFxy XG5cclxu0KbQtSDQvdCw0LPQsNC00YPQstCw0L3QvdGPINC/0YDQviDQvNCw0LnQsdGD0YLQvdGO INCx0ZbQsdC70ZbQvtGC0LXRh9C90YMg0L/QvtC00ZbRjiwg0LTQviDRj9C60L7RlyDQktC4INC/ 0YDQvtGP0LLQuNC70Lgg0ZbQvdGC0LXRgNC10YEuJyksCi0KICgncmVzZXJ2ZXMnLCAnSE9MRCcs ICdIb2xkIEF2YWlsYWJsZSBmb3IgUGlja3VwJywgJ0hvbGQgQXZhaWxhYmxlIGZvciBQaWNrdXAg YXQgPDxicmFuY2hlcy5icmFuY2huYW1lPj4nLCAnRGVhciA8PGJvcnJvd2Vycy5maXJzdG5hbWU+ PiA8PGJvcnJvd2Vycy5zdXJuYW1lPj4sXHJcblxyXG5Zb3UgaGF2ZSBhIGhvbGQgYXZhaWxhYmxl IGZvciBwaWNrdXAgYXMgb2YgPDxyZXNlcnZlcy53YWl0aW5nZGF0ZT4+OlxyXG5cclxuVGl0bGU6 IDw8YmlibGlvLnRpdGxlPj5cclxuQXV0aG9yOiA8PGJpYmxpby5hdXRob3I+PlxyXG5Db3B5OiA8 PGl0ZW1zLmNvcHludW1iZXI+PlxyXG5Mb2NhdGlvbjogPDxicmFuY2hlcy5icmFuY2huYW1lPj5c clxuPDxicmFuY2hlcy5icmFuY2hhZGRyZXNzMT4+XHJcbjw8YnJhbmNoZXMuYnJhbmNoYWRkcmVz czI+PlxyXG48PGJyYW5jaGVzLmJyYW5jaGFkZHJlc3MzPj4nKSwKIAogKCdjaXJjdWxhdGlvbics J0NIRUNLSU4nLCdJdGVtIENoZWNrLWluIChEaWdlc3QpJywnQ2hlY2staW5zJywnVGhlIGZvbGxv d2luZyBpdGVtcyBoYXZlIGJlZW4gY2hlY2tlZCBpbjpcclxuLS0tLVxyXG48PGJpYmxpby50aXRs ZT4+XHJcbi0tLS1cclxuVGhhbmsgeW91LicpLApkaWZmIC0tZ2l0IGEvaW5zdGFsbGVyL2RhdGEv bXlzcWwvdWstVUEvb3B0aW9uYWwvc2FtcGxlX25vdGljZXNfbWVzc2FnZV9hdHRyaWJ1dGVzLnNx bCBiL2luc3RhbGxlci9kYXRhL215c3FsL3VrLVVBL29wdGlvbmFsL3NhbXBsZV9ub3RpY2VzX21l c3NhZ2VfYXR0cmlidXRlcy5zcWwKaW5kZXggMjhlMmVjNS4uMmE1YWU4NiAxMDA2NDQKLS0tIGEv aW5zdGFsbGVyL2RhdGEvbXlzcWwvdWstVUEvb3B0aW9uYWwvc2FtcGxlX25vdGljZXNfbWVzc2Fn ZV9hdHRyaWJ1dGVzLnNxbAorKysgYi9pbnN0YWxsZXIvZGF0YS9teXNxbC91ay1VQS9vcHRpb25h bC9zYW1wbGVfbm90aWNlc19tZXNzYWdlX2F0dHJpYnV0ZXMuc3FsCkBAIC0xLDExICsxLDEwIEBA Ci10cnVuY2F0ZSBtZXNzYWdlX2F0dHJpYnV0ZXM7Civvu790cnVuY2F0ZSBtZXNzYWdlX2F0dHJp YnV0ZXM7CiAKIGluc2VydCBpbnRvIGBtZXNzYWdlX2F0dHJpYnV0ZXNgCiAoYG1lc3NhZ2VfYXR0 cmlidXRlX2lkYCwgYG1lc3NhZ2VfbmFtZWAsIGB0YWtlc19kYXlzYCkKIHZhbHVlcwogKDEsICfQ ntC00LjQvdC40YbRjyDQt9Cw0LHQvtGA0LPQvtCy0LDQvdCwJyAgICwgMCksCiAoMiwgJ9Cf0L7Q v9C10YDQtdC00L3RlCDQv9C+0LLRltC00L7QvNC70LXQvdC90Y8nLCAxKSwKLSgzLCAn0JzQsNC5 0LHRg9GC0L3RliDQv9C+0LTRltGXJyAgICAgICAgLCAxKSwKICg0LCAnSG9sZCBGaWxsZWQnICAg ICAgICAgICAsIDApLAogKDUsICdJdGVtIENoZWNrLWluJyAgICAgICAgICwgMCksCiAoNiwgJ0l0 ZW0gQ2hlY2tvdXQnICAgICAgICAgLCAwKTsKZGlmZiAtLWdpdCBhL2luc3RhbGxlci9kYXRhL215 c3FsL3VwZGF0ZWRhdGFiYXNlLnBsIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvdXBkYXRlZGF0YWJh c2UucGwKaW5kZXggMWQ5MDY1Ni4uNDc4N2QzZSAxMDA3NTUKLS0tIGEvaW5zdGFsbGVyL2RhdGEv bXlzcWwvdXBkYXRlZGF0YWJhc2UucGwKKysrIGIvaW5zdGFsbGVyL2RhdGEvbXlzcWwvdXBkYXRl ZGF0YWJhc2UucGwKQEAgLTM2MjQsNiArMzYyNCwxNCBAQCBJTlNFUlQgSU5UTyBwZXJtaXNzaW9u cyAobW9kdWxlX2JpdCwgY29kZSwgZGVzY3JpcHRpb24pIFZBTFVFUwogICAgIFNldFZlcnNpb24g KCREQnZlcnNpb24pOwogfQogCiskREJ2ZXJzaW9uID0gJ1hYWCc7CitpZiAoQzQ6OkNvbnRleHQt PnByZWZlcmVuY2UoJ1ZlcnNpb24nKSA8IFRyYW5zZm9ybVRvTnVtKCREQnZlcnNpb24pKXsKKyAg ICAkZGJoLT5kbyhxcXtERUxFVEUgRlJPTSBtZXNzYWdlX2F0dHJpYnV0ZXMgV0hFUkUgbWVzc2Fn ZV9hdHRyaWJ1dGVfaWQ9Mzt9KTsKKyAgICAkZGJoLT5kbyhxcXtERUxFVEUgRlJPTSBsZXR0ZXIg V0hFUkUgY29kZT0nRVZFTlQnIEFORCB0aXRsZT0nVXBjb21pbmcgTGlicmFyeSBFdmVudCc7fSk7 CisgICAgcHJpbnQgIlVwZ3JhZGUgdG8gJERCdmVyc2lvbiBkb25lIFJlbW92ZSB1cGNvbWluZyBl dmVudHMgbWVzc2FnaW5nIG9wdGlvbiAoYnVnIDI0MzQpIjsKKyAgICBTZXRWZXJzaW9uICgkREJ2 ZXJzaW9uKTsKK30KKwogCiA9aXRlbSBEcm9wQWxsRm9yZWlnbktleXMoJHRhYmxlKQogCi0tIAox LjUuNi41Cgo= --00163646d7c8d1627904884a33ce-- From andrew.elwell at gmail.com Sat Jun 5 23:17:10 2010 From: andrew.elwell at gmail.com (Andrew Elwell) Date: Sat, 5 Jun 2010 23:17:10 +0200 Subject: [Koha-patches] [PATCH 2/3] Another batch of POD cleanups Message-ID: <1275772631-21530-1-git-send-email-Andrew.Elwell@gmail.com> Signed-off-by: Andrew Elwell --- C4/Auth.pm | 106 ++++++-------- C4/BackgroundJob.pm | 104 ++++---------- C4/Barcodes.pm | 2 +- C4/Biblio.pm | 415 ++++++++++++++++----------------------------------- 4 files changed, 208 insertions(+), 419 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 4f76ea6..cb52a66 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -84,41 +84,39 @@ C4::Auth - Authenticates Koha users =head1 DESCRIPTION - The main function of this module is to provide - authentification. However the get_template_and_user function has - been provided so that a users login information is passed along - automatically. This gets loaded into the template. +The main function of this module is to provide +authentification. However the get_template_and_user function has +been provided so that a users login information is passed along +automatically. This gets loaded into the template. =head1 FUNCTIONS -=over 2 - -=item get_template_and_user - - my ($template, $borrowernumber, $cookie) - = get_template_and_user( - { - template_name => "opac-main.tmpl", - query => $query, - type => "opac", - authnotrequired => 1, - flagsrequired => {borrow => 1, catalogue => '*', tools => 'import_patrons' }, - } - ); - - This call passes the C, C and C - to C<&checkauth> (in this module) to perform authentification. - See C<&checkauth> for an explanation of these parameters. - - The C is then used to find the correct template for - the page. The authenticated users details are loaded onto the - template in the HTML::Template LOOP variable C. Also the - C is passed to the template. This can be used in templates - if cookies are disabled. It needs to be put as and input to every - authenticated page. - - More information on the C sub can be found in the - Output.pm module. +=head2 get_template_and_user + + my ($template, $borrowernumber, $cookie) + = get_template_and_user( + { + template_name => "opac-main.tmpl", + query => $query, + type => "opac", + authnotrequired => 1, + flagsrequired => {borrow => 1, catalogue => '*', tools => 'import_patrons' }, + } + ); + +This call passes the C, C and C +to C<&checkauth> (in this module) to perform authentification. +See C<&checkauth> for an explanation of these parameters. + +The C is then used to find the correct template for +the page. The authenticated users details are loaded onto the +template in the HTML::Template LOOP variable C. Also the +C is passed to the template. This can be used in templates +if cookies are disabled. It needs to be put as and input to every +authenticated page. + +More information on the C sub can be found in the +Output.pm module. =cut @@ -471,7 +469,7 @@ sub get_template_and_user { return ( $template, $borrowernumber, $cookie, $flags); } -=item checkauth +=head2 checkauth ($userid, $cookie, $sessionID) = &checkauth($query, $noauth, $flagsrequired, $type); @@ -510,17 +508,17 @@ If the GranularPermissions system preference is ON, the value of each key in the C hash takes on an additional meaning, e.g., -=item 1 + 1 The user must have access to all subfunctions of the module specified by the hash key. -=item * + * The user must have access to at least one subfunction of the module specified by the hash key. -=item specific permission, e.g., 'export_catalog' + specific permission, e.g., 'export_catalog' The user must have access to the specific subfunction list, which must correspond to a row in the permissions table. @@ -980,7 +978,7 @@ sub checkauth { exit; } -=item check_api_auth +=head2 check_api_auth ($status, $cookie, $sessionId) = check_api_auth($query, $userflags); @@ -1000,7 +998,7 @@ are OK. Possible return values in C<$status> are: -=over 4 +=over =item "ok" -- user authenticated; C<$cookie> and C<$sessionid> have valid values. @@ -1214,7 +1212,7 @@ sub check_api_auth { } } -=item check_cookie_auth +=head2 check_cookie_auth ($status, $sessionId) = check_api_auth($cookie, $userflags); @@ -1227,7 +1225,7 @@ have been authenticated in the usual way. Possible return values in C<$status> are: -=over 4 +=over =item "ok" -- user authenticated; C<$sessionID> have valid values. @@ -1323,7 +1321,7 @@ sub check_cookie_auth { } } -=item get_session +=head2 get_session use CGI::Session; my $session = get_session($sessionID); @@ -1427,7 +1425,7 @@ sub checkpw { return 0; } -=item getuserflags +=head2 getuserflags my $authflags = getuserflags($flags, $userid, [$dbh]); @@ -1467,24 +1465,20 @@ sub getuserflags { return $userflags; } -=item get_user_subpermissions - -=over 4 +=head2 get_user_subpermissions -my $user_perm_hashref = get_user_subpermissions($userid); - -=back + $user_perm_hashref = get_user_subpermissions($userid); Given the userid (note, not the borrowernumber) of a staff user, return a hashref of hashrefs of the specific subpermissions accorded to the user. An example return is -{ + { tools => { export_catalog => 1, import_patrons => 1, } -} + } The top-level hash-key is a module or function code from userflags.flag, while the second-level key is a code @@ -1515,13 +1509,9 @@ sub get_user_subpermissions { return $user_perms; } -=item get_all_subpermissions - -=over 4 +=head2 get_all_subpermissions -my $perm_hashref = get_all_subpermissions(); - -=back + my $perm_hashref = get_all_subpermissions(); Returns a hashref of hashrefs defining all specific permissions currently defined. The return value @@ -1545,7 +1535,7 @@ sub get_all_subpermissions { return $all_perms; } -=item haspermission +=head2 haspermission $flags = ($userid, $flagsrequired); @@ -1615,8 +1605,6 @@ END { } # module clean-up code here (global destructor) 1; __END__ -=back - =head1 SEE ALSO CGI(3) diff --git a/C4/BackgroundJob.pm b/C4/BackgroundJob.pm index e20eb6e..45e404e 100644 --- a/C4/BackgroundJob.pm +++ b/C4/BackgroundJob.pm @@ -38,43 +38,31 @@ initiated from the web staff interface =head1 SYNOPSIS -=over 4 - -# start tracking a job -my $job = C4::BackgroundJob->new($sessionID, $job_name, $job_invoker, $num_work_units); -my $jobID = $job->id(); -$job->progress($work_units_processed); -$job->finish($job_result_hashref); - -# get status and results of a job -my $job = C4::BackgroundJob->fetch($sessionID, $jobID); -my $max_work_units = $job->size(); -my $work_units_processed = $job->progress(); -my $job_status = $job->status(); -my $job_name = $job->name(); -my $job_invoker = $job->invoker(); -my $results_hashref = $job->results(); - -=back + # start tracking a job + my $job = C4::BackgroundJob->new($sessionID, $job_name, $job_invoker, $num_work_units); + my $jobID = $job->id(); + $job->progress($work_units_processed); + $job->finish($job_result_hashref); + + # get status and results of a job + my $job = C4::BackgroundJob->fetch($sessionID, $jobID); + my $max_work_units = $job->size(); + my $work_units_processed = $job->progress(); + my $job_status = $job->status(); + my $job_name = $job->name(); + my $job_invoker = $job->invoker(); + my $results_hashref = $job->results(); This module manages tracking the progress and results of (potentially) long-running jobs initiated from the staff user interface. Such jobs can include batch MARC and patron record imports. -=cut - =head1 METHODS -=cut - =head2 new -=over 4 - -my $job = C4::BackgroundJob->new($sessionID, $job_name, $job_invoker, $num_work_units); - -=back + my $job = C4::BackgroundJob->new($sessionID, $job_name, $job_invoker, $num_work_units); Create a new job object and set its status to 'running'. C<$num_work_units> should be a number representing the size of the job; the units of the @@ -114,11 +102,7 @@ sub _serialize { =head2 id -=over 4 - -my $jobID = $job->id(); - -=back + my $jobID = $job->id(); Read-only accessor for job ID. @@ -131,12 +115,8 @@ sub id { =head2 name -=over 4 - -my $name = $job->name(); -$job->name($name); - -=back + my $name = $job->name(); + $job->name($name); Read/write accessor for job name. @@ -154,12 +134,8 @@ sub name { =head2 invoker -=over 4 - -my $invoker = $job->invoker(); -$job->invoker($invoker); - -=back + my $invoker = $job->invoker(); +i $job->invoker($invoker); Read/write accessor for job invoker. @@ -177,12 +153,8 @@ sub invoker { =head2 progress -=over 4 - -my $progress = $job->progress(); -$job->progress($progress); - -=back + my $progress = $job->progress(); + $job->progress($progress); Read/write accessor for job progress. @@ -200,11 +172,7 @@ sub progress { =head2 status -=over 4 - -my $status = $job->status(); - -=back + my $status = $job->status(); Read-only accessor for job status. @@ -217,12 +185,8 @@ sub status { =head2 size -=over 4 - -my $size = $job->size(); -$job->size($size); - -=back + my $size = $job->size(); + $job->size($size); Read/write accessor for job size. @@ -240,11 +204,7 @@ sub size { =head2 finish -=over 4 - -$job->finish($results_hashref); - -=back + $job->finish($results_hashref); Mark the job as finished, setting its status to 'completed'. C<$results_hashref> should be a reference to a hash containing @@ -262,11 +222,7 @@ sub finish { =head2 results -=over 4 - -my $results_hashref = $job->results(); - -=back + my $results_hashref = $job->results(); Retrieve the results of the current job. Returns undef if the job status is not 'completed'. @@ -281,11 +237,7 @@ sub results { =head2 fetch -=over 4 - -my $job = C4::BackgroundJob->fetch($sessionID, $jobID); - -=back + my $job = C4::BackgroundJob->fetch($sessionID, $jobID); Retrieve a job that has been serialized to the database. Returns C if the job does not exist in the current diff --git a/C4/Barcodes.pm b/C4/Barcodes.pm index ae672c6..176d878 100644 --- a/C4/Barcodes.pm +++ b/C4/Barcodes.pm @@ -259,7 +259,7 @@ To add a new barcode format, a developer should: add to the $types hashref in this file; add tests under the "t" directory; and edit autoBarcode syspref to include new type. - + =head2 Adding a new module Each new module that needs differing behavior must override these subs: diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 376568a..11767a7 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -214,11 +214,7 @@ When modifying a biblio or an item, the behaviour is quite similar. =head2 AddBiblio -=over 4 - -($biblionumber,$biblioitemnumber) = AddBiblio($record,$frameworkcode); - -=back + ($biblionumber,$biblioitemnumber) = AddBiblio($record,$frameworkcode); Exported function (core API) for adding a new biblio to koha. @@ -271,11 +267,7 @@ sub AddBiblio { =head2 ModBiblio -=over 4 - - ModBiblio( $record,$biblionumber,$frameworkcode); - -=back + ModBiblio( $record,$biblionumber,$frameworkcode); Replace an existing bib record identified by C<$biblionumber> with one supplied by the MARC::Record object C<$record>. The embedded @@ -359,8 +351,9 @@ sub ModBiblio { =head2 ModBiblioframework - ModBiblioframework($biblionumber,$frameworkcode); - Exported function to modify a biblio framework + ModBiblioframework($biblionumber,$frameworkcode); + +Exported function to modify a biblio framework =cut @@ -374,9 +367,8 @@ sub ModBiblioframework { =head2 DelBiblio -=over + my $error = &DelBiblio($dbh,$biblionumber); -my $error = &DelBiblio($dbh,$biblionumber); Exported function (core API) for deleting a biblio in koha. Deletes biblio record from Zebra and Koha tables (biblio,biblioitems,items) Also backs it up to deleted* tables @@ -384,8 +376,6 @@ Checks to make sure there are not issues on any of the items return: C<$error> : undef unless an error occurs -=back - =cut sub DelBiblio { @@ -447,11 +437,7 @@ sub DelBiblio { =head2 LinkBibHeadingsToAuthorities -=over 4 - -my $headings_linked = LinkBibHeadingsToAuthorities($marc); - -=back + my $headings_linked = LinkBibHeadingsToAuthorities($marc); Links bib headings to authority records by checking each authority-controlled field in the C @@ -504,11 +490,7 @@ sub LinkBibHeadingsToAuthorities { =head2 GetRecordValue -=over 4 - -my $values = GetRecordValue($field, $record, $frameworkcode); - -=back + my $values = GetRecordValue($field, $record, $frameworkcode); Get MARC fields from a keyword defined in fieldmapping table. @@ -541,11 +523,7 @@ sub GetRecordValue { =head2 SetFieldMapping -=over 4 - -SetFieldMapping($framework, $field, $fieldcode, $subfieldcode); - -=back + SetFieldMapping($framework, $field, $fieldcode, $subfieldcode); Set a Field to MARC mapping value, if it already exists we don't add a new one. @@ -567,11 +545,7 @@ sub SetFieldMapping { =head2 DeleteFieldMapping -=over 4 - -DeleteFieldMapping($id); - -=back + DeleteFieldMapping($id); Delete a field mapping from an $id. @@ -587,11 +561,7 @@ sub DeleteFieldMapping { =head2 GetFieldMapping -=over 4 - -GetFieldMapping($frameworkcode); - -=back + GetFieldMapping($frameworkcode); Get all field mappings for a specified frameworkcode @@ -613,20 +583,18 @@ sub GetFieldMapping { =head2 GetBiblioData -=over 4 + $data = &GetBiblioData($biblionumber); -$data = &GetBiblioData($biblionumber); Returns information about the book with the given biblionumber. C<&GetBiblioData> returns a reference-to-hash. The keys are the fields in the C and C tables in the Koha database. + In addition, C<$data-E{subject}> is the list of the book's subjects, separated by C<" , "> (space, comma, space). If there are multiple biblioitems with the given biblionumber, only the first one is considered. -=back - =cut sub GetBiblioData { @@ -659,17 +627,13 @@ sub GetBiblioData { =head2 &GetBiblioItemData -=over 4 - -$itemdata = &GetBiblioItemData($biblioitemnumber); + $itemdata = &GetBiblioItemData($biblioitemnumber); Looks up the biblioitem with the given biblioitemnumber. Returns a reference-to-hash. The keys are the fields from the C, C, and C tables in the Koha database, except that C is given as C<$itemdata-E{bnotes}>. -=back - =cut #' @@ -692,12 +656,8 @@ sub GetBiblioItemData { =head2 GetBiblioItemByBiblioNumber -=over 4 - NOTE : This function has been copy/paste from C4/Biblio.pm from head before zebra integration. -=back - =cut sub GetBiblioItemByBiblioNumber { @@ -719,9 +679,6 @@ sub GetBiblioItemByBiblioNumber { =head2 GetBiblionumberFromItemnumber -=over 4 - -=back =cut @@ -737,9 +694,7 @@ sub GetBiblionumberFromItemnumber { =head2 GetBiblioFromItemNumber -=over 4 - -$item = &GetBiblioFromItemNumber($itemnumber,$barcode); + $item = &GetBiblioFromItemNumber($itemnumber,$barcode); Looks up the item with the given itemnumber. if undef, try the barcode. @@ -747,8 +702,6 @@ C<&itemnodata> returns a reference-to-hash whose keys are the fields from the C, C, and C tables in the Koha database. -=back - =cut #' @@ -780,14 +733,10 @@ sub GetBiblioFromItemNumber { =head2 GetISBDView -=over 4 - -$isbd = &GetISBDView($biblionumber); + $isbd = &GetISBDView($biblionumber); Return the ISBD view which can be included in opac and intranet -=back - =cut sub GetISBDView { @@ -901,11 +850,7 @@ sub GetISBDView { =head2 GetBiblio -=over 4 - -( $count, @results ) = &GetBiblio($biblionumber); - -=back + ( $count, @results ) = &GetBiblio($biblionumber); =cut @@ -926,11 +871,7 @@ sub GetBiblio { =head2 GetBiblioItemInfosOf -=over 4 - -GetBiblioItemInfosOf(@biblioitemnumbers); - -=back + GetBiblioItemInfosOf(@biblioitemnumbers); =cut @@ -951,16 +892,12 @@ sub GetBiblioItemInfosOf { =head2 GetMarcStructure -=over 4 - -$res = GetMarcStructure($forlibrarian,$frameworkcode); + $res = GetMarcStructure($forlibrarian,$frameworkcode); Returns a reference to a big hash of hash, with the Marc structure for the given frameworkcode $forlibrarian :if set to 1, the MARC descriptions are the librarians ones, otherwise it's the public (OPAC) ones $frameworkcode : the framework code to read -=back - =cut # cache for results of GetMarcStructure -- needed @@ -1046,16 +983,16 @@ sub GetMarcStructure { =head2 GetUsedMarcStructure - the same function as GetMarcStructure except it just takes field - in tab 0-9. (used field) - - my $results = GetUsedMarcStructure($frameworkcode); - - L<$results> is a ref to an array which each case containts a ref - to a hash which each keys is the columns from marc_subfield_structure - - L<$frameworkcode> is the framework code. - +The same function as GetMarcStructure except it just takes field +in tab 0-9. (used field) + + my $results = GetUsedMarcStructure($frameworkcode); + +C<$results> is a ref to an array which each case containts a ref +to a hash which each keys is the columns from marc_subfield_structure + +C<$frameworkcode> is the framework code. + =cut sub GetUsedMarcStructure($) { @@ -1074,14 +1011,11 @@ sub GetUsedMarcStructure($) { =head2 GetMarcFromKohaField -=over 4 + ($MARCfield,$MARCsubfield)=GetMarcFromKohaField($kohafield,$frameworkcode); -($MARCfield,$MARCsubfield)=GetMarcFromKohaField($kohafield,$frameworkcode); Returns the MARC fields & subfields mapped to the koha field for the given frameworkcode -=back - =cut sub GetMarcFromKohaField { @@ -1093,11 +1027,7 @@ sub GetMarcFromKohaField { =head2 GetMarcBiblio -=over 4 - -my $record = GetMarcBiblio($biblionumber); - -=back + my $record = GetMarcBiblio($biblionumber); Returns MARC::Record representing bib identified by C<$biblionumber>. If no bib exists, returns undef. @@ -1128,15 +1058,11 @@ sub GetMarcBiblio { =head2 GetXmlBiblio -=over 4 - -my $marcxml = GetXmlBiblio($biblionumber); + my $marcxml = GetXmlBiblio($biblionumber); Returns biblioitems.marcxml of the biblionumber passed in parameter. The XML contains both biblio & item datas -=back - =cut sub GetXmlBiblio { @@ -1150,14 +1076,10 @@ sub GetXmlBiblio { =head2 GetCOinSBiblio -=over 4 - -my $coins = GetCOinSBiblio($biblionumber); + my $coins = GetCOinSBiblio($biblionumber); Returns the COinS(a span) which can be included in a biblio record -=back - =cut sub GetCOinSBiblio { @@ -1284,20 +1206,18 @@ sub GetCOinSBiblio { =head2 GetAuthorisedValueDesc -=over 4 - -my $subfieldvalue =get_authorised_value_desc( + my $subfieldvalue =get_authorised_value_desc( $tag, $subf[$i][0],$subf[$i][1], '', $taglib, $category, $opac); + Retrieve the complete description for a given authorised value. Now takes $category and $value pair too. -my $auth_value_desc =GetAuthorisedValueDesc( - '','', 'DVD' ,'','','CCODE'); - -If the optional $opac parameter is set to a true value, displays OPAC descriptions rather than normal ones when they exist. + my $auth_value_desc =GetAuthorisedValueDesc( + '','', 'DVD' ,'','','CCODE'); -=back +If the optional $opac parameter is set to a true value, displays OPAC +descriptions rather than normal ones when they exist. =cut @@ -1335,14 +1255,11 @@ sub GetAuthorisedValueDesc { =head2 GetMarcNotes -=over 4 + $marcnotesarray = GetMarcNotes( $record, $marcflavour ); -$marcnotesarray = GetMarcNotes( $record, $marcflavour ); Get all notes from the MARC record and returns them in an array. The note are stored in differents places depending on MARC flavour -=back - =cut sub GetMarcNotes { @@ -1378,14 +1295,11 @@ sub GetMarcNotes { =head2 GetMarcSubjects -=over 4 + $marcsubjcts = GetMarcSubjects($record,$marcflavour); -$marcsubjcts = GetMarcSubjects($record,$marcflavour); Get all subjects from the MARC record and returns them in an array. The subjects are stored in differents places depending on MARC flavour -=back - =cut sub GetMarcSubjects { @@ -1448,14 +1362,11 @@ sub GetMarcSubjects { =head2 GetMarcAuthors -=over 4 + authors = GetMarcAuthors($record,$marcflavour); -authors = GetMarcAuthors($record,$marcflavour); Get all authors from the MARC record and returns them in an array. The authors are stored in differents places depending on MARC flavour -=back - =cut sub GetMarcAuthors { @@ -1520,14 +1431,11 @@ sub GetMarcAuthors { =head2 GetMarcUrls -=over 4 + $marcurls = GetMarcUrls($record,$marcflavour); -$marcurls = GetMarcUrls($record,$marcflavour); Returns arrayref of URLs from MARC data, suitable to pass to tmpl loop. Assumes web resources (not uncommon in MARC21 to omit resource type ind) -=back - =cut sub GetMarcUrls { @@ -1578,14 +1486,11 @@ sub GetMarcUrls { =head2 GetMarcSeries -=over 4 + $marcseriesarray = GetMarcSeries($record,$marcflavour); -$marcseriesarray = GetMarcSeries($record,$marcflavour); Get all series from the MARC record and returns them in an array. The series are stored in differents places depending on MARC flavour -=back - =cut sub GetMarcSeries { @@ -1650,11 +1555,7 @@ sub GetMarcSeries { =head2 GetFrameworkCode -=over 4 - - $frameworkcode = GetFrameworkCode( $biblionumber ) - -=back + $frameworkcode = GetFrameworkCode( $biblionumber ) =cut @@ -1699,14 +1600,12 @@ sub GetPublisherNameFromIsbn($) { =head2 TransformKohaToMarc -=over 4 - $record = TransformKohaToMarc( $hash ) - This function builds partial MARC::Record from a hash - Hash entries can be from biblio or biblioitems. - This function is called in acquisition module, to create a basic catalogue entry from user entry -=back +This function builds partial MARC::Record from a hash +Hash entries can be from biblio or biblioitems. + +This function is called in acquisition module, to create a basic catalogue entry from user entry =cut @@ -1723,12 +1622,8 @@ sub TransformKohaToMarc { =head2 TransformKohaToMarcOneField -=over 4 - $record = TransformKohaToMarcOneField( $sth, $record, $kohafieldname, $value, $frameworkcode ); -=back - =cut sub TransformKohaToMarcOneField { @@ -1757,14 +1652,18 @@ sub TransformKohaToMarcOneField { =head2 TransformHtmlToXml -=over 4 - -$xml = TransformHtmlToXml( $tags, $subfields, $values, $indicator, $ind_tag, $auth_type ) + $xml = TransformHtmlToXml( $tags, $subfields, $values, $indicator, + $ind_tag, $auth_type ) $auth_type contains : -- nothing : rebuild a biblio, un UNIMARC the encoding is in 100$a pos 26/27 -- UNIMARCAUTH : rebuild an authority. In UNIMARC, the encoding is in 100$a pos 13/14 -- ITEM : rebuild an item : in UNIMARC, 100$a, it's in the biblio ! (otherwise, we would get 2 100 fields !) + +=over + +=item - nothing : rebuild a biblio. In UNIMARC the encoding is in 100$a pos 26/27 + +=item - UNIMARCAUTH : rebuild an authority. In UNIMARC, the encoding is in 100$a pos 13/14 + +=item - ITEM : rebuild an item : in UNIMARC, 100$a, it's in the biblio ! (otherwise, we would get 2 100 fields !) =back @@ -2015,11 +1914,7 @@ our $inverted_field_map; =head2 TransformMarcToKoha -=over 4 - - $result = TransformMarcToKoha( $dbh, $record, $frameworkcode ) - -=back + $result = TransformMarcToKoha( $dbh, $record, $frameworkcode ) Extract data from a MARC bib record into a hashref representing Koha biblio, biblioitems, and items fields. @@ -2132,23 +2027,21 @@ sub _get_inverted_marc_field_map { =head2 _disambiguate -=over 4 - -$newkey = _disambiguate($table, $field); + $newkey = _disambiguate($table, $field); This is a temporary hack to distinguish between the following sets of columns when using TransformMarcToKoha. -items.cn_source & biblioitems.cn_source -items.cn_sort & biblioitems.cn_sort + items.cn_source & biblioitems.cn_source + items.cn_sort & biblioitems.cn_sort Columns that are currently NOT distinguished (FIXME due to lack of time to fully test) are: -biblio.notes and biblioitems.notes -biblionumber -timestamp -biblioitemnumber + biblio.notes and biblioitems.notes + biblionumber + timestamp + biblioitemnumber FIXME - this is necessary because prefixing each column name with the table name would require changing lots @@ -2159,8 +2052,6 @@ version. In the future, it would also be good to separate DB access and UI presentation field names more. -=back - =cut sub CountItemsIssued { @@ -2184,15 +2075,12 @@ sub _disambiguate { =head2 get_koha_field_from_marc -=over 4 - -$result->{_disambiguate($table, $field)} = get_koha_field_from_marc($table,$field,$record,$frameworkcode); + $result->{_disambiguate($table, $field)} = + get_koha_field_from_marc($table,$field,$record,$frameworkcode); Internal function to map data from the MARC record to a specific non-MARC field. FIXME: this is meant to replace TransformMarcToKohaOneField after more testing. -=back - =cut sub get_koha_field_from_marc { @@ -2226,11 +2114,7 @@ sub get_koha_field_from_marc { =head2 TransformMarcToKohaOneField -=over 4 - -$result = TransformMarcToKohaOneField( $kohatable, $kohafield, $record, $result, $frameworkcode ) - -=back + $result = TransformMarcToKohaOneField( $kohatable, $kohafield, $record, $result, $frameworkcode ) =cut @@ -2271,16 +2155,12 @@ sub TransformMarcToKohaOneField { =head2 PrepareItemrecordDisplay -=over 4 - -PrepareItemrecordDisplay($itemrecord,$bibnum,$itemumber,$frameworkcode); + PrepareItemrecordDisplay($itemrecord,$bibnum,$itemumber,$frameworkcode); Returns a hash with all the fields for Display a given item data in a template The $frameworkcode returns the item for the given frameworkcode, ONLY if bibnum is not provided -=back - =cut sub PrepareItemrecordDisplay { @@ -2465,19 +2345,19 @@ sub PrepareItemrecordDisplay { =head2 ModZebra -=over 4 + ModZebra( $biblionumber, $op, $server, $oldRecord, $newRecord ); -ModZebra( $biblionumber, $op, $server, $oldRecord, $newRecord ); +$biblionumber is the biblionumber we want to index - $biblionumber is the biblionumber we want to index - $op is specialUpdate or delete, and is used to know what we want to do - $server is the server that we want to update - $oldRecord is the MARC::Record containing the previous version of the record. This is used only when - NoZebra=1, as NoZebra indexing needs to know the previous version of a record in order to - do an update. - $newRecord is the MARC::Record containing the new record. It is usefull only when NoZebra=1, and is used to know what to add to the nozebra database. (the record in mySQL being, if it exist, the previous record, the one just before the modif. We need both : the previous and the new one. - -=back +$op is specialUpdate or delete, and is used to know what we want to do + +$server is the server that we want to update + +$oldRecord is the MARC::Record containing the previous version of the record. This is used only when +NoZebra=1, as NoZebra indexing needs to know the previous version of a record in order to +do an update. + +$newRecord is the MARC::Record containing the new record. It is usefull only when NoZebra=1, and is used to know what to add to the nozebra database. (the record in mySQL being, if it exist, the previous record, the one just before the modif. We need both : the previous and the new one. =cut @@ -2547,9 +2427,9 @@ sub ModZebra { =head2 GetNoZebraIndexes - %indexes = GetNoZebraIndexes; - - return the data from NoZebraIndexes syspref. + %indexes = GetNoZebraIndexes; + +return the data from NoZebraIndexes syspref. =cut @@ -2571,13 +2451,15 @@ sub GetNoZebraIndexes { =head2 _DelBiblioNoZebra($biblionumber,$record,$server); - function to delete a biblio in NoZebra indexes - This function does NOT delete anything in database : it reads all the indexes entries - that have to be deleted & delete them in the hash - The SQL part is done either : - - after the Add if we are modifying a biblio (delete + add again) - - immediatly after this sub if we are doing a true deletion. - $server can be 'biblioserver' or 'authorityserver' : it indexes biblios or authorities (in the same table, $server being part of the table itself +function to delete a biblio in NoZebra indexes +This function does NOT delete anything in database : it reads all the indexes entries +that have to be deleted & delete them in the hash + +The SQL part is done either : + - after the Add if we are modifying a biblio (delete + add again) + - immediatly after this sub if we are doing a true deletion. + +$server can be 'biblioserver' or 'authorityserver' : it indexes biblios or authorities (in the same table, $server being part of the table itself =cut @@ -2689,9 +2571,11 @@ sub _DelBiblioNoZebra { return %result; } -=head2 _AddBiblioNoZebra($biblionumber, $record, $server, %result); +=head2 _AddBiblioNoZebra + + _AddBiblioNoZebra($biblionumber, $record, $server, %result); - function to add a biblio in NoZebra indexes +function to add a biblio in NoZebra indexes =cut @@ -2829,9 +2713,7 @@ sub _AddBiblioNoZebra { =head2 _find_value -=over 4 - -($indicators, $value) = _find_value($tag, $subfield, $record,$encoding); + ($indicators, $value) = _find_value($tag, $subfield, $record,$encoding); Find the given $subfield in the given $tag in the given MARC::Record $record. If the subfield is found, returns @@ -2842,8 +2724,6 @@ PROPOSITION : Such a function is used in addbiblio AND additem and serial-edit and maybe could be used in Authorities. I suggest we export it from this module. -=back - =cut sub _find_value { @@ -2872,15 +2752,12 @@ sub _find_value { =head2 _koha_marc_update_bib_ids -=over 4 -_koha_marc_update_bib_ids($record, $frameworkcode, $biblionumber, $biblioitemnumber); + _koha_marc_update_bib_ids($record, $frameworkcode, $biblionumber, $biblioitemnumber); Internal function to add or update biblionumber and biblioitemnumber to the MARC XML. -=back - =cut sub _koha_marc_update_bib_ids { @@ -2940,11 +2817,7 @@ sub _koha_marc_update_bib_ids { =head2 _koha_marc_update_biblioitem_cn_sort -=over 4 - -_koha_marc_update_biblioitem_cn_sort($marc, $biblioitem, $frameworkcode); - -=back + _koha_marc_update_biblioitem_cn_sort($marc, $biblioitem, $frameworkcode); Given a MARC bib record and the biblioitem hash, update the subfield that contains a copy of the value of biblioitems.cn_sort. @@ -2979,14 +2852,10 @@ sub _koha_marc_update_biblioitem_cn_sort { =head2 _koha_add_biblio -=over 4 - -my ($biblionumber,$error) = _koha_add_biblio($dbh,$biblioitem); + my ($biblionumber,$error) = _koha_add_biblio($dbh,$biblioitem); Internal function to add a biblio ($biblio is a hash with the values) -=back - =cut sub _koha_add_biblio { @@ -3032,14 +2901,10 @@ sub _koha_add_biblio { =head2 _koha_modify_biblio -=over 4 - -my ($biblionumber,$error) == _koha_modify_biblio($dbh,$biblio,$frameworkcode); + my ($biblionumber,$error) == _koha_modify_biblio($dbh,$biblio,$frameworkcode); Internal function for updating the biblio table -=back - =cut sub _koha_modify_biblio { @@ -3076,15 +2941,11 @@ sub _koha_modify_biblio { =head2 _koha_modify_biblioitem_nonmarc -=over 4 - -my ($biblioitemnumber,$error) = _koha_modify_biblioitem_nonmarc( $dbh, $biblioitem ); + my ($biblioitemnumber,$error) = _koha_modify_biblioitem_nonmarc( $dbh, $biblioitem ); Updates biblioitems row except for marc and marcxml, which should be changed via ModBiblioMarc -=back - =cut sub _koha_modify_biblioitem_nonmarc { @@ -3145,14 +3006,10 @@ sub _koha_modify_biblioitem_nonmarc { =head2 _koha_add_biblioitem -=over 4 - -my ($biblioitemnumber,$error) = _koha_add_biblioitem( $dbh, $biblioitem ); + my ($biblioitemnumber,$error) = _koha_add_biblioitem( $dbh, $biblioitem ); Internal function to add a biblioitem -=back - =cut sub _koha_add_biblioitem { @@ -3214,16 +3071,13 @@ sub _koha_add_biblioitem { =head2 _koha_delete_biblio -=over 4 - -$error = _koha_delete_biblio($dbh,$biblionumber); + $error = _koha_delete_biblio($dbh,$biblionumber); Internal sub for deleting from biblio table -- also saves to deletedbiblio C<$dbh> - the database handle -C<$biblionumber> - the biblionumber of the biblio to be deleted -=back +C<$biblionumber> - the biblionumber of the biblio to be deleted =cut @@ -3264,17 +3118,13 @@ sub _koha_delete_biblio { =head2 _koha_delete_biblioitems -=over 4 - -$error = _koha_delete_biblioitems($dbh,$biblioitemnumber); + $error = _koha_delete_biblioitems($dbh,$biblioitemnumber); Internal sub for deleting from biblioitems table -- also saves to deletedbiblioitems C<$dbh> - the database handle C<$biblionumber> - the biblioitemnumber of the biblioitem to be deleted -=back - =cut # FIXME: add error handling @@ -3316,11 +3166,11 @@ sub _koha_delete_biblioitems { =head2 ModBiblioMarc - &ModBiblioMarc($newrec,$biblionumber,$frameworkcode); - - Add MARC data for a biblio to koha - - Function exported, but should NOT be used, unless you really know what you're doing + &ModBiblioMarc($newrec,$biblionumber,$frameworkcode); + +Add MARC data for a biblio to koha + +Function exported, but should NOT be used, unless you really know what you're doing =cut @@ -3370,27 +3220,27 @@ sub ModBiblioMarc { =head2 z3950_extended_services -z3950_extended_services($serviceType,$serviceOptions,$record); + z3950_extended_services($serviceType,$serviceOptions,$record); - z3950_extended_services is used to handle all interactions with Zebra's extended serices package, which is employed to perform all management of the MARC data stored in Zebra. +z3950_extended_services is used to handle all interactions with Zebra's extended serices package, which is employed to perform all management of the MARC data stored in Zebra. C<$serviceType> one of: itemorder,create,drop,commit,update,xmlupdate C<$serviceOptions> a has of key/value pairs. For instance, if service_type is 'update', $service_options should contain: - action => update action, one of specialUpdate, recordInsert, recordReplace, recordDelete, elementUpdate. + action => update action, one of specialUpdate, recordInsert, recordReplace, recordDelete, elementUpdate. and maybe - recordidOpaque => Opaque Record ID (user supplied) or recordidNumber => Record ID number (system number). - syntax => the record syntax (transfer syntax) - databaseName = Database from connection object + recordidOpaque => Opaque Record ID (user supplied) or recordidNumber => Record ID number (system number). + syntax => the record syntax (transfer syntax) + databaseName = Database from connection object - To set serviceOptions, call set_service_options($serviceType) +To set serviceOptions, call set_service_options($serviceType) C<$record> the record, if one is needed for the service type - A record should be in XML. You can convert it to XML from MARC by running it through marc2xml(). +A record should be in XML. You can convert it to XML from MARC by running it through marc2xml(). =cut @@ -3445,7 +3295,7 @@ sub z3950_extended_services { =head2 set_service_options -my $serviceOptions = set_service_options($serviceType); + my $serviceOptions = set_service_options($serviceType); C<$serviceType> itemorder,create,drop,commit,update,xmlupdate @@ -3474,24 +3324,23 @@ sub set_service_options { return $serviceOptions; } -=head3 get_biblio_authorised_values +=head2 get_biblio_authorised_values - find the types and values for all authorised values assigned to this biblio. +find the types and values for all authorised values assigned to this biblio. - parameters: +parameters: biblionumber MARC::Record of the bib - returns: a hashref mapping the authorised value to the value set for this biblionumber - - $authorised_values = { - 'Scent' => 'flowery', - 'Audience' => 'Young Adult', - 'itemtypes' => 'SER', - }; +returns: a hashref mapping the authorised value to the value set for this biblionumber - Notes: forlibrarian should probably be passed in, and called something different. + $authorised_values = { + 'Scent' => 'flowery', + 'Audience' => 'Young Adult', + 'itemtypes' => 'SER', + }; +Notes: forlibrarian should probably be passed in, and called something different. =cut -- 1.7.0.4 From andrew.elwell at gmail.com Sat Jun 5 23:17:11 2010 From: andrew.elwell at gmail.com (Andrew Elwell) Date: Sat, 5 Jun 2010 23:17:11 +0200 Subject: [Koha-patches] [PATCH 3/3] POD Cleanups - Few minor ones this time In-Reply-To: <1275772631-21530-1-git-send-email-Andrew.Elwell@gmail.com> References: <1275772631-21530-1-git-send-email-Andrew.Elwell@gmail.com> Message-ID: <1275772631-21530-2-git-send-email-Andrew.Elwell@gmail.com> Signed-off-by: Andrew Elwell --- C4/Bookseller.pm | 1 + C4/Branch.pm | 11 ++++++----- C4/Budgets.pm | 52 ++++++++++++++++++---------------------------------- 3 files changed, 25 insertions(+), 39 deletions(-) diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm index 16a5a3c..3937880 100644 --- a/C4/Bookseller.pm +++ b/C4/Bookseller.pm @@ -263,6 +263,7 @@ delete the supplier identified by $booksellerid This sub can be called only if the supplier has no order. =cut + sub DelBookseller { my ($id) = @_; my $dbh=C4::Context->dbh; diff --git a/C4/Branch.pm b/C4/Branch.pm index b402ab8..296011d 100644 --- a/C4/Branch.pm +++ b/C4/Branch.pm @@ -68,11 +68,12 @@ The functions in this module deal with branches. $branches = &GetBranches(); - Returns informations about ALL branches, IndependantBranches Insensitive. - GetBranchInfo() returns the same information without the problems of this function - (namespace collision, mainly). - Create a branch selector with the following code. - +Returns informations about ALL branches, IndependantBranches Insensitive. +GetBranchInfo() returns the same information without the problems of this function +(namespace collision, mainly). + +Create a branch selector with the following code. + =head3 in PERL SCRIPT my $branches = GetBranches; diff --git a/C4/Budgets.pm b/C4/Budgets.pm index 8c7b011..3e99316 100644 --- a/C4/Budgets.pm +++ b/C4/Budgets.pm @@ -77,6 +77,10 @@ BEGIN { # ----------------------------BUDGETS.PM-----------------------------"; +=head1 FUNCTIONS ABOUT BUDGETS + +=cut + sub HideCols { my ( $authcat, @hide_cols ) = @_; my $dbh = C4::Context->dbh; @@ -632,24 +636,13 @@ sub DelBudget { return $rc; } -=head2 FUNCTIONS ABOUT BUDGETS - -=over 2 - -=cut - -=back -=head3 GetBudget +=head2 GetBudget -=over 4 - -&GetBudget($budget_id); + &GetBudget($budget_id); get a specific budget -=back - =cut # ------------------------------------------------------------------- @@ -667,16 +660,12 @@ sub GetBudget { return $result; } -=head3 GetBudgets - -=over 4 +=head2 GetBudgets -&GetBudgets($filter, $order_by); + &GetBudgets($filter, $order_by); gets all budgets -=back - =cut # ------------------------------------------------------------------- @@ -698,16 +687,12 @@ sub GetChildBudgetsSpent { return $total_spent; } -=head3 GetChildBudgetsSpent - -=over 4 +=head2 GetChildBudgetsSpent -&GetChildBudgetsSpent($budget-id); + &GetChildBudgetsSpent($budget-id); gets the total spent of the level and sublevels of $budget_id -=back - =cut # ------------------------------------------------------------------- @@ -718,9 +703,9 @@ sub GetBudgets { # ------------------------------------------------------------------- -=head3 GetCurrencies +=head2 GetCurrencies - at currencies = &GetCurrencies; + @currencies = &GetCurrencies; Returns the list of all known currencies. @@ -756,7 +741,7 @@ sub GetCurrency { return $r; } -=head3 ModCurrencies +=head2 ModCurrencies &ModCurrencies($currency, $newrate); @@ -777,15 +762,14 @@ sub ModCurrencies { # ------------------------------------------------------------------- -=head3 ConvertCurrency +=head2 ConvertCurrency -$foreignprice = &ConvertCurrency($currency, $localprice); + $foreignprice = &ConvertCurrency($currency, $localprice); Converts the price C<$localprice> to foreign currency C<$currency> by dividing by the exchange rate, and returns the result. -If no exchange rate is found,e is one -to one. +If no exchange rate is found, e is one to one. =cut @@ -806,9 +790,9 @@ sub ConvertCurrency { return ( $price / $cur ); } -=head3 _columns +=head2 _columns - returns an array containing fieldname followed by PRI as value if PRIMARY Key +returns an array containing fieldname followed by PRI as value if PRIMARY Key =cut -- 1.7.0.4 From gcollum at gmail.com Sun Jun 6 00:29:40 2010 From: gcollum at gmail.com (Garry Collum) Date: Sat, 5 Jun 2010 18:29:40 -0400 Subject: [Koha-patches] [PATCH] Bug 2505: Enabled warnings in patron-attr-types.pl Message-ID: <1275776980-2973-1-git-send-email-gcollum@gmail.com> Fixed all resulting errors. --- admin/patron-attr-types.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl index f8c641d..188b040 100755 --- a/admin/patron-attr-types.pl +++ b/admin/patron-attr-types.pl @@ -19,7 +19,7 @@ # use strict; -#use warnings; FIXME - Bug 2505 +use warnings; use CGI; use C4::Auth; use C4::Context; @@ -30,7 +30,7 @@ use C4::Members::AttributeTypes; my $script_name = "/cgi-bin/koha/admin/patron-attr-types.pl"; my $input = new CGI; -my $op = $input->param('op'); +my $op = $input->param('op') || ''; my ($template, $loggedinuser, $cookie) -- 1.5.6.5 From andrew.elwell at gmail.com Sun Jun 6 19:47:14 2010 From: andrew.elwell at gmail.com (Andrew Elwell) Date: Sun, 6 Jun 2010 19:47:14 +0200 Subject: [Koha-patches] [PATCH 4/4] More POD cleanups Message-ID: <1275846434-30002-1-git-send-email-Andrew.Elwell@gmail.com> Signed-off-by: Andrew Elwell --- C4/Cache.pm | 25 +++++++++------- C4/Calendar.pm | 56 +++++++++++++++++------------------- C4/ClassSource.pm | 26 ++++++++-------- C4/Context.pm | 76 +++++++++++++++++++++---------------------------- C4/Debug.pm | 8 +++-- C4/Maintainance.pm | 19 ++++++------ C4/Overdues.pm | 67 +++++++++++++++++++++---------------------- C4/Reports.pm | 8 +---- C4/Ris.pm | 12 +------ C4/SMS.pm | 4 -- C4/Tags.pm | 2 + C4/VirtualShelves.pm | 42 ++++++++++++--------------- C4/XISBN.pm | 2 + C4/XSLT.pm | 10 ++++-- 14 files changed, 167 insertions(+), 190 deletions(-) diff --git a/C4/Cache.pm b/C4/Cache.pm index c07db16..ebe881a 100644 --- a/C4/Cache.pm +++ b/C4/Cache.pm @@ -19,22 +19,25 @@ package C4::Cache; =head1 NAME - C4::Cache - Handling caching of html and Objects for Koha +C4::Cache - Handling caching of html and Objects for Koha =head1 SYNOPSIS use C4::Cache (cache_type => $cache_type, %params ); - =head1 DESCRIPTION - Base class for C4::Cache::X. Subclasses need to provide the following methods +Base class for C4::Cache::X. Subclasses need to provide the following methods + +B<_cache_handle ($params_hr)> - cache handle creator + +B - B<_cache_handle ($params_hr)> - cache handle creator - B - B - B - B +B + +B + +B =head1 FUNCTIONS @@ -64,11 +67,11 @@ sub new { =head2 EXPORT - None by default. +None by default. =head1 SEE ALSO - - C4::Cache::Memcached + +C4::Cache::Memcached =head1 AUTHOR diff --git a/C4/Calendar.pm b/C4/Calendar.pm index d919c9d..b5a3436 100644 --- a/C4/Calendar.pm +++ b/C4/Calendar.pm @@ -58,15 +58,14 @@ C4::Calendar::Calendar - Koha module dealing with holidays. =head1 DESCRIPTION -This package is used to deal with holidays. Through this package, you can set all kind of holidays for the library. +This package is used to deal with holidays. Through this package, you can set +all kind of holidays for the library. =head1 FUNCTIONS -=over 2 +=head2 new -=item new - - $calendar = C4::Calendar->new(branchcode => $branchcode); + $calendar = C4::Calendar->new(branchcode => $branchcode); Each library branch has its own Calendar. C<$branchcode> specifies which Calendar you want. @@ -140,9 +139,9 @@ sub _init { return $self; } -=item get_week_days_holidays +=head2 get_week_days_holidays - $week_days_holidays = $calendar->get_week_days_holidays(); + $week_days_holidays = $calendar->get_week_days_holidays(); Returns a hash reference to week days holidays. @@ -154,9 +153,9 @@ sub get_week_days_holidays { return $week_days_holidays; } -=item get_day_month_holidays - - $day_month_holidays = $calendar->get_day_month_holidays(); +=head2 get_day_month_holidays + + $day_month_holidays = $calendar->get_day_month_holidays(); Returns a hash reference to day month holidays. @@ -168,8 +167,8 @@ sub get_day_month_holidays { return $day_month_holidays; } -=item get_exception_holidays - +=head2 get_exception_holidays + $exception_holidays = $calendar->exception_holidays(); Returns a hash reference to exception holidays. This kind of days are those @@ -184,8 +183,8 @@ sub get_exception_holidays { return $exception_holidays; } -=item get_single_holidays - +=head2 get_single_holidays + $single_holidays = $calendar->get_single_holidays(); Returns a hash reference to single holidays. This kind of holidays are those which @@ -199,7 +198,7 @@ sub get_single_holidays { return $single_holidays; } -=item insert_week_day_holiday +=head2 insert_week_day_holiday insert_week_day_holiday(weekday => $weekday, title => $title, @@ -227,7 +226,7 @@ sub insert_week_day_holiday { return $self; } -=item insert_day_month_holiday +=head2 insert_day_month_holiday insert_day_month_holiday(day => $day, month => $month, @@ -258,7 +257,7 @@ sub insert_day_month_holiday { return $self; } -=item insert_single_holiday +=head2 insert_single_holiday insert_single_holiday(day => $day, month => $month, @@ -293,7 +292,7 @@ sub insert_single_holiday { return $self; } -=item insert_exception_holiday +=head2 insert_exception_holiday insert_exception_holiday(day => $day, month => $month, @@ -328,7 +327,7 @@ sub insert_exception_holiday { return $self; } -=item ModWeekdayholiday +=head2 ModWeekdayholiday ModWeekdayholiday(weekday =>$weekday, title => $title, @@ -354,7 +353,7 @@ sub ModWeekdayholiday { return $self; } -=item ModDaymonthholiday +=head2 ModDaymonthholiday ModDaymonthholiday(day => $day, month => $month, @@ -385,7 +384,7 @@ sub ModDaymonthholiday { return $self; } -=item ModSingleholiday +=head2 ModSingleholiday ModSingleholiday(day => $day, month => $month, @@ -420,7 +419,7 @@ sub ModSingleholiday { return $self; } -=item ModExceptionholiday +=head2 ModExceptionholiday ModExceptionholiday(day => $day, month => $month, @@ -455,7 +454,7 @@ sub ModExceptionholiday { return $self; } -=item delete_holiday +=head2 delete_holiday delete_holiday(weekday => $weekday day => $day, @@ -530,10 +529,9 @@ sub delete_holiday { return $self; } -=item isHoliday - - $isHoliday = isHoliday($day, $month $year); +=head2 isHoliday + $isHoliday = isHoliday($day, $month $year); C<$day> Is the day to check whether if is a holiday or not. @@ -569,7 +567,7 @@ sub isHoliday { } -=item addDate +=head2 addDate my ($day, $month, $year) = $calendar->addDate($date, $offset) @@ -606,7 +604,7 @@ sub addDate { return(C4::Dates->new( sprintf("%04d-%02d-%02d",$year,$month,$day),'iso')); } -=item daysBetween +=head2 daysBetween my $daysBetween = $calendar->daysBetween($startdate, $enddate) @@ -641,8 +639,6 @@ sub daysBetween ($$$) { __END__ -=back - =head1 AUTHOR Koha Physics Library UNLP diff --git a/C4/ClassSource.pm b/C4/ClassSource.pm index 2dcaf78..13c2186 100644 --- a/C4/ClassSource.pm +++ b/C4/ClassSource.pm @@ -188,22 +188,22 @@ sub DelClassSource { my $sort_rules = GetClassSortRules(); - Returns reference to hash of references to - the class sorting rules, keyed on class_sort_rule - +Returns reference to hash of references to +the class sorting rules, keyed on class_sort_rule + =head3 Example -my $sort_rules = GetClassSortRules(); -my @sort_rules = (); -foreach my $sort_rule (sort keys %$sort_rules) { - my $sort_rule = $sort_rules->{$sort_rule}; - push @sort_rules, - { - rule => $sort_rule->{'class_sort_rule'}, - description => $sort_rule->{'description'}, - sort_routine => $sort_rule->{'sort_routine'} + my $sort_rules = GetClassSortRules(); + my @sort_rules = (); + foreach my $sort_rule (sort keys %$sort_rules) { + my $sort_rule = $sort_rules->{$sort_rule}; + push @sort_rules, + { + rule => $sort_rule->{'class_sort_rule'}, + description => $sort_rule->{'description'}, + sort_routine => $sort_rule->{'sort_routine'} } -} + } =cut diff --git a/C4/Context.pm b/C4/Context.pm index 926c1a5..fa69c76 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -137,8 +137,6 @@ environment variable to the pathname of a configuration file to use. =head1 METHODS -=over 2 - =cut #' @@ -186,8 +184,9 @@ $context = undef; # Initially, no context is set @context_stack = (); # Initially, no saved contexts -=item KOHAVERSION - returns the kohaversion stored in kohaversion.pl file +=head2 KOHAVERSION + +returns the kohaversion stored in kohaversion.pl file =cut @@ -203,9 +202,7 @@ sub KOHAVERSION { do $cgidir."/kohaversion.pl" || die "NO $cgidir/kohaversion.pl"; return kohaversion(); } -=item read_config_file - -=over 4 +=head2 read_config_file Reads the specified Koha config file. @@ -228,8 +225,6 @@ The elements nested within the element: Returns undef in case of error. -=back - =cut sub read_config_file { # Pass argument naming config file to read @@ -270,7 +265,7 @@ sub import { 1; } -=item new +=head2 new $context = new C4::Context; $context = new C4::Context("/path/to/koha-conf.xml"); @@ -332,7 +327,7 @@ sub new { return $self; } -=item set_context +=head2 set_context $context = new C4::Context; $context->set_context(); @@ -380,7 +375,7 @@ sub set_context $context = $new_context; } -=item restore_context +=head2 restore_context &restore_context; @@ -406,7 +401,7 @@ sub restore_context # that was current when this was called? } -=item config +=head2 config $value = C4::Context->config("config_variable"); @@ -444,7 +439,7 @@ sub ModZebrations { return _common_config($_[1],'serverinfo'); } -=item preference +=head2 preference $sys_preference = C4::Context->preference('some_variable'); @@ -493,13 +488,13 @@ sub boolean_preference ($) { return defined($it)? C4::Boolean::true_p($it): undef; } -=item clear_syspref_cache +=head2 clear_syspref_cache C4::Context->clear_syspref_cache(); - cleans the internal cache of sysprefs. Please call this method if - you update the systempreferences table. Otherwise, your new changes - will not be seen by this process. +cleans the internal cache of sysprefs. Please call this method if +you update the systempreferences table. Otherwise, your new changes +will not be seen by this process. =cut @@ -507,12 +502,12 @@ sub clear_syspref_cache { %sysprefs = (); } -=item set_preference +=head2 set_preference C4::Context->set_preference( $variable, $value ); - This updates a preference's value both in the systempreferences table and in - the sysprefs cache. +This updates a preference's value both in the systempreferences table and in +the sysprefs cache. =cut @@ -556,9 +551,9 @@ sub AUTOLOAD return $self->config($AUTOLOAD); } -=item Zconn +=head2 Zconn -$Zconn = C4::Context->Zconn + $Zconn = C4::Context->Zconn Returns a connection to the Zebra database for the current context. If no connection has yet been made, this method @@ -599,7 +594,7 @@ sub Zconn { } } -=item _new_Zconn +=head2 _new_Zconn $context->{"Zconn"} = &_new_Zconn($server,$async); @@ -711,7 +706,7 @@ sub _new_dbh return $dbh; } -=item dbh +=head2 dbh $dbh = C4::Context->dbh; @@ -742,7 +737,7 @@ sub dbh return $context->{"dbh"}; } -=item new_dbh +=head2 new_dbh $dbh = C4::Context->new_dbh; @@ -763,7 +758,7 @@ sub new_dbh return &_new_dbh(); } -=item set_dbh +=head2 set_dbh $my_dbh = C4::Connect->new_dbh; C4::Connect->set_dbh($my_dbh); @@ -794,7 +789,7 @@ sub set_dbh $context->{"dbh"} = $new_dbh; } -=item restore_dbh +=head2 restore_dbh C4::Context->restore_dbh; @@ -821,7 +816,7 @@ sub restore_dbh # return something, then this function should, too. } -=item marcfromkohafield +=head2 marcfromkohafield $dbh = C4::Context->marcfromkohafield; @@ -862,7 +857,7 @@ sub _new_marcfromkohafield return $marcfromkohafield; } -=item stopwords +=head2 stopwords $dbh = C4::Context->stopwords; @@ -903,7 +898,7 @@ sub _new_stopwords return $stopwordlist; } -=item userenv +=head2 userenv C4::Context->userenv; @@ -934,9 +929,10 @@ sub userenv { } } -=item set_userenv +=head2 set_userenv - C4::Context->set_userenv($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $userflags, $emailaddress); + C4::Context->set_userenv($usernum, $userid, $usercnum, $userfirstname, + $usersurname, $userbranch, $userflags, $emailaddress); Establish a hash of user environment variables. @@ -985,7 +981,7 @@ sub get_shelves_userenv () { return ($totshelves, $pubshelves, $barshelves); } -=item _new_userenv +=head2 _new_userenv C4::Context->_new_userenv($session); # FIXME: This calling style is wrong for what looks like an _internal function @@ -1006,7 +1002,7 @@ sub _new_userenv $context->{"activeuser"}=$sessionID; } -=item _unset_userenv +=head2 _unset_userenv C4::Context->_unset_userenv; @@ -1023,7 +1019,7 @@ sub _unset_userenv } -=item get_versions +=head2 get_versions C4::Context->get_versions @@ -1055,18 +1051,12 @@ sub get_versions { 1; __END__ -=back - =head1 ENVIRONMENT -=over 4 - -=item C +=head2 C Specifies the configuration file to read. -=back - =head1 SEE ALSO XML::Simple diff --git a/C4/Debug.pm b/C4/Debug.pm index dad8873..2cbb350 100644 --- a/C4/Debug.pm +++ b/C4/Debug.pm @@ -74,8 +74,8 @@ BEGIN { __END__ =head1 NAME - - C4::Debug - Standardized, centralized, exported debug switches. + +C4::Debug - Standardized, centralized, exported debug switches. =head1 SYNOPSIS @@ -116,7 +116,7 @@ The general purpose debug switch. =over =item environmental variable DEBUG or KOHA_DEBUG. In bash, you might do: - + export KOHA_DEBUG=1; perl t/Auth.t; @@ -159,6 +159,8 @@ emailing yourself a test message would all be bad actions to tie to $cgi_debug. =head2 System Preferences +=cut + =head2 Database Debug Debugging at the database level might be useful. Koha does not currently integrate any such diff --git a/C4/Maintainance.pm b/C4/Maintainance.pm index 740163f..570a413 100644 --- a/C4/Maintainance.pm +++ b/C4/Maintainance.pm @@ -47,15 +47,13 @@ miscategorized items, etc. =head1 FUNCTIONS -=over 2 - =cut @ISA = qw(Exporter); @EXPORT = qw(&listsubjects &shiftgroup &deletedbib &undeletebib &updatetype &logaction); -=item listsubjects +=head2 listsubjects ($count, $results) = &listsubjects($subject, $n, $offset); @@ -74,6 +72,7 @@ C<&listsubject> returns up to C<$n> items, starting at C<$offset>. If C<$n> is 0, it will return all matching subjects. =cut + #' # FIXME - This API is bogus. The way it's currently used, it should # just return a list of strings. @@ -101,7 +100,7 @@ sub listsubjects { return($i,\@results); } -=item shiftgroup +=head2 shiftgroup &shiftgroup($biblionumber, $biblioitemnumber); @@ -110,6 +109,7 @@ C<$biblioitemnumber> is the number of the biblioitem to change. C<$biblionumber> is the biblionumber to associate it with. =cut + #' sub shiftgroup{ my ($biblionumber,$bi)=@_; @@ -122,7 +122,7 @@ sub shiftgroup{ $sth->finish; } -=item deletedbib +=head2 deletedbib ($count, $results) = &deletedbib($title); @@ -134,6 +134,7 @@ the fields of the deletedbiblio table in the Koha database. C<$count> is the number of elements in C<$results>. =cut + #' sub deletedbib{ my ($title)=@_; @@ -150,7 +151,7 @@ sub deletedbib{ return($i,\@results); } -=item undeletebib +=head2 undeletebib &undeletebib($biblionumber); @@ -159,6 +160,7 @@ biblionumber in the deletedbiblio table of the Koha database, and moves its entry to the biblio table. =cut + #' sub undeletebib{ my ($biblionumber)=@_; @@ -183,7 +185,7 @@ sub undeletebib{ $sth->finish; } -=item updatetype +=head2 updatetype &updatetype($biblioitemnumber, $itemtype); @@ -191,6 +193,7 @@ Changes the type of the item with the given biblioitemnumber to be C<$itemtype>. =cut + #' sub updatetype{ my ($bi,$type)=@_; @@ -205,8 +208,6 @@ END { } # module clean-up code here (global destructor) 1; __END__ -=back - =head1 AUTHOR Koha Development Team diff --git a/C4/Overdues.pm b/C4/Overdues.pm index 7ea969c..fc0af93 100644 --- a/C4/Overdues.pm +++ b/C4/Overdues.pm @@ -156,7 +156,7 @@ LEFT JOIN biblioitems USING (biblioitemnumber) =head2 checkoverdues -($count, $overdueitems) = checkoverdues($borrowernumber); + ($count, $overdueitems) = checkoverdues($borrowernumber); Returns a count and a list of overdueitems for a given borrowernumber @@ -180,8 +180,9 @@ sub checkoverdues { =head2 CalcFine - ($amount, $chargename, $daycount, $daycounttotal) = - &CalcFine($item, $categorycode, $branch, $days_overdue, $description, $start_date, $end_date ); + ($amount, $chargename, $daycount, $daycounttotal) = &CalcFine($item, + $categorycode, $branch, $days_overdue, + $description, $start_date, $end_date ); Calculates the fine for a book. @@ -277,7 +278,7 @@ sub CalcFine { =head2 GetSpecialHolidays -&GetSpecialHolidays($date_dues,$itemnumber); + &GetSpecialHolidays($date_dues,$itemnumber); return number of special days between date of the day and date due @@ -335,7 +336,7 @@ AND branchcode=? =head2 GetRepeatableHolidays -&GetRepeatableHolidays($date_dues, $itemnumber, $difference,); + &GetRepeatableHolidays($date_dues, $itemnumber, $difference,); return number of day closed between date of the day and date due @@ -373,7 +374,7 @@ sub GetRepeatableHolidays { =head2 GetWayFromItemnumber -&Getwdayfromitemnumber($itemnumber); + &Getwdayfromitemnumber($itemnumber); return the different week day from repeatable_holidays table @@ -401,7 +402,7 @@ sub GetWdayFromItemnumber { =head2 GetIssuesIteminfo -&GetIssuesIteminfo($itemnumber); + &GetIssuesIteminfo($itemnumber); return all data from issues about item @@ -425,7 +426,7 @@ sub GetIssuesIteminfo { =head2 UpdateFine - &UpdateFine($itemnumber, $borrowernumber, $amount, $type, $description); + &UpdateFine($itemnumber, $borrowernumber, $amount, $type, $description); (Note: the following is mostly conjecture and guesswork.) @@ -552,7 +553,7 @@ sub UpdateFine { =head2 BorType - $borrower = &BorType($borrowernumber); + $borrower = &BorType($borrowernumber); Looks up a patron by borrower number. @@ -578,7 +579,7 @@ sub BorType { =head2 ReplacementCost - $cost = &ReplacementCost($itemnumber); + $cost = &ReplacementCost($itemnumber); Returns the replacement cost of the item with the given item number. @@ -599,7 +600,7 @@ sub ReplacementCost { =head2 GetFine -$data->{'sum(amountoutstanding)'} = &GetFine($itemnum,$borrowernumber); + $data->{'sum(amountoutstanding)'} = &GetFine($itemnum,$borrowernumber); return the total of fine @@ -628,7 +629,7 @@ sub GetFine { FIXME - This sub should be deprecated and removed. It ignores branch and defaults. -$data = &GetIssuingRules($itemtype,$categorycode); + $data = &GetIssuingRules($itemtype,$categorycode); Looks up for all issuingrules an item info @@ -675,7 +676,7 @@ sub ReplacementCost2 { =head2 GetNextIdNotify -($result) = &GetNextIdNotify($reference); + ($result) = &GetNextIdNotify($reference); Returns the new file number @@ -714,7 +715,7 @@ sub GetNextIdNotify { =head2 NumberNotifyId -(@notify) = &NumberNotifyId($borrowernumber); + (@notify) = &NumberNotifyId($borrowernumber); Returns amount for all file per borrowers C<@notify> array contains all file per borrowers @@ -740,7 +741,7 @@ sub NumberNotifyId{ =head2 AmountNotify -($totalnotify) = &AmountNotify($notifyid); + ($totalnotify) = &AmountNotify($notifyid); Returns amount for all file per borrowers C<$notifyid> is the file number @@ -767,7 +768,7 @@ sub AmountNotify{ =head2 GetNotifyId -($notify_id) = &GetNotifyId($borrowernumber,$itemnumber); + ($notify_id) = &GetNotifyId($borrowernumber,$itemnumber); Returns the file number per borrower and itemnumber @@ -797,7 +798,9 @@ sub GetNotifyId { =head2 CreateItemAccountLine -() = &CreateItemAccountLine($borrowernumber,$itemnumber,$date,$amount,$description,$accounttype,$amountoutstanding,$timestamp,$notify_id,$level); + () = &CreateItemAccountLine($borrowernumber, $itemnumber, $date, $amount, + $description, $accounttype, $amountoutstanding, + $timestamp, $notify_id, $level); update the account lines with file number or with file level @@ -850,7 +853,7 @@ sub CreateItemAccountLine { =head2 UpdateAccountLines -() = &UpdateAccountLines($notify_id,$notify_level,$borrowernumber,$itemnumber); + () = &UpdateAccountLines($notify_id,$notify_level,$borrowernumber,$itemnumber); update the account lines with file number or with file level @@ -893,7 +896,7 @@ sub UpdateAccountLines { =head2 GetItems -($items) = &GetItems($itemnumber); + ($items) = &GetItems($itemnumber); Returns the list of all delays from overduerules. @@ -922,7 +925,7 @@ sub GetItems { =head2 GetOverdueDelays -(@delays) = &GetOverdueDelays($categorycode); + (@delays) = &GetOverdueDelays($categorycode); Returns the list of all delays from overduerules. @@ -945,14 +948,10 @@ sub GetOverdueDelays { =head2 GetBranchcodesWithOverdueRules -=over 4 - -my @branchcodes = C4::Overdues::GetBranchcodesWithOverdueRules() + my @branchcodes = C4::Overdues::GetBranchcodesWithOverdueRules() returns a list of branch codes for branches with overdue rules defined. -=back - =cut sub GetBranchcodesWithOverdueRules { @@ -965,7 +964,7 @@ sub GetBranchcodesWithOverdueRules { =head2 CheckAccountLineLevelInfo -($exist) = &CheckAccountLineLevelInfo($borrowernumber,$itemnumber,$accounttype,notify_level); + ($exist) = &CheckAccountLineLevelInfo($borrowernumber,$itemnumber,$accounttype,notify_level); Check and Returns the list of all overdue books. @@ -999,7 +998,7 @@ sub CheckAccountLineLevelInfo { =head2 GetOverduerules -($overduerules) = &GetOverduerules($categorycode); + ($overduerules) = &GetOverduerules($categorycode); Returns the value of borrowers (debarred or not) with notify level @@ -1026,7 +1025,7 @@ sub GetOverduerules { =head2 CheckBorrowerDebarred -($debarredstatus) = &CheckBorrowerDebarred($borrowernumber); + ($debarredstatus) = &CheckBorrowerDebarred($borrowernumber); Check if the borrowers is already debarred @@ -1053,7 +1052,7 @@ sub CheckBorrowerDebarred { =head2 UpdateBorrowerDebarred -($borrowerstatut) = &UpdateBorrowerDebarred($borrowernumber); + ($borrowerstatut) = &UpdateBorrowerDebarred($borrowernumber); update status of borrowers in borrowers table (field debarred) @@ -1076,7 +1075,7 @@ sub UpdateBorrowerDebarred{ =head2 CheckExistantNotifyid - ($exist) = &CheckExistantNotifyid($borrowernumber,$itemnumber,$accounttype,$notify_id); + ($exist) = &CheckExistantNotifyid($borrowernumber,$itemnumber,$accounttype,$notify_id); Check and Returns the notify id if exist else return 0. @@ -1103,7 +1102,7 @@ sub CheckExistantNotifyid { =head2 CheckAccountLineItemInfo - ($exist) = &CheckAccountLineItemInfo($borrowernumber,$itemnumber,$accounttype,$notify_id); + ($exist) = &CheckAccountLineItemInfo($borrowernumber,$itemnumber,$accounttype,$notify_id); Check and Returns the list of all overdue items from the same file number(notify_id). @@ -1228,9 +1227,9 @@ sub GetOverduesForBranch { =head2 AddNotifyLine -&AddNotifyLine($borrowernumber, $itemnumber, $overduelevel, $method, $notifyId) + &AddNotifyLine($borrowernumber, $itemnumber, $overduelevel, $method, $notifyId) -Creat a line into notify, if the method is phone, the notification_send_date is implemented to +Create a line into notify, if the method is phone, the notification_send_date is implemented to =cut @@ -1258,7 +1257,7 @@ sub AddNotifyLine { =head2 RemoveNotifyLine -&RemoveNotifyLine( $borrowernumber, $itemnumber, $notify_date ); + &RemoveNotifyLine( $borrowernumber, $itemnumber, $notify_date ); Cancel a notification diff --git a/C4/Reports.pm b/C4/Reports.pm index ab23f19..3e2f195 100644 --- a/C4/Reports.pm +++ b/C4/Reports.pm @@ -36,7 +36,7 @@ BEGIN { } =head1 NAME - + C4::Reports - Module for generating reports =head1 DESCRIPTION @@ -47,11 +47,7 @@ This module contains functions common to reports. =head2 GetDelimiterChoices -=over 4 - -my $delims = GetDelimiterChoices; - -=back + my $delims = GetDelimiterChoices; This will return a list of all the available delimiters. diff --git a/C4/Ris.pm b/C4/Ris.pm index c5c4806..fcb5b89 100644 --- a/C4/Ris.pm +++ b/C4/Ris.pm @@ -74,22 +74,14 @@ $VERSION = 3.00; ); -=head2 marc2bibtex - Convert from UNIMARC to RIS +=head1 marc2bibtex - Convert from UNIMARC to RIS -=over 4 - -my ($ris) = marc2ris($record); + my ($ris) = marc2ris($record); Returns a RIS scalar -=over 2 - C<$record> - a MARC::Record object -=back - -=back - =cut sub marc2ris { diff --git a/C4/SMS.pm b/C4/SMS.pm index 457a662..35d687b 100644 --- a/C4/SMS.pm +++ b/C4/SMS.pm @@ -90,10 +90,6 @@ sub send_sms { =head2 driver -=over 4 - -=back - =cut sub driver { diff --git a/C4/Tags.pm b/C4/Tags.pm index ecd9758..a260383 100644 --- a/C4/Tags.pm +++ b/C4/Tags.pm @@ -581,6 +581,8 @@ More verose debugging messages are sent in the presence of non-zero $ENV{"DEBUG" =head3 TO DO: Add real perldoc +=cut + =head2 External Dictionary (Ispell) [Recommended] An external dictionary can be used as a means of "pre-populating" and tracking diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm index e47b4b8..97cd150 100644 --- a/C4/VirtualShelves.pm +++ b/C4/VirtualShelves.pm @@ -71,9 +71,7 @@ items to and from virtualshelves. =head1 FUNCTIONS -=over 2 - -=item GetShelves +=head2 GetShelves ($shelflist, $totshelves) = &GetShelves($mincategory, $row_count, $offset, $owner); ($shelfnumber, $shelfhash) = each %{$shelflist}; @@ -85,7 +83,7 @@ When C<$mincategory> is 2 or 3, supply undef as argument for C<$owner>. C<$shelflist>is a reference-to-hash. The keys are the virtualshelves numbers (C<$shelfnumber>, above), and the values (C<$shelfhash>, above) are themselves references-to-hash, with the following keys: -=over 4 +=over =item C<$shelfhash-E{shelfname}> @@ -137,7 +135,7 @@ sub GetShelves ($$$$) { return ( \%shelflist, $total ); } -=item GetShelvesSummary +=head2 GetShelvesSummary ($shelves, $total) = GetShelvesSummary($mincategory, $row_count, $offset, $owner) @@ -186,7 +184,7 @@ sub GetShelvesSummary ($$$$) { # 2|6|Josh Ferraro|51|en_fuego|106 } -=item GetRecentShelves +=head2 GetRecentShelves ($shelflist) = GetRecentShelves(1, $limit, $owner) @@ -214,7 +212,7 @@ sub GetRecentShelves ($$$) { return ( \@shelflist, $total ); } -=item GetShelf +=head2 GetShelf (shelfnumber,shelfname,owner,category,sortfield) = &GetShelf($shelfnumber); @@ -237,7 +235,7 @@ sub GetShelf ($) { return $sth->fetchrow; } -=item GetShelfContents +=head2 GetShelfContents $itemlist = &GetShelfContents($shelfnumber); @@ -295,7 +293,7 @@ sub GetShelfContents ($;$$$) { # or newer, for your version of DBI. } -=item AddShelf +=head2 AddShelf $shelfnumber = &AddShelf( $shelfname, $owner, $category); @@ -329,7 +327,7 @@ sub AddShelf { return ($shelfnumber); } -=item AddToShelf +=head2 AddToShelf &AddToShelf($biblionumber, $shelfnumber); @@ -366,12 +364,12 @@ sub AddToShelf { $sth->execute( $shelfnumber ); } -=item AddToShelfFromBiblio - +=head2 AddToShelfFromBiblio + &AddToShelfFromBiblio($biblionumber, $shelfnumber) - this function allow to add a virtual into the shelf number $shelfnumber - from biblionumber. +this function allow to add a virtual into the shelf number $shelfnumber +from biblionumber. =cut @@ -402,7 +400,7 @@ sub AddToShelfFromBiblio { } } -=item ModShelf +=head2 ModShelf ModShelf($shelfnumber, $hashref) @@ -451,7 +449,7 @@ sub ModShelf { $sth->execute( @bind_params ); } -=item ShelfPossibleAction +=head2 ShelfPossibleAction ShelfPossibleAction($loggedinuser, $shelfnumber, $action); @@ -484,7 +482,7 @@ sub ShelfPossibleAction { return 0; } -=item DelFromShelf +=head2 DelFromShelf &DelFromShelf( $biblionumber, $shelfnumber); @@ -505,7 +503,7 @@ sub DelFromShelf { $sth->execute( $shelfnumber, $biblionumber ); } -=item DelShelf (old version) +=head2 DelShelf (old version) ($status, $msg) = &DelShelf($shelfnumber); @@ -516,7 +514,7 @@ Returns a two-element array, where C<$status> is 0 if the operation was successful, or non-zero otherwise. C<$msg> is "Done" in case of success, or an error message giving the reason for failure. -=item DelShelf (current version) +=head2 DelShelf (current version) $Number = DelShelf($shelfnumber); @@ -533,7 +531,7 @@ sub DelShelf { return $sth->execute(shift); } -=item GetBibShelves +=head2 GetBibShelves This finds all the public lists that this bib record is in. @@ -553,7 +551,7 @@ sub GetBibliosShelves { return $sth->fetchall_arrayref({}); } -=item RefreshShelvesSummary +=head2 RefreshShelvesSummary ($total, $pubshelves, $barshelves) = RefreshShelvesSummary($sessionID, $loggedinuser, $row_count); @@ -628,8 +626,6 @@ sub each_biblionumbers (&$) { __END__ -=back - =head1 AUTHOR Koha Development Team diff --git a/C4/XISBN.pm b/C4/XISBN.pm index 17e1394..4f3f488 100644 --- a/C4/XISBN.pm +++ b/C4/XISBN.pm @@ -180,6 +180,8 @@ __END__ =head1 NOTES +=cut + =head1 AUTHOR Joshua Ferraro diff --git a/C4/XSLT.pm b/C4/XSLT.pm index 6fd93b4..d454981 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -49,9 +49,9 @@ C4::XSLT - Functions for displaying XSLT-generated content =head1 FUNCTIONS -=head1 transformMARCXML4XSLT +=head2 transformMARCXML4XSLT -=head2 replaces codes with authorized values in a MARC::Record object +Replaces codes with authorized values in a MARC::Record object =cut @@ -88,9 +88,9 @@ sub transformMARCXML4XSLT { return $record; } -=head1 getAuthorisedValues4MARCSubfields +=head2 getAuthorisedValues4MARCSubfields -=head2 returns an ref of hash of ref of hash for tag -> letter controled bu authorised values +Returns a ref of hash of ref of hash for tag -> letter controled by authorised values =cut @@ -230,6 +230,8 @@ __END__ =head1 NOTES +=cut + =head1 AUTHOR Joshua Ferraro -- 1.7.0.4 From nahuel.angelinetti at biblibre.com Mon Jun 7 11:09:19 2010 From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI) Date: Mon, 7 Jun 2010 11:09:19 +0200 Subject: [Koha-patches] [PATCH] (bug #4853) change rights needed to renew loans Message-ID: <1275901759-22850-1-git-send-email-nahuel.angelinetti@biblibre.com> Use "circulate" right, instead of "borrower". --- reserve/renewscript.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reserve/renewscript.pl b/reserve/renewscript.pl index 2d26929..b780e9a 100755 --- a/reserve/renewscript.pl +++ b/reserve/renewscript.pl @@ -38,8 +38,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => { borrowers => 1 }, - debug => 1, + flagsrequired => { circulate => 1 }, + debug => 0, } ); -- 1.7.0.4 From andrew.elwell at gmail.com Mon Jun 7 12:06:44 2010 From: andrew.elwell at gmail.com (Andrew Elwell) Date: Mon, 7 Jun 2010 12:06:44 +0200 Subject: [Koha-patches] [PATCH 5/5] POD Cleanups Message-ID: <1275905204-7899-1-git-send-email-Andrew.Elwell@gmail.com> Signed-off-by: Andrew Elwell --- C4/Category.pm | 22 ++++ C4/Charset.pm | 102 ++++------------ C4/Circulation.pm | 144 ++++++++++------------ C4/Heading.pm | 36 ++---- C4/ImportBatch.pm | 225 +++++++--------------------------- C4/Installer.pm | 121 +++++------------- C4/ItemCirculationAlertPreference.pm | 8 ++ C4/ItemType.pm | 12 ++ C4/Languages.pm | 2 + C4/Letters.pm | 33 +---- C4/Message.pm | 33 ++++- C4/Print.pm | 12 +-- C4/Reserves.pm | 176 ++++++++++++-------------- C4/RotatingCollections.pm | 87 +++++++++---- C4/SQLHelper.pm | 52 ++------- C4/Scheduler.pm | 17 +-- C4/Scrubber.pm | 6 +- C4/Service.pm | 42 +------ 18 files changed, 432 insertions(+), 698 deletions(-) diff --git a/C4/Category.pm b/C4/Category.pm index 3dc6327..b81e88f 100644 --- a/C4/Category.pm +++ b/C4/Category.pm @@ -90,26 +90,48 @@ These are read-only accessors for attributes of a C4::Category object. =head3 $category->categorycode +=cut + =head3 $category->description +=cut + =head3 $category->enrolmentperiod +=cut + =head3 $category->upperagelimit +=cut + =head3 $category->dateofbirthrequired +=cut + =head3 $category->finetype +=cut + =head3 $category->bulk +=cut + =head3 $category->enrolmentfee +=cut + =head3 $category->overduenoticerequired +=cut + =head3 $category->issuelimit +=cut + =head3 $category->reservefee +=cut + =head3 $category->category_type =cut diff --git a/C4/Charset.pm b/C4/Charset.pm index 2f1d123..5324ff9 100644 --- a/C4/Charset.pm +++ b/C4/Charset.pm @@ -47,7 +47,7 @@ C4::Charset - utilities for handling character set conversions. =head1 SYNOPSIS -use C4::Charset; + use C4::Charset; =head1 DESCRIPTION @@ -76,16 +76,12 @@ on how to deal with the situation. =head2 IsStringUTF8ish -=over 4 - -my $is_utf8 = IsStringUTF8ish($str); - -=back + my $is_utf8 = IsStringUTF8ish($str); Determines if C<$str> is valid UTF-8. This can mean one of two things: -=over 2 +=over =item * @@ -115,11 +111,7 @@ sub IsStringUTF8ish { =head2 SetUTF8Flag -=over 4 - -my $marc_record = SetUTF8Flag($marc_record); - -=back + my $marc_record = SetUTF8Flag($marc_record); This function sets the PERL UTF8 flag for data. It is required when using new_from_usmarc @@ -156,24 +148,21 @@ sub SetUTF8Flag{ =head2 NormalizeString -=over 4 - my $normalized_string=NormalizeString($string); -=back +Given a string - Given - a string - nfc : If you want to set NFC and not NFD - transform : If you expect all the signs to be removed - Sets the PERL UTF8 Flag on your initial data if need be - and applies cleaning if required - - Returns a utf8 NFD normalized string - - Sample code : - my $string=NormalizeString ("l'ornithopt?re"); +nfc : If you want to set NFC and not NFD +transform : If you expect all the signs to be removed +Sets the PERL UTF8 Flag on your initial data if need be +and applies cleaning if required + +Returns a utf8 NFD normalized string + +Sample code : + my $string=NormalizeString ("l'ornithopt?re"); #results into ornithopt?re in NFD form and sets UTF8 Flag + =cut sub NormalizeString{ @@ -196,11 +185,8 @@ sub NormalizeString{ =head2 MarcToUTF8Record -=over 4 - -($marc_record, $converted_from, $errors_arrayref) = MarcToUTF8Record($marc_blob, $marc_flavour, [, $source_encoding]); - -=back + ($marc_record, $converted_from, $errors_arrayref) = MarcToUTF8Record($marc_blob, + $marc_flavour, [, $source_encoding]); Given a MARC blob or a C, the MARC flavour, and an optional source encoding, return a C that is @@ -313,11 +299,7 @@ sub MarcToUTF8Record { =head2 SetMarcUnicodeFlag -=over 4 - -SetMarcUnicodeFlag($marc_record, $marc_flavour); - -=back + SetMarcUnicodeFlag($marc_record, $marc_flavour); Set both the internal MARC::Record encoding flag and the appropriate Leader/09 (MARC21) or @@ -364,11 +346,7 @@ sub SetMarcUnicodeFlag { =head2 StripNonXmlChars -=over 4 - -my $new_str = StripNonXmlChars($old_str); - -=back + my $new_str = StripNonXmlChars($old_str); Given a string, return a copy with the characters that are illegal in XML @@ -404,11 +382,7 @@ sub StripNonXmlChars { =head2 _default_marc21_charconv_to_utf8 -=over 4 - -my ($new_marc_record, $guessed_charset) = _default_marc21_charconv_to_utf8($marc_record); - -=back + my ($new_marc_record, $guessed_charset) = _default_marc21_charconv_to_utf8($marc_record); Converts a C of unknown character set to UTF-8, first by trying a MARC-8 to UTF-8 conversion, then ISO-8859-1 @@ -450,11 +424,7 @@ sub _default_marc21_charconv_to_utf8 { =head2 _default_unimarc_charconv_to_utf8 -=over 4 - -my ($new_marc_record, $guessed_charset) = _default_unimarc_charconv_to_utf8($marc_record); - -=back + my ($new_marc_record, $guessed_charset) = _default_unimarc_charconv_to_utf8($marc_record); Converts a C of unknown character set to UTF-8, first by trying a ISO-5426 to UTF-8 conversion, then ISO-8859-1 @@ -494,11 +464,7 @@ sub _default_unimarc_charconv_to_utf8 { =head2 _marc_marc8_to_utf8 -=over 4 - -my @errors = _marc_marc8_to_utf8($marc_record, $marc_flavour, $source_encoding); - -=back + my @errors = _marc_marc8_to_utf8($marc_record, $marc_flavour, $source_encoding); Convert a C to UTF-8 in-place from MARC-8. If the conversion fails for some reason, an @@ -569,11 +535,7 @@ sub _marc_marc8_to_utf8 { =head2 _marc_iso5426_to_utf8 -=over 4 - -my @errors = _marc_iso5426_to_utf8($marc_record, $marc_flavour, $source_encoding); - -=back + my @errors = _marc_iso5426_to_utf8($marc_record, $marc_flavour, $source_encoding); Convert a C to UTF-8 in-place from ISO-5426. If the conversion fails for some reason, an @@ -615,11 +577,7 @@ sub _marc_iso5426_to_utf8 { =head2 _marc_to_utf8_via_text_iconv -=over 4 - -my @errors = _marc_to_utf8_via_text_iconv($marc_record, $marc_flavour, $source_encoding); - -=back + my @errors = _marc_to_utf8_via_text_iconv($marc_record, $marc_flavour, $source_encoding); Convert a C to UTF-8 in-place using the C CPAN module. Any source encoding accepted @@ -688,11 +646,7 @@ sub _marc_to_utf8_via_text_iconv { =head2 _marc_to_utf8_replacement_char -=over 4 - -_marc_to_utf8_replacement_char($marc_record, $marc_flavour); - -=back + _marc_to_utf8_replacement_char($marc_record, $marc_flavour); Convert a C to UTF-8 in-place, adopting the unsatisfactory method of replacing all non-ASCII (e.g., @@ -731,11 +685,7 @@ sub _marc_to_utf8_replacement_char { =head2 char_decode5426 -=over 4 - -my $utf8string = char_decode5426($iso_5426_string); - -=back + my $utf8string = char_decode5426($iso_5426_string); Converts a string from ISO-5426 to UTF-8. diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 1207b24..f47812c 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -117,11 +117,9 @@ Also deals with stocktaking. =head2 barcodedecode -=head3 $str = &barcodedecode($barcode, [$filter]); + $str = &barcodedecode($barcode, [$filter]); -=over 4 - -=item Generic filter function for barcode string. +Generic filter function for barcode string. Called on every circ if the System Pref itemBarcodeInputFilter is set. Will do some manipulation of the barcode for systems that deliver a barcode to circulation.pl that differs from the barcode stored for the item. @@ -132,8 +130,6 @@ The optional $filter argument is to allow for testing or explicit behavior that ignores the System Pref. Valid values are the same as the System Pref options. -=back - =cut # FIXME -- the &decode fcn below should be wrapped into this one. @@ -165,18 +161,14 @@ sub barcodedecode { =head2 decode -=head3 $str = &decode($chunk); - -=over 4 + $str = &decode($chunk); -=item Decodes a segment of a string emitted by a CueCat barcode scanner and +Decodes a segment of a string emitted by a CueCat barcode scanner and returns it. FIXME: Should be replaced with Barcode::Cuecat from CPAN or Javascript based decoding on the client side. -=back - =cut sub decode { @@ -208,7 +200,8 @@ sub decode { =head2 transferbook -($dotransfer, $messages, $iteminformation) = &transferbook($newbranch, $barcode, $ignore_reserves); + ($dotransfer, $messages, $iteminformation) = &transferbook($newbranch, + $barcode, $ignore_reserves); Transfers an item to a new branch. If the item is currently on loan, it is automatically returned before the actual transfer. @@ -221,15 +214,17 @@ Otherwise, if an item is reserved, the transfer fails. Returns three values: -=head3 $dotransfer +=over + +=item $dotransfer is true if the transfer was successful. -=head3 $messages +=item $messages is a reference-to-hash which may have any of the following keys: -=over 4 +=over =item C @@ -257,6 +252,8 @@ The item was eligible to be transferred. Barring problems communicating with the =back +=back + =cut sub transferbook { @@ -561,9 +558,10 @@ sub itemissues { =head2 CanBookBeIssued -Check if a book can be issued. + ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $borrower, + $barcode, $duedatespec, $inprocess ); -( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $borrower, $barcode, $duedatespec, $inprocess ); +Check if a book can be issued. C<$issuingimpossible> and C<$needsconfirmation> are some hashref. @@ -620,8 +618,8 @@ item withdrawn. item is restricted (set by ??) -C<$needsconfirmation> a reference to a hash. It contains reasons why the loan could be prevented, -but ones that can be overriden by the operator. +C<$needsconfirmation> a reference to a hash. It contains reasons why the loan +could be prevented, but ones that can be overriden by the operator. Possible values are : @@ -866,9 +864,9 @@ sub CanBookBeIssued { =head2 AddIssue -Issue a book. Does no check, they are done in CanBookBeIssued. If we reach this sub, it means the user confirmed if needed. + &AddIssue($borrower, $barcode, [$datedue], [$cancelreserve], [$issuedate]) -&AddIssue($borrower, $barcode, [$datedue], [$cancelreserve], [$issuedate]) +Issue a book. Does no check, they are done in CanBookBeIssued. If we reach this sub, it means the user confirmed if needed. =over 4 @@ -1076,9 +1074,9 @@ sub AddIssue { =head2 GetLoanLength -Get loan length for an itemtype, a borrower type and a branch + my $loanlength = &GetLoanLength($borrowertype,$itemtype,branchcode) -my $loanlength = &GetLoanLength($borrowertype,$itemtype,branchcode) +Get loan length for an itemtype, a borrower type and a branch =cut @@ -1138,6 +1136,8 @@ sub GetLoanLength { =head2 GetIssuingRule + my $irule = &GetIssuingRule($borrowertype,$itemtype,branchcode) + FIXME - This is a copy-paste of GetLoanLength as a stop-gap. Do not wish to change API for GetLoanLength this close to release, however, Overdues::GetIssuingRules is broken. @@ -1145,8 +1145,6 @@ this close to release, however, Overdues::GetIssuingRules is broken. Get the issuing rule for an itemtype, a borrower type and a branch Returns a hashref from the issuingrules table. -my $irule = &GetIssuingRule($borrowertype,$itemtype,branchcode) - =cut sub GetIssuingRule { @@ -1193,11 +1191,7 @@ sub GetIssuingRule { =head2 GetBranchBorrowerCircRule -=over 4 - -my $branch_cat_rule = GetBranchBorrowerCircRule($branchcode, $categorycode); - -=back + my $branch_cat_rule = GetBranchBorrowerCircRule($branchcode, $categorycode); Retrieves circulation rule attributes that apply to the given branch and patron category, regardless of item type. @@ -1280,11 +1274,7 @@ sub GetBranchBorrowerCircRule { =head2 GetBranchItemRule -=over 4 - -my $branch_item_rule = GetBranchItemRule($branchcode, $itemtype); - -=back + my $branch_item_rule = GetBranchItemRule($branchcode, $itemtype); Retrieves circulation rule attributes that apply to the given branch and item type, regardless of patron category. @@ -1344,8 +1334,8 @@ sub GetBranchItemRule { =head2 AddReturn -($doreturn, $messages, $iteminformation, $borrower) = - &AddReturn($barcode, $branch, $exemptfine, $dropbox); + ($doreturn, $messages, $iteminformation, $borrower) = + &AddReturn($barcode, $branch, $exemptfine, $dropbox); Returns a book. @@ -1599,11 +1589,7 @@ sub AddReturn { =head2 MarkIssueReturned -=over 4 - -MarkIssueReturned($borrowernumber, $itemnumber, $dropbox_branch, $returndate); - -=back + MarkIssueReturned($borrowernumber, $itemnumber, $dropbox_branch, $returndate); Unconditionally marks an issue as being returned by moving the C row to C and @@ -1654,7 +1640,7 @@ sub MarkIssueReturned { =head2 _FixOverduesOnReturn - &_FixOverduesOnReturn($brn,$itm, $exemptfine, $dropboxmode); + &_FixOverduesOnReturn($brn,$itm, $exemptfine, $dropboxmode); C<$brn> borrowernumber @@ -1718,7 +1704,7 @@ sub _FixOverduesOnReturn { =head2 _FixAccountForLostAndReturned - &_FixAccountForLostAndReturned($itemnumber, [$borrowernumber, $barcode]); + &_FixAccountForLostAndReturned($itemnumber, [$borrowernumber, $barcode]); Calculates the charge for a book lost and returned. @@ -1849,7 +1835,7 @@ sub _GetCircControlBranch { =head2 GetItemIssue -$issue = &GetItemIssue($itemnumber); + $issue = &GetItemIssue($itemnumber); Returns patron currently having a book, or undef if not checked out. @@ -1876,7 +1862,7 @@ sub GetItemIssue { =head2 GetOpenIssue -$issue = GetOpenIssue( $itemnumber ); + $issue = GetOpenIssue( $itemnumber ); Returns the row from the issues table if the item is currently issued, undef if the item is not currently issued @@ -1898,7 +1884,7 @@ sub GetOpenIssue { =head2 GetItemIssues -$issues = &GetItemIssues($itemnumber, $history); + $issues = &GetItemIssues($itemnumber, $history); Returns patrons that have issued a book @@ -1941,7 +1927,7 @@ sub GetItemIssues { =head2 GetBiblioIssues -$issues = GetBiblioIssues($biblionumber); + $issues = GetBiblioIssues($biblionumber); this function get all issues from a biblionumber. @@ -1985,11 +1971,7 @@ sub GetBiblioIssues { =head2 GetUpcomingDueIssues -=over 4 - -my $upcoming_dues = GetUpcomingDueIssues( { days_in_advance => 4 } ); - -=back + my $upcoming_dues = GetUpcomingDueIssues( { days_in_advance => 4 } ); =cut @@ -2019,7 +2001,7 @@ END_SQL =head2 CanBookBeRenewed -($ok,$error) = &CanBookBeRenewed($borrowernumber, $itemnumber[, $override_limit]); + ($ok,$error) = &CanBookBeRenewed($borrowernumber, $itemnumber[, $override_limit]); Find out whether a borrowed item may be renewed. @@ -2111,7 +2093,7 @@ sub CanBookBeRenewed { =head2 AddRenewal -&AddRenewal($borrowernumber, $itemnumber, $branch, [$datedue], [$lastreneweddate]); + &AddRenewal($borrowernumber, $itemnumber, $branch, [$datedue], [$lastreneweddate]); Renews a loan. @@ -2248,7 +2230,7 @@ sub GetRenewCount { =head2 GetIssuingCharges -($charge, $item_type) = &GetIssuingCharges($itemnumber, $borrowernumber); + ($charge, $item_type) = &GetIssuingCharges($itemnumber, $borrowernumber); Calculate how much it would cost for a given patron to borrow a given item, including any applicable discounts. @@ -2307,7 +2289,7 @@ sub GetIssuingCharges { =head2 AddIssuingCharge -&AddIssuingCharge( $itemno, $borrowernumber, $charge ) + &AddIssuingCharge( $itemno, $borrowernumber, $charge ) =cut @@ -2329,7 +2311,7 @@ sub AddIssuingCharge { =head2 GetTransfers -GetTransfers($itemnumber); + GetTransfers($itemnumber); =cut @@ -2355,7 +2337,7 @@ sub GetTransfers { =head2 GetTransfersFromTo - at results = GetTransfersFromTo($frombranch,$tobranch); + @results = GetTransfersFromTo($frombranch,$tobranch); Returns the list of pending transfers between $from and $to branch @@ -2385,7 +2367,7 @@ sub GetTransfersFromTo { =head2 DeleteTransfer -&DeleteTransfer($itemnumber); + &DeleteTransfer($itemnumber); =cut @@ -2403,7 +2385,7 @@ sub DeleteTransfer { =head2 AnonymiseIssueHistory -$rows = AnonymiseIssueHistory($borrowernumber,$date) + $rows = AnonymiseIssueHistory($borrowernumber,$date) This function write NULL instead of C<$borrowernumber> given on input arg into the table issues. if C<$borrowernumber> is not set, it will delete the issue history for all borrower older than C<$date>. @@ -2500,7 +2482,7 @@ sub SendCirculationAlert { =head2 updateWrongTransfer -$items = updateWrongTransfer($itemNumber,$borrowernumber,$waitingAtLibrary,$FromLibrary); + $items = updateWrongTransfer($itemNumber,$borrowernumber,$waitingAtLibrary,$FromLibrary); This function validate the line of brachtransfer but with the wrong destination (mistake from a librarian ...), and create a new line in branchtransfer from the actual library to the original library of reservation @@ -2526,7 +2508,8 @@ sub updateWrongTransfer { =head2 UpdateHoldingbranch -$items = UpdateHoldingbranch($branch,$itmenumber); + $items = UpdateHoldingbranch($branch,$itmenumber); + Simple methode for updating hodlingbranch in items BDD line =cut @@ -2578,15 +2561,18 @@ sub CalcDateDue { } =head2 CheckValidDatedue - This function does not account for holiday exceptions nor does it handle the 'useDaysMode' syspref . - To be replaced by CalcDateDue() once C4::Calendar use is tested. -$newdatedue = CheckValidDatedue($date_due,$itemnumber,$branchcode); + $newdatedue = CheckValidDatedue($date_due,$itemnumber,$branchcode); + +This function does not account for holiday exceptions nor does it handle the 'useDaysMode' syspref . +To be replaced by CalcDateDue() once C4::Calendar use is tested. + this function validates the loan length against the holidays calendar, and adjusts the due date as per the 'useDaysMode' syspref. C<$date_due> = returndate calculate with no day check C<$itemnumber> = itemnumber C<$branchcode> = location of issue (affected by 'CircControl' syspref) C<$loanlength> = loan length prior to adjustment + =cut sub CheckValidDatedue { @@ -2615,8 +2601,10 @@ return $newdatedue; =head2 CheckRepeatableHolidays -$countrepeatable = CheckRepeatableHoliday($itemnumber,$week_day,$branchcode); -this function checks if the date due is a repeatable holiday + $countrepeatable = CheckRepeatableHoliday($itemnumber,$week_day,$branchcode); + +This function checks if the date due is a repeatable holiday + C<$date_due> = returndate calculate with no day check C<$itemnumber> = itemnumber C<$branchcode> = localisation of issue @@ -2640,8 +2628,10 @@ return $result; =head2 CheckSpecialHolidays -$countspecial = CheckSpecialHolidays($years,$month,$day,$itemnumber,$branchcode); -this function check if the date is a special holiday + $countspecial = CheckSpecialHolidays($years,$month,$day,$itemnumber,$branchcode); + +This function check if the date is a special holiday + C<$years> = the years of datedue C<$month> = the month of datedue C<$day> = the day of datedue @@ -2669,8 +2659,10 @@ return $countspecial; =head2 CheckRepeatableSpecialHolidays -$countspecial = CheckRepeatableSpecialHolidays($month,$day,$itemnumber,$branchcode); -this function check if the date is a repeatble special holidays + $countspecial = CheckRepeatableSpecialHolidays($month,$day,$itemnumber,$branchcode); + +This function check if the date is a repeatble special holidays + C<$month> = the month of datedue C<$day> = the day of datedue C<$itemnumber> = itemnumber @@ -2712,7 +2704,7 @@ return $exist; =head2 IsBranchTransferAllowed -$allowed = IsBranchTransferAllowed( $toBranch, $fromBranch, $code ); + $allowed = IsBranchTransferAllowed( $toBranch, $fromBranch, $code ); Code is either an itemtype or collection doe depending on the pref BranchTransferLimitsType @@ -2740,7 +2732,7 @@ sub IsBranchTransferAllowed { =head2 CreateBranchTransferLimit -CreateBranchTransferLimit( $toBranch, $fromBranch, $code ); + CreateBranchTransferLimit( $toBranch, $fromBranch, $code ); $code is either itemtype or collection code depending on what the pref BranchTransferLimitsType is set to. @@ -2759,7 +2751,7 @@ sub CreateBranchTransferLimit { =head2 DeleteBranchTransferLimits -DeleteBranchTransferLimits(); + DeleteBranchTransferLimits(); =cut diff --git a/C4/Heading.pm b/C4/Heading.pm index 7df6b82..fd11737 100644 --- a/C4/Heading.pm +++ b/C4/Heading.pm @@ -33,12 +33,12 @@ C4::Heading =head1 SYNOPSIS -use C4::Heading; -my $heading = C4::Heading->new_from_bib_field($field); -my $thesaurus = $heading->thesaurus(); -my $type = $heading->type(); -my $display_heading = $heading->display(); -my $search_string = $heading->search_string(); + use C4::Heading; + my $heading = C4::Heading->new_from_bib_field($field); + my $thesaurus = $heading->thesaurus(); + my $type = $heading->type(); + my $display_heading = $heading->display(); + my $search_string = $heading->search_string(); =head1 DESCRIPTION @@ -49,11 +49,7 @@ headings found in bibliographic and authority records. =head2 new_from_bib_field -=over 4 - -my $heading = C4::Heading->new_from_bib_field($field[, $marc_flavour]); - -=back + my $heading = C4::Heading->new_from_bib_field($field[, $marc_flavour]); Given a C object containing a heading from a bib record, create a C object. @@ -88,11 +84,7 @@ sub new_from_bib_field { =head2 display_form -=over 4 - -my $display = $heading->display_form(); - -=back + my $display = $heading->display_form(); Return the "canonical" display form of the heading. @@ -105,11 +97,7 @@ sub display_form { =head2 authorities -=over 4 - -my $authorities = $heading->authorities; - -=back + my $authorities = $heading->authorities; Return a list of authority records for this heading. @@ -126,11 +114,7 @@ sub authorities { =head2 preferred_authorities -=over 4 - -my $preferred_authorities = $heading->preferred_authorities; - -=back + my $preferred_authorities = $heading->preferred_authorities; Return a list of authority records for headings that are a preferred form of the heading. diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm index 3fdfb8e..6672b50 100644 --- a/C4/ImportBatch.pm +++ b/C4/ImportBatch.pm @@ -78,21 +78,13 @@ C4::ImportBatch - manage batches of imported MARC records =head1 SYNOPSIS -=over 4 - use C4::ImportBatch; -=back - =head1 FUNCTIONS =head2 GetZ3950BatchId -=over 4 - -my $batchid = GetZ3950BatchId($z3950server); - -=back + my $batchid = GetZ3950BatchId($z3950server); Retrieves the ID of the import batch for the Z39.50 reservoir for the given target. If necessary, @@ -121,11 +113,7 @@ sub GetZ3950BatchId { =head2 GetImportRecordMarc -=over 4 - -my ($marcblob, $encoding) = GetImportRecordMarc($import_record_id); - -=back + my ($marcblob, $encoding) = GetImportRecordMarc($import_record_id); =cut @@ -143,11 +131,8 @@ sub GetImportRecordMarc { =head2 AddImportBatch -=over 4 - -my $batch_id = AddImportBatch($overlay_action, $import_status, $type, $file_name, $comments); - -=back + my $batch_id = AddImportBatch($overlay_action, $import_status, $type, + $file_name, $comments); =cut @@ -168,11 +153,7 @@ sub AddImportBatch { =head2 GetImportBatch -=over 4 - -my $row = GetImportBatch($batch_id); - -=back + my $row = GetImportBatch($batch_id); Retrieve a hashref of an import_batches row. @@ -193,11 +174,8 @@ sub GetImportBatch { =head2 AddBiblioToBatch -=over 4 - -my $import_record_id = AddBiblioToBatch($batch_id, $record_sequence, $marc_record, $encoding, $z3950random, $update_counts); - -=back + my $import_record_id = AddBiblioToBatch($batch_id, $record_sequence, + $marc_record, $encoding, $z3950random, $update_counts); =cut @@ -217,11 +195,7 @@ sub AddBiblioToBatch { =head2 ModBiblioInBatch -=over 4 - -ModBiblioInBatch($import_record_id, $marc_record); - -=back + ModBiblioInBatch($import_record_id, $marc_record); =cut @@ -235,16 +209,12 @@ sub ModBiblioInBatch { =head2 BatchStageMarcRecords -=over 4 - -($batch_id, $num_records, $num_items, @invalid_records) = + ($batch_id, $num_records, $num_items, @invalid_records) = BatchStageMarcRecords($marc_flavor, $marc_records, $file_name, $comments, $branch_code, $parse_items, $leave_as_staging, $progress_interval, $progress_callback); -=back - =cut sub BatchStageMarcRecords { @@ -311,11 +281,8 @@ sub BatchStageMarcRecords { =head2 AddItemsToImportBiblio -=over 4 - -my @import_items_ids = AddItemsToImportBiblio($batch_id, $import_record_id, $marc_record, $update_counts); - -=back + my @import_items_ids = AddItemsToImportBiblio($batch_id, + $import_record_id, $marc_record, $update_counts); =cut @@ -353,11 +320,8 @@ sub AddItemsToImportBiblio { =head2 BatchFindBibDuplicates -=over 4 - -my $num_with_matches = BatchFindBibDuplicates($batch_id, $matcher, $max_matches, $progress_interval, $progress_callback); - -=back + my $num_with_matches = BatchFindBibDuplicates($batch_id, $matcher, + $max_matches, $progress_interval, $progress_callback); Goes through the records loaded in the batch and attempts to find duplicates for each one. Sets the matching status @@ -424,12 +388,9 @@ sub BatchFindBibDuplicates { =head2 BatchCommitBibRecords -=over 4 - -my ($num_added, $num_updated, $num_items_added, $num_items_errored, $num_ignored) = - BatchCommitBibRecords($batch_id, $progress_interval, $progress_callback); - -=back + my ($num_added, $num_updated, $num_items_added, $num_items_errored, + $num_ignored) = BatchCommitBibRecords($batch_id, + $progress_interval, $progress_callback); =cut @@ -550,11 +511,8 @@ sub BatchCommitBibRecords { =head2 BatchCommitItems -=over 4 - -($num_items_added, $num_items_errored) = BatchCommitItems($import_record_id, $biblionumber); - -=back + ($num_items_added, $num_items_errored) = + BatchCommitItems($import_record_id, $biblionumber); =cut @@ -601,11 +559,8 @@ sub BatchCommitItems { =head2 BatchRevertBibRecords -=over 4 - -my ($num_deleted, $num_errors, $num_reverted, $num_items_deleted, $num_ignored) = BatchRevertBibRecords($batch_id); - -=back + my ($num_deleted, $num_errors, $num_reverted, $num_items_deleted, + $num_ignored) = BatchRevertBibRecords($batch_id); =cut @@ -668,11 +623,7 @@ sub BatchRevertBibRecords { =head2 BatchRevertItems -=over 4 - -my $num_items_deleted = BatchRevertItems($import_record_id, $biblionumber); - -=back + my $num_items_deleted = BatchRevertItems($import_record_id, $biblionumber); =cut @@ -703,11 +654,7 @@ sub BatchRevertItems { =head2 CleanBatch -=over 4 - -CleanBatch($batch_id) - -=back + CleanBatch($batch_id) Deletes all staged records from the import batch and sets the status of the batch to 'cleaned'. Note @@ -726,11 +673,7 @@ sub CleanBatch { =head2 GetAllImportBatches -=over 4 - -my $results = GetAllImportBatches(); - -=back + my $results = GetAllImportBatches(); Returns a references to an array of hash references corresponding to all import_batches rows (of batch_type 'batch'), sorted in @@ -755,11 +698,7 @@ sub GetAllImportBatches { =head2 GetImportBatchRangeDesc -=over 4 - -my $results = GetImportBatchRangeDesc($offset, $results_per_group); - -=back + my $results = GetImportBatchRangeDesc($offset, $results_per_group); Returns a reference to an array of hash references corresponding to import_batches rows (sorted in descending order by import_batch_id) @@ -792,6 +731,8 @@ sub GetImportBatchRangeDesc { =head2 GetItemNumbersFromImportBatch + my @itemsnos = GetItemNumbersFromImportBatch($batch_id); + =cut sub GetItemNumbersFromImportBatch { @@ -808,11 +749,7 @@ sub GetItemNumbersFromImportBatch { =head2 GetNumberOfImportBatches -=over 4 - -my $count = GetNumberOfImportBatches(); - -=back + my $count = GetNumberOfImportBatches(); =cut @@ -827,11 +764,7 @@ sub GetNumberOfNonZ3950ImportBatches { =head2 GetImportBibliosRange -=over 4 - -my $results = GetImportBibliosRange($batch_id, $offset, $results_per_group); - -=back + my $results = GetImportBibliosRange($batch_id, $offset, $results_per_group); Returns a reference to an array of hash references corresponding to import_biblios/import_records rows for a given batch @@ -874,11 +807,7 @@ sub GetImportBibliosRange { =head2 GetBestRecordMatch -=over 4 - -my $record_id = GetBestRecordMatch($import_record_id); - -=back + my $record_id = GetBestRecordMatch($import_record_id); =cut @@ -898,11 +827,7 @@ sub GetBestRecordMatch { =head2 GetImportBatchStatus -=over 4 - -my $status = GetImportBatchStatus($batch_id); - -=back + my $status = GetImportBatchStatus($batch_id); =cut @@ -920,11 +845,7 @@ sub GetImportBatchStatus { =head2 SetImportBatchStatus -=over 4 - -SetImportBatchStatus($batch_id, $new_status); - -=back + SetImportBatchStatus($batch_id, $new_status); =cut @@ -940,11 +861,7 @@ sub SetImportBatchStatus { =head2 GetImportBatchOverlayAction -=over 4 - -my $overlay_action = GetImportBatchOverlayAction($batch_id); - -=back + my $overlay_action = GetImportBatchOverlayAction($batch_id); =cut @@ -963,11 +880,7 @@ sub GetImportBatchOverlayAction { =head2 SetImportBatchOverlayAction -=over 4 - -SetImportBatchOverlayAction($batch_id, $new_overlay_action); - -=back + SetImportBatchOverlayAction($batch_id, $new_overlay_action); =cut @@ -983,11 +896,7 @@ sub SetImportBatchOverlayAction { =head2 GetImportBatchNoMatchAction -=over 4 - -my $nomatch_action = GetImportBatchNoMatchAction($batch_id); - -=back + my $nomatch_action = GetImportBatchNoMatchAction($batch_id); =cut @@ -1006,11 +915,7 @@ sub GetImportBatchNoMatchAction { =head2 SetImportBatchNoMatchAction -=over 4 - -SetImportBatchNoMatchAction($batch_id, $new_nomatch_action); - -=back + SetImportBatchNoMatchAction($batch_id, $new_nomatch_action); =cut @@ -1026,11 +931,7 @@ sub SetImportBatchNoMatchAction { =head2 GetImportBatchItemAction -=over 4 - -my $item_action = GetImportBatchItemAction($batch_id); - -=back + my $item_action = GetImportBatchItemAction($batch_id); =cut @@ -1049,11 +950,7 @@ sub GetImportBatchItemAction { =head2 SetImportBatchItemAction -=over 4 - -SetImportBatchItemAction($batch_id, $new_item_action); - -=back + SetImportBatchItemAction($batch_id, $new_item_action); =cut @@ -1069,11 +966,7 @@ sub SetImportBatchItemAction { =head2 GetImportBatchMatcher -=over 4 - -my $matcher_id = GetImportBatchMatcher($batch_id); - -=back + my $matcher_id = GetImportBatchMatcher($batch_id); =cut @@ -1092,11 +985,7 @@ sub GetImportBatchMatcher { =head2 SetImportBatchMatcher -=over 4 - -SetImportBatchMatcher($batch_id, $new_matcher_id); - -=back + SetImportBatchMatcher($batch_id, $new_matcher_id); =cut @@ -1112,11 +1001,7 @@ sub SetImportBatchMatcher { =head2 GetImportRecordOverlayStatus -=over 4 - -my $overlay_status = GetImportRecordOverlayStatus($import_record_id); - -=back + my $overlay_status = GetImportRecordOverlayStatus($import_record_id); =cut @@ -1135,11 +1020,7 @@ sub GetImportRecordOverlayStatus { =head2 SetImportRecordOverlayStatus -=over 4 - -SetImportRecordOverlayStatus($import_record_id, $new_overlay_status); - -=back + SetImportRecordOverlayStatus($import_record_id, $new_overlay_status); =cut @@ -1155,11 +1036,7 @@ sub SetImportRecordOverlayStatus { =head2 GetImportRecordStatus -=over 4 - -my $overlay_status = GetImportRecordStatus($import_record_id); - -=back + my $overlay_status = GetImportRecordStatus($import_record_id); =cut @@ -1178,11 +1055,7 @@ sub GetImportRecordStatus { =head2 SetImportRecordStatus -=over 4 - -SetImportRecordStatus($import_record_id, $new_overlay_status); - -=back + SetImportRecordStatus($import_record_id, $new_overlay_status); =cut @@ -1198,11 +1071,7 @@ sub SetImportRecordStatus { =head2 GetImportRecordMatches -=over 4 - -my $results = GetImportRecordMatches($import_record_id, $best_only); - -=back + my $results = GetImportRecordMatches($import_record_id, $best_only); =cut @@ -1234,11 +1103,7 @@ sub GetImportRecordMatches { =head2 SetImportRecordMatches -=over 4 - -SetImportRecordMatches($import_record_id, @matches); - -=back + SetImportRecordMatches($import_record_id, @matches); =cut diff --git a/C4/Installer.pm b/C4/Installer.pm index eca0aee..2436d3b 100644 --- a/C4/Installer.pm +++ b/C4/Installer.pm @@ -30,35 +30,25 @@ C4::Installer =head1 SYNOPSIS -use C4::Installer; - -my $installer = C4::Installer->new(); - -my $all_languages = getAllLanguages(); - -my $error = $installer->load_db_schema(); - -my $list = $installer->sql_file_list('en', 'marc21', { optional => 1, mandatory => 1 }); - -my ($fwk_language, $error_list) = $installer->load_sql_in_order($all_languages, @$list); - -$installer->set_version_syspref(); - -$installer->set_marcflavour_syspref('MARC21'); - -$installer->set_indexing_engine(0); + use C4::Installer; + my $installer = C4::Installer->new(); + my $all_languages = getAllLanguages(); + my $error = $installer->load_db_schema(); + my $list = $installer->sql_file_list('en', 'marc21', { optional => 1, mandatory => 1 }); + my ($fwk_language, $error_list) = $installer->load_sql_in_order($all_languages, @$list); + $installer->set_version_syspref(); + $installer->set_marcflavour_syspref('MARC21'); + $installer->set_indexing_engine(0); =head1 DESCRIPTION +=cut + =head1 METHODS =head2 new -=over 4 - -my $installer = C4::Installer->new(); - -=back + my $installer = C4::Installer->new(); Creates a new installer. @@ -90,11 +80,7 @@ sub new { =head2 marcflavour_list -=over 4 - -my ($marcflavours) = $installer->marcflavour_list($lang); - -=back + my ($marcflavours) = $installer->marcflavour_list($lang); Return a arrayref of the MARC flavour sets available for the specified language C<$lang>. Returns 'undef' if a directory @@ -115,11 +101,8 @@ sub marcflavour_list { =head2 marc_framework_sql_list -=over 4 - -my ($defaulted_to_en, $list) = $installer->marc_framework_sql_list($lang, $marcflavour); - -=back + my ($defaulted_to_en, $list) = + $installer->marc_framework_sql_list($lang, $marcflavour); Returns in C<$list> a structure listing the filename, description, section, and mandatory/optional status of MARC framework scripts available for C<$lang> @@ -200,11 +183,7 @@ sub marc_framework_sql_list { =head2 sample_data_sql_list -=over 4 - -my ($defaulted_to_en, $list) = $installer->sample_data_sql_list($lang); - -=back + my ($defaulted_to_en, $list) = $installer->sample_data_sql_list($lang); Returns in C<$list> a structure listing the filename, description, section, and mandatory/optional status of sample data scripts available for C<$lang>. @@ -281,11 +260,7 @@ sub sample_data_sql_list { =head2 sql_file_list -=over 4 - -my $list = $installer->sql_file_list($lang, $marcflavour, $subset_wanted); - -=back + my $list = $installer->sql_file_list($lang, $marcflavour, $subset_wanted); Returns an arrayref containing the filepaths of installer SQL scripts available for laod. The C<$lang> and C<$marcflavour> arguments @@ -320,11 +295,7 @@ sub sql_file_list { =head2 load_db_schema -=over 4 - -my $error = $installer->load_db_schema(); - -=back + my $error = $installer->load_db_schema(); Loads the SQL script that creates Koha's tables and indexes. The return value is a string containing error messages reported by the @@ -343,11 +314,7 @@ sub load_db_schema { =head2 load_sql_in_order -=over 4 - -my ($fwk_language, $list) = $installer->load_sql_in_order($all_languages, @sql_list); - -=back + my ($fwk_language, $list) = $installer->load_sql_in_order($all_languages, @sql_list); Given a list of SQL scripts supplied in C<@sql_list>, loads each of them into the database and sets the FrameworksLoaded system preference to names @@ -358,15 +325,15 @@ directory path). This means that dependencies among the scripts are to be resolved by carefully naming them, keeping in mind that the directory name does *not* currently count. -FIXME: this is a rather delicate way of dealing with dependencies between - the install scripts. +B this is a rather delicate way of dealing with dependencies between +the install scripts. The return value C<$list> is an arrayref containing a hashref for each "level" or directory containing SQL scripts; the hashref in turns contains a list of hashrefs containing a list of each script load and any error messages associated with the loading of each script. -FIXME: The C<$fwk_language> code probably doesn't belong and needs to be +B The C<$fwk_language> code probably doesn't belong and needs to be moved to a different method. =cut @@ -433,11 +400,7 @@ sub load_sql_in_order { =head2 set_marcflavour_syspref -=over 4 - -$installer->set_marcflavour_syspref($marcflavour); - -=back + $installer->set_marcflavour_syspref($marcflavour); Set the 'marcflavour' system preference. The incoming C<$marcflavour> references to a subdirectory of @@ -466,11 +429,7 @@ sub set_marcflavour_syspref { =head2 set_indexing_engine -=over 4 - -$installer->set_indexing_engine($nozebra); - -=back + $installer->set_indexing_engine($nozebra); Sets system preferences related to the indexing engine. The C<$nozebra> argument is a boolean; @@ -495,11 +454,7 @@ sub set_indexing_engine { =head2 set_version_syspref -=over 4 - -$installer->set_version_syspref(); - -=back + $installer->set_version_syspref(); Set or update the 'Version' system preference to the current Koha software version. @@ -526,24 +481,20 @@ sub set_version_syspref { =head2 load_sql -=over 4 - -my $error = $installer->load_sql($filename); - -=back + my $error = $installer->load_sql($filename); Runs a the specified SQL using the DB's command-line SQL tool, and returns any strings sent to STDERR by the command-line tool. -FIXME: there has been a long-standing desire to - replace this with an SQL loader that goes - through DBI; partly for portability issues - and partly to improve error handling. +B there has been a long-standing desire to +replace this with an SQL loader that goes +through DBI; partly for portability issues +and partly to improve error handling. -FIXME: even using the command-line loader, some more - basic error handling should be added - deal - with missing files, e.g. +B even using the command-line loader, some more +basic error handling should be added - deal +with missing files, e.g. =cut @@ -582,11 +533,7 @@ sub load_sql { =head2 get_file_path_from_name -=over 4 - -my $filename = $installer->get_file_path_from_name('script_name'); - -=back + my $filename = $installer->get_file_path_from_name('script_name'); searches through the set of known SQL scripts and finds the fully qualified path name for the script that mathches the input. diff --git a/C4/ItemCirculationAlertPreference.pm b/C4/ItemCirculationAlertPreference.pm index 73f7573..0c5844a 100644 --- a/C4/ItemCirculationAlertPreference.pm +++ b/C4/ItemCirculationAlertPreference.pm @@ -377,12 +377,20 @@ These are read-only accessors for the various attributes of a preference. =head3 $pref->id +=cut + =head3 $pref->branchcode +=cut + =head3 $pref->categorycode +=cut + =head3 $pref->item_type +=cut + =head3 $pref->notification =cut diff --git a/C4/ItemType.pm b/C4/ItemType.pm index 8ae9a29..e66d917 100644 --- a/C4/ItemType.pm +++ b/C4/ItemType.pm @@ -90,16 +90,28 @@ These are read-only accessors for attributes of a C4::ItemType object. =head3 $itemtype->itemtype +=cut + =head3 $itemtype->description +=cut + =head3 $itemtype->renewalsallowed +=cut + =head3 $itemtype->rentalcharge +=cut + =head3 $itemtype->notforloan +=cut + =head3 $itemtype->imageurl +=cut + =head3 $itemtype->summary =cut diff --git a/C4/Languages.pm b/C4/Languages.pm index 9ef2439..f8f60f4 100644 --- a/C4/Languages.pm +++ b/C4/Languages.pm @@ -65,6 +65,8 @@ use C4::Languages; =head1 DESCRIPTION +=cut + =head1 FUNCTIONS =head2 getFrameworkLanguages diff --git a/C4/Letters.pm b/C4/Letters.pm index 3dc3e52..47abf6c 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -154,7 +154,7 @@ sub addalert ($$$) { parameters : - alertid : the alert id deletes the alert - + =cut sub delalert ($) { @@ -552,9 +552,8 @@ sub parseletter { =head2 EnqueueLetter -=over 4 - -my $success = EnqueueLetter( { letter => $letter, borrowernumber => '12', message_transport_type => 'email' } ) + my $success = EnqueueLetter( { letter => $letter, + borrowernumber => '12', message_transport_type => 'email' } ) places a letter in the message_queue database table, which will eventually get processed (sent) by the process_message_queue.pl @@ -562,8 +561,6 @@ cronjob when it calls SendQueuedMessages. return true on success -=back - =cut sub EnqueueLetter ($) { @@ -609,16 +606,12 @@ ENDSQL =head2 SendQueuedMessages ([$hashref]) -=over 4 + my $sent = SendQueuedMessages( { verbose => 1 } ); sends all of the 'pending' items in the message queue. -my $sent = SendQueuedMessages( { verbose => 1 } ); - returns number of messages sent. -=back - =cut sub SendQueuedMessages (;$) { @@ -645,14 +638,10 @@ sub SendQueuedMessages (;$) { =head2 GetRSSMessages -=over 4 - -my $message_list = GetRSSMessages( { limit => 10, borrowernumber => '14' } ) + my $message_list = GetRSSMessages( { limit => 10, borrowernumber => '14' } ) returns a listref of all queued RSS messages for a particular person. -=back - =cut sub GetRSSMessages { @@ -669,15 +658,11 @@ sub GetRSSMessages { =head2 GetPrintMessages -=over 4 - -my $message_list = GetPrintMessages( { borrowernumber => $borrowernumber } ) + my $message_list = GetPrintMessages( { borrowernumber => $borrowernumber } ) Returns a arrayref of all queued print messages (optionally, for a particular person). -=back - =cut sub GetPrintMessages { @@ -689,17 +674,13 @@ sub GetPrintMessages { =head2 GetQueuedMessages ([$hashref]) -=over 4 - -my $messages = GetQueuedMessage( { borrowernumber => '123', limit => 20 } ); + my $messages = GetQueuedMessage( { borrowernumber => '123', limit => 20 } ); fetches messages out of the message queue. returns: list of hashes, each has represents a message in the message queue. -=back - =cut sub GetQueuedMessages { diff --git a/C4/Message.pm b/C4/Message.pm index 9b0eee2..16272ff 100644 --- a/C4/Message.pm +++ b/C4/Message.pm @@ -19,7 +19,7 @@ How to add a new message to the queue: my $borrower = { borrowernumber => 1 }; my $item = C4::Items::GetItem(1); my $letter = C4::Letters::getletter('circulation', 'CHECKOUT'); - C4::Letters::parseletter($letter, 'biblio', $item->{biblionumber}); + C4::Letters::parseletter($letter, 'biblio', $item->{biblionumber}); C4::Letters::parseletter($letter, 'biblioitems', $item->{biblionumber}); C4::Message->enqueue($letter, $borrower->{borrowernumber}, 'email'); @@ -33,10 +33,11 @@ How to update a borrower's last checkout message: =head1 DESCRIPTION -This module presents an OO interface to the message_queue. Previously, you could -only add messages to the message_queue via C. With -this module, you can also get previously inserted messages, manipulate them, and -save them back to the database. +This module presents an OO interface to the message_queue. Previously, +you could only add messages to the message_queue via +C. With this module, you can also get +previously inserted messages, manipulate them, and save them back to the +database. =cut @@ -302,26 +303,48 @@ sub append { =head3 $message->message_id +=cut + =head3 $message->borrowernumber +=cut + =head3 $message->subject +=cut + =head3 $message->content +=cut + =head3 $message->metadata +=cut + =head3 $message->letter_code +=cut + =head3 $message->message_transport_type +=cut + =head3 $message->status +=cut + =head3 $message->time_queued +=cut + =head3 $message->to_address +=cut + =head3 $message->from_address +=cut + =head3 $message->content_type =cut diff --git a/C4/Print.pm b/C4/Print.pm index 8820e78..706afc3 100644 --- a/C4/Print.pm +++ b/C4/Print.pm @@ -48,9 +48,7 @@ The functions in this module handle sending text to a printer. =head1 FUNCTIONS -=over 2 - -=item remoteprint +=head2 remoteprint &remoteprint($items, $borrower); @@ -168,12 +166,12 @@ EOF return $slip; } -=item printslip +=head2 printslip &printslip($borrowernumber) - print a slip for the given $borrowernumber - +print a slip for the given $borrowernumber + =cut #' @@ -193,8 +191,6 @@ END { } # module clean-up code here (global destructor) 1; __END__ -=back - =head1 AUTHOR Koha Development Team diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 65b97dd..4ca555f 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -50,8 +50,8 @@ C4::Reserves - Koha functions for dealing with reservation. =head1 DESCRIPTION - this modules provides somes functions to deal with reservations. - +This modules provides somes functions to deal with reservations. + Reserves are stored in reserves table. The following columns contains important values : - priority >0 : then the reserve is at 1st stage, and not yet affected to any item. @@ -77,10 +77,8 @@ C4::Reserves - Koha functions for dealing with reservation. If transfer needed, write in branchtransfer P =0, F=NULL, I=filled The pickup library recieve the book, it checks it in P =0, F=W, I=filled The patron borrow the book P =0, F=F, I=filled - -=head1 FUNCTIONS -=over 2 +=head1 FUNCTIONS =cut @@ -124,7 +122,7 @@ BEGIN { ); } -=item AddReserve +=head2 AddReserve AddReserve($branch,$borrowernumber,$biblionumber,$constraint,$bibitems,$priority,$resdate,$expdate,$notes,$title,$checkitem,$found) @@ -233,9 +231,9 @@ sub AddReserve { return; # FIXME: why not have a useful return value? } -=item GetReservesFromBiblionumber +=head2 GetReservesFromBiblionumber -($count, $title_reserves) = &GetReserves($biblionumber); + ($count, $title_reserves) = &GetReserves($biblionumber); This function gets the list of reservations for one C<$biblionumber>, returning a count of the reserves and an arrayref pointing to the reserves for C<$biblionumber>. @@ -313,11 +311,11 @@ sub GetReservesFromBiblionumber { return ( $#results + 1, \@results ); } -=item GetReservesFromItemnumber +=head2 GetReservesFromItemnumber ( $reservedate, $borrowernumber, $branchcode ) = GetReservesFromItemnumber($itemnumber); - TODO :: Description here +TODO :: Description here =cut @@ -338,12 +336,12 @@ sub GetReservesFromItemnumber { return ( $reservedate, $borrowernumber, $branchcode ); } -=item GetReservesFromBorrowernumber +=head2 GetReservesFromBorrowernumber $borrowerreserv = GetReservesFromBorrowernumber($borrowernumber,$tatus); - - TODO :: Descritpion - + +TODO :: Descritpion + =cut sub GetReservesFromBorrowernumber { @@ -372,9 +370,9 @@ sub GetReservesFromBorrowernumber { return @$data; } #------------------------------------------------------------------------------------- -=item CanBookBeReserved +=head2 CanBookBeReserved -$error = &CanBookBeReserved($borrowernumber, $biblionumber) + $error = &CanBookBeReserved($borrowernumber, $biblionumber) =cut @@ -453,11 +451,11 @@ sub CanBookBeReserved{ } -=item CanItemBeReserved +=head2 CanItemBeReserved -$error = &CanItemBeReserved($borrowernumber, $itemnumber) + $error = &CanItemBeReserved($borrowernumber, $itemnumber) -this function return 1 if an item can be issued by this borrower. +This function return 1 if an item can be issued by this borrower. =cut @@ -544,9 +542,9 @@ sub CanItemBeReserved{ } } #-------------------------------------------------------------------------------- -=item GetReserveCount +=head2 GetReserveCount -$number = &GetReserveCount($borrowernumber); + $number = &GetReserveCount($borrowernumber); this function returns the number of reservation for a borrower given on input arg. @@ -568,9 +566,9 @@ sub GetReserveCount { return $row->{counter}; } -=item GetOtherReserves +=head2 GetOtherReserves -($messages,$nextreservinfo)=$GetOtherReserves(itemnumber); + ($messages,$nextreservinfo)=$GetOtherReserves(itemnumber); Check queued list of this document and check if this document must be transfered @@ -618,9 +616,9 @@ sub GetOtherReserves { return ( $messages, $nextreservinfo ); } -=item GetReserveFee +=head2 GetReserveFee -$fee = GetReserveFee($borrowernumber,$biblionumber,$constraint,$biblionumber); + $fee = GetReserveFee($borrowernumber,$biblionumber,$constraint,$biblionumber); Calculate the fee for a reserve @@ -721,9 +719,9 @@ sub GetReserveFee { return $fee; } -=item GetReservesToBranch +=head2 GetReservesToBranch - at transreserv = GetReservesToBranch( $frombranch ); + @transreserv = GetReservesToBranch( $frombranch ); Get reserve list for a given branch @@ -748,9 +746,9 @@ sub GetReservesToBranch { return (@transreserv); } -=item GetReservesForBranch +=head2 GetReservesForBranch - at transreserv = GetReservesForBranch($frombranch); + @transreserv = GetReservesForBranch($frombranch); =cut @@ -793,7 +791,7 @@ sub GetReserveStatus { return $found; } -=item CheckReserves +=head2 CheckReserves ($status, $reserve) = &CheckReserves($itemnumber); ($status, $reserve) = &CheckReserves(undef, $barcode); @@ -886,12 +884,12 @@ sub CheckReserves { } } -=item CancelExpiredReserves +=head2 CancelExpiredReserves CancelExpiredReserves(); - - Cancels all reserves with an expiration date from before today. - + +Cancels all reserves with an expiration date from before today. + =cut sub CancelExpiredReserves { @@ -909,7 +907,7 @@ sub CancelExpiredReserves { } -=item CancelReserve +=head2 CancelReserve &CancelReserve($biblionumber, $itemnumber, $borrowernumber); @@ -1011,13 +1009,9 @@ sub CancelReserve { } } -=item ModReserve - -=over 4 +=head2 ModReserve -ModReserve($rank, $biblio, $borrower, $branch[, $itemnumber]) - -=back + ModReserve($rank, $biblio, $borrower, $branch[, $itemnumber]) Change a hold request's priority or cancel it. @@ -1039,7 +1033,7 @@ C<$rank> is a non-zero integer; if supplied, the itemnumber of the hold request is set accordingly; if omitted, the itemnumber is cleared. -FIXME: Note that the forgoing can have the effect of causing +B Note that the forgoing can have the effect of causing item-level hold requests to turn into title-level requests. This will be fixed once reserves has separate columns for requested itemnumber and supplying itemnumber. @@ -1093,7 +1087,7 @@ sub ModReserve { } } -=item ModReserveFill +=head2 ModReserveFill &ModReserveFill($reserve); @@ -1161,9 +1155,9 @@ sub ModReserveFill { } } -=item ModReserveStatus +=head2 ModReserveStatus -&ModReserveStatus($itemnumber, $newstatus); + &ModReserveStatus($itemnumber, $newstatus); Update the reserve status for the active (priority=0) reserve. @@ -1192,9 +1186,9 @@ sub ModReserveStatus { } } -=item ModReserveAffect +=head2 ModReserveAffect -&ModReserveAffect($itemnumber,$borrowernumber,$diffBranchSend); + &ModReserveAffect($itemnumber,$borrowernumber,$diffBranchSend); This function affect an item and a status for a given reserve The itemnumber parameter is used to find the biblionumber. @@ -1204,6 +1198,7 @@ to the correct reserve. if $transferToDo is not set, then the status is set to "Waiting" as well. otherwise, a transfer is on the way, and the end of the transfer will take care of the waiting status + =cut sub ModReserveAffect { @@ -1255,11 +1250,11 @@ sub ModReserveAffect { return; } -=item ModReserveCancelAll +=head2 ModReserveCancelAll -($messages,$nextreservinfo) = &ModReserveCancelAll($itemnumber,$borrowernumber); + ($messages,$nextreservinfo) = &ModReserveCancelAll($itemnumber,$borrowernumber); - function to cancel reserv,check other reserves, and transfer document if it's necessary +function to cancel reserv,check other reserves, and transfer document if it's necessary =cut @@ -1277,9 +1272,9 @@ sub ModReserveCancelAll { return ( $messages, $nextreservinfo ); } -=item ModReserveMinusPriority +=head2 ModReserveMinusPriority -&ModReserveMinusPriority($itemnumber,$borrowernumber,$biblionumber) + &ModReserveMinusPriority($itemnumber,$borrowernumber,$biblionumber) Reduce the values of queuded list @@ -1302,12 +1297,13 @@ sub ModReserveMinusPriority { _FixPriority($biblionumber, $borrowernumber, '0'); } -=item GetReserveInfo +=head2 GetReserveInfo -&GetReserveInfo($borrowernumber,$biblionumber); + &GetReserveInfo($borrowernumber,$biblionumber); + +Get item and borrower details for a current hold. +Current implementation this query should have a single result. - Get item and borrower details for a current hold. - Current implementation this query should have a single result. =cut sub GetReserveInfo { @@ -1356,13 +1352,9 @@ sub GetReserveInfo { } -=item IsAvailableForItemLevelRequest - -=over 4 +=head2 IsAvailableForItemLevelRequest -my $is_available = IsAvailableForItemLevelRequest($itemnumber); - -=back + my $is_available = IsAvailableForItemLevelRequest($itemnumber); Checks whether a given item record is available for an item-level hold request. An item is available if @@ -1432,13 +1424,15 @@ sub IsAvailableForItemLevelRequest { } } -=item AlterPriority -AlterPriority( $where, $borrowernumber, $biblionumber, $reservedate ); +=head2 AlterPriority + + AlterPriority( $where, $borrowernumber, $biblionumber, $reservedate ); This function changes a reserve's priority up, down, to the top, or to the bottom. Input: $where is 'up', 'down', 'top' or 'bottom'. Biblionumber, Date reserve was placed =cut + sub AlterPriority { my ( $where, $borrowernumber, $biblionumber ) = @_; @@ -1467,10 +1461,12 @@ sub AlterPriority { } } -=item ToggleLowestPriority -ToggleLowestPriority( $borrowernumber, $biblionumber ); +=head2 ToggleLowestPriority + + ToggleLowestPriority( $borrowernumber, $biblionumber ); This function sets the lowestPriority field to true if is false, and false if it is true. + =cut sub ToggleLowestPriority { @@ -1492,16 +1488,16 @@ sub ToggleLowestPriority { _FixPriority( $biblionumber, $borrowernumber, '999999' ); } -=item _FixPriority +=head2 _FixPriority -&_FixPriority($biblio,$borrowernumber,$rank,$ignoreSetLowestRank); + &_FixPriority($biblio,$borrowernumber,$rank,$ignoreSetLowestRank); - Only used internally (so don't export it) - Changed how this functions works # - Now just gets an array of reserves in the rank order and updates them with - the array index (+1 as array starts from 0) - and if $rank is supplied will splice item from the array and splice it back in again - in new priority rank +Only used internally (so don't export it) +Changed how this functions works # +Now just gets an array of reserves in the rank order and updates them with +the array index (+1 as array starts from 0) +and if $rank is supplied will splice item from the array and splice it back in again +in new priority rank =cut @@ -1593,7 +1589,7 @@ sub _FixPriority { } } -=item _Findgroupreserve +=head2 _Findgroupreserve @results = &_Findgroupreserve($biblioitemnumber, $biblionumber, $itemnumber); @@ -1706,13 +1702,9 @@ sub _Findgroupreserve { return @results; } -=item _koha_notify_reserve - -=over 4 - -_koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ); +=head2 _koha_notify_reserve -=back + _koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ); Sends a notification to the patron that their hold has been filled (through ModReserveAffect, _not_ ModReserveFill) @@ -1796,25 +1788,21 @@ sub _koha_notify_reserve { } } -=item _ShiftPriorityByDateAndPriority +=head2 _ShiftPriorityByDateAndPriority -=over 4 - -$new_priority = _ShiftPriorityByDateAndPriority( $biblionumber, $reservedate, $priority ); - -=back + $new_priority = _ShiftPriorityByDateAndPriority( $biblionumber, $reservedate, $priority ); This increments the priority of all reserves after the one - with either the lowest date after C<$reservedate> - or the lowest priority after C<$priority>. +with either the lowest date after C<$reservedate> +or the lowest priority after C<$priority>. It effectively makes room for a new reserve to be inserted with a certain - priority, which is returned. +priority, which is returned. This is most useful when the reservedate can be set by the user. It allows - the new reserve to be placed before other reserves that have a later - reservedate. Since priority also is set by the form in reserves/request.pl - the sub accounts for that too. +the new reserve to be placed before other reserves that have a later +reservedate. Since priority also is set by the form in reserves/request.pl +the sub accounts for that too. =cut @@ -1849,8 +1837,6 @@ sub _ShiftPriorityByDateAndPriority { return $new_priority; # so the caller knows what priority they wind up receiving } -=back - =head1 AUTHOR Koha Development Team diff --git a/C4/RotatingCollections.pm b/C4/RotatingCollections.pm index 6b1383f..c880fe8 100644 --- a/C4/RotatingCollections.pm +++ b/C4/RotatingCollections.pm @@ -45,8 +45,6 @@ C4::RotatingCollections - Functions for managing rotating collections =head1 FUNCTIONS -=over 2 - =cut @ISA = qw( Exporter ); @@ -67,7 +65,7 @@ C4::RotatingCollections - Functions for managing rotating collections GetCollectionItemBranches ); -=item CreateCollection +=head2 CreateCollection ( $success, $errorcode, $errormessage ) = CreateCollection( $title, $description ); Creates a new collection @@ -79,7 +77,9 @@ C4::RotatingCollections - Functions for managing rotating collections $success: 1 if all database operations were successful, 0 otherwise $errorCode: Code for reason of failure, good for translating errors in templates $errorMessage: English description of error + =cut + sub CreateCollection { my ( $title, $description ) = @_; @@ -102,12 +102,14 @@ sub CreateCollection { $sth->finish; return 1; - + } -=item UpdateCollection +=head2 UpdateCollection + ( $success, $errorcode, $errormessage ) = UpdateCollection( $colId, $title, $description ); - Updates a collection + +Updates a collection Input: $colId: id of the collection to be updated @@ -118,7 +120,9 @@ sub CreateCollection { $success: 1 if all database operations were successful, 0 otherwise $errorCode: Code for reason of failure, good for translating errors in templates $errorMessage: English description of error + =cut + sub UpdateCollection { my ( $colId, $title, $description ) = @_; @@ -147,7 +151,8 @@ sub UpdateCollection { } -=item DeleteCollection +=head2 DeleteCollection + ( $success, $errorcode, $errormessage ) = DeleteCollection( $colId ); Deletes a collection of the given id @@ -158,7 +163,9 @@ sub UpdateCollection { $success: 1 if all database operations were successful, 0 otherwise $errorCode: Code for reason of failure, good for translating errors in templates $errorMessage: English description of error + =cut + sub DeleteCollection { my ( $colId ) = @_; @@ -178,7 +185,8 @@ sub DeleteCollection { return 1; } -=item GetCollections +=head2 GetCollections + $collections = GetCollections(); Returns data about all collections @@ -188,7 +196,9 @@ sub DeleteCollection { On Failure: $errorCode: Code for reason of failure, good for translating errors in templates $errorMessage: English description of error + =cut + sub GetCollections { my $dbh = C4::Context->dbh; @@ -206,8 +216,10 @@ sub GetCollections { return \@results; } -=item GetItemsInCollection +=head2 GetItemsInCollection + ( $results, $success, $errorcode, $errormessage ) = GetItemsInCollection( $colId ); + Returns information about the items in the given collection Input: @@ -218,7 +230,9 @@ sub GetCollections { $success: 1 if all database operations were successful, 0 otherwise $errorCode: Code for reason of failure, good for translating errors in templates $errorMessage: English description of error + =cut + sub GetItemsInCollection { my ( $colId ) = @_; @@ -250,15 +264,19 @@ sub GetItemsInCollection { return \@results; } -=item GetCollection +=head2 GetCollection + ( $colId, $colTitle, $colDesc, $colBranchcode ) = GetCollection( $colId ); - Returns information about a collection + +Returns information about a collection Input: $colId: Id of the collection Output: $colId, $colTitle, $colDesc, $colBranchcode + =cut + sub GetCollection { my ( $colId ) = @_; @@ -281,9 +299,11 @@ sub GetCollection { } -=item AddItemToCollection +=head2 AddItemToCollection + ( $success, $errorcode, $errormessage ) = AddItemToCollection( $colId, $itemnumber ); - Adds an item to a rotating collection. + +Adds an item to a rotating collection. Input: $colId: Collection to add the item to. @@ -292,7 +312,9 @@ sub GetCollection { $success: 1 if all database operations were successful, 0 otherwise $errorCode: Code for reason of failure, good for translating errors in templates $errorMessage: English description of error + =cut + sub AddItemToCollection { my ( $colId, $itemnumber ) = @_; @@ -322,9 +344,11 @@ sub AddItemToCollection { } -=item RemoveItemFromCollection +=head2 RemoveItemFromCollection + ( $success, $errorcode, $errormessage ) = RemoveItemFromCollection( $colId, $itemnumber ); - Removes an item to a collection + +Removes an item to a collection Input: $colId: Collection to add the item to. @@ -334,7 +358,9 @@ sub AddItemToCollection { $success: 1 if all database operations were successful, 0 otherwise $errorCode: Code for reason of failure, good for translating errors in templates $errorMessage: English description of error + =cut + sub RemoveItemFromCollection { my ( $colId, $itemnumber ) = @_; @@ -358,9 +384,11 @@ sub RemoveItemFromCollection { return 1; } -=item TransferCollection +=head2 TransferCollection + ( $success, $errorcode, $errormessage ) = TransferCollection( $colId, $colBranchcode ); - Transfers a collection to another branch + +Transfers a collection to another branch Input: $colId: id of the collection to be updated @@ -370,7 +398,9 @@ sub RemoveItemFromCollection { $success: 1 if all database operations were successful, 0 otherwise $errorCode: Code for reason of failure, good for translating errors in templates $errorMessage: English description of error + =cut + sub TransferCollection { my ( $colId, $colBranchcode ) = @_; @@ -407,9 +437,12 @@ sub TransferCollection { } -=item GetCollectionItemBranches - my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber ); +=head2 GetCollectionItemBranches + + my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber ); + =cut + sub GetCollectionItemBranches { my ( $itemnumber ) = @_; @@ -436,9 +469,12 @@ sub GetCollectionItemBranches { ); } -=item isItemInThisCollection -$inCollection = isItemInThisCollection( $itemnumber, $colId ); -=cut +=head2 isItemInThisCollection + + $inCollection = isItemInThisCollection( $itemnumber, $colId ); + +=cut + sub isItemInThisCollection { my ( $itemnumber, $colId ) = @_; @@ -452,9 +488,12 @@ sub isItemInThisCollection { return $$row{'inCollection'}; } -=item isItemInAnyCollection +=head2 isItemInAnyCollection + $inCollection = isItemInAnyCollection( $itemnumber ); + =cut + sub isItemInAnyCollection { my ( $itemnumber ) = @_; @@ -479,8 +518,6 @@ sub isItemInAnyCollection { __END__ -=back - =head1 AUTHOR Kyle Hall diff --git a/C4/SQLHelper.pm b/C4/SQLHelper.pm index 8f994d3..060b78f 100644 --- a/C4/SQLHelper.pm +++ b/C4/SQLHelper.pm @@ -60,18 +60,11 @@ This module contains routines for adding, modifying and Searching Data in MysqlD =head1 FUNCTIONS -=over 2 - -=back - - =head2 SearchInTable -=over 4 - - $hashref = &SearchInTable($tablename,$data, $orderby, $limit, $columns_out, $filtercolumns, $searchtype); + $hashref = &SearchInTable($tablename,$data, $orderby, $limit, + $columns_out, $filtercolumns, $searchtype); -=back $tablename Name of the table (string) @@ -137,14 +130,10 @@ sub SearchInTable{ =head2 InsertInTable -=over 4 - $data_id_in_table = &InsertInTable($tablename,$data_hashref,$withprimarykeys); -=back +Insert Data in table and returns the id of the row inserted - Insert Data in table - and returns the id of the row inserted =cut sub InsertInTable{ @@ -163,14 +152,10 @@ sub InsertInTable{ =head2 UpdateInTable -=over 4 - $status = &UpdateInTable($tablename,$data_hashref); -=back +Update Data in table and returns the status of the operation - Update Data in table - and returns the status of the operation =cut sub UpdateInTable{ @@ -194,14 +179,10 @@ sub UpdateInTable{ =head2 DeleteInTable -=over 4 - $status = &DeleteInTable($tablename,$data_hashref); -=back +Delete Data in table and returns the status of the operation - Delete Data in table - and returns the status of the operation =cut sub DeleteInTable{ @@ -223,13 +204,10 @@ sub DeleteInTable{ =head2 GetPrimaryKeys -=over 4 - @primarykeys = &GetPrimaryKeys($tablename) -=back +Get the Primary Key field names of the table - Get the Primary Key field names of the table =cut sub GetPrimaryKeys($) { @@ -240,11 +218,7 @@ sub GetPrimaryKeys($) { =head2 _get_columns -=over 4 - -_get_columns($tablename) - -=back + _get_columns($tablename) Given a tablename Returns a hashref of all the fieldnames of the table @@ -265,11 +239,7 @@ sub _get_columns($) { =head2 _filter_columns -=over 4 - -_filter_columns($tablename,$research, $filtercolumns) - -=back + _filter_columns($tablename,$research, $filtercolumns) Given - a tablename @@ -298,11 +268,7 @@ sub _filter_columns ($$;$) { } =head2 _filter_fields -=over 4 - -_filter_fields - -=back + _filter_fields Given - a tablename diff --git a/C4/Scheduler.pm b/C4/Scheduler.pm index 8cb6d19..e4bdb9b 100644 --- a/C4/Scheduler.pm +++ b/C4/Scheduler.pm @@ -43,14 +43,11 @@ C4::Scheduler - Module for running jobs with the unix at command =head1 DESCRIPTION +=cut =head1 METHODS -=over 2 - -=cut - -=item get_jobs(); +=head2 get_jobs(); This will return all scheduled jobs @@ -62,7 +59,7 @@ sub get_jobs { return ($jobs); } -=item get_at_jobs(); +=head2 get_at_jobs(); This will return all At scheduled jobs @@ -73,7 +70,7 @@ sub get_at_jobs { return (\%jobs); } -=item get_at_job($id) +=head2 get_at_job($id) This will return the At job with the given id @@ -84,7 +81,7 @@ sub get_at_job { my %jobs = Schedule::At::getJobs(JOBID => $id); } -=item add_at_job ($time,$command) +=head2 add_at_job ($time,$command) Given a timestamp and a command this will schedule the job to run at that time. @@ -137,13 +134,11 @@ sub remove_at_job { 1; __END__ -=back - =head1 BUGS At some point C should be refactored: -=over 4 +=over =item At and C does not work on Win32. diff --git a/C4/Scrubber.pm b/C4/Scrubber.pm index c150558..80e08e5 100644 --- a/C4/Scrubber.pm +++ b/C4/Scrubber.pm @@ -73,11 +73,7 @@ More verbose debugging messages are sent in the presence of non-zero $ENV{"DEBUG The default is to scrub everything, leaving no markup at all. This is compatible with the expectations for Tags. -=head2 - -=head3 TO DO: Add real perldoc - -=head2 +=head2 TODO: Add real perldoc =cut diff --git a/C4/Service.pm b/C4/Service.pm index f6dc1a9..d9990ff 100644 --- a/C4/Service.pm +++ b/C4/Service.pm @@ -59,11 +59,7 @@ our ( $query, $cookie ); =head2 init -=over 4 - - our ( $query, $response ) = C4::Service->init( %needed_flags ); - -=back + our ( $query, $response ) = C4::Service->init( %needed_flags ); Initialize the service and check for the permissions in C<%needed_flags>. @@ -92,12 +88,8 @@ sub init { =head2 return_error -=over 4 - C4::Service->return_error( $type, $error, %flags ); -=back - Exit the script with HTTP status 400, and return a JSON error object. C<$type> should be a short, lower case code for the generic type of error (such @@ -127,22 +119,14 @@ sub return_error { =head2 return_multi -=over 4 - -C4::Service->return_multi( \@responses, %flags ); - -=back + C4::Service->return_multi( \@responses, %flags ); return_multi is similar to return_success or return_error, but allows you to return different statuses for several requests sent at once (using HTTP status "207 Multi-Status", much like WebDAV). The toplevel hashref (turned into the JSON response) looks something like this: -=over 4 - -{ multi => JSON::true, responses => \@responses, %flags } - -=back + { multi => JSON::true, responses => \@responses, %flags } Each element of @responses should be either a plain hashref or an arrayref. If it is a hashref, it is sent to the browser as-is. If it is an arrayref, it is @@ -183,12 +167,8 @@ sub return_multi { =head2 return_success -=over 4 - C4::Service->return_success( $response ); -=back - Print out the information in the C C<$response>, then exit with HTTP status 200. @@ -202,12 +182,8 @@ sub return_success { =head2 require_params -=over 4 - my @values = C4::Service->require_params( @params ); -=back - Check that each of of the parameters specified in @params was sent in the request, then return their values in that order. @@ -230,14 +206,10 @@ sub require_params { =head2 dispatch -=over 4 - -C4::Service->dispatch( - [ $path_regex, \@required_params, \&handler ], - ... -); - -=back + C4::Service->dispatch( + [ $path_regex, \@required_params, \&handler ], + ... + ); dispatch takes several array-refs, each one describing a 'route', to use the Rails terminology. -- 1.7.0.4 From M.de.Rooy at rijksmuseum.nl Mon Jun 7 13:46:21 2010 From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy) Date: Mon, 7 Jun 2010 13:46:21 +0200 Subject: [Koha-patches] [PATCH] Bug 4514 (Error handling) -- For master only. Message-ID: <1417924BB841B14C98A90E1C1569C0A31A9854B95A@S-MAIL-1.rijksmuseum.intra> Corrected the routine name to output_html_with_http_headers. Similar patch was already submitted for 3.0.x. This applies to master only. --- errors/400.pl | 2 +- errors/401.pl | 2 +- errors/402.pl | 2 +- errors/403.pl | 2 +- errors/404.pl | 2 +- errors/500.pl | 2 +- opac/errors/400.pl | 2 +- opac/errors/401.pl | 2 +- opac/errors/402.pl | 2 +- opac/errors/403.pl | 2 +- opac/errors/404.pl | 2 +- opac/errors/500.pl | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/errors/400.pl b/errors/400.pl index b04b7fd..58363bf 100755 --- a/errors/400.pl +++ b/errors/400.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request'; diff --git a/errors/401.pl b/errors/401.pl index 3ea459a..665f1d8 100755 --- a/errors/401.pl +++ b/errors/401.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized'; diff --git a/errors/402.pl b/errors/402.pl index 4bfe7ce..b94d0bd 100755 --- a/errors/402.pl +++ b/errors/402.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required'; diff --git a/errors/403.pl b/errors/403.pl index 4058ce9..b08ae39 100755 --- a/errors/403.pl +++ b/errors/403.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden'; diff --git a/errors/404.pl b/errors/404.pl index 418723f..806ad2c 100755 --- a/errors/404.pl +++ b/errors/404.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found'; diff --git a/errors/500.pl b/errors/500.pl index 6f570a2..56270e1 100755 --- a/errors/500.pl +++ b/errors/500.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error'; diff --git a/opac/errors/400.pl b/opac/errors/400.pl index a0d9413..8c9bbb0 100755 --- a/opac/errors/400.pl +++ b/opac/errors/400.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request'; diff --git a/opac/errors/401.pl b/opac/errors/401.pl index 216b643..08b69dc 100755 --- a/opac/errors/401.pl +++ b/opac/errors/401.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized'; diff --git a/opac/errors/402.pl b/opac/errors/402.pl index b84ccca..507424b 100755 --- a/opac/errors/402.pl +++ b/opac/errors/402.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required'; diff --git a/opac/errors/403.pl b/opac/errors/403.pl index ba21cd6..52b21c5 100755 --- a/opac/errors/403.pl +++ b/opac/errors/403.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden'; diff --git a/opac/errors/404.pl b/opac/errors/404.pl index 0c5408c..c299f02 100755 --- a/opac/errors/404.pl +++ b/opac/errors/404.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_html_with_http_headers $query, $cookie, $template->output, '404 Not Found'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found'; diff --git a/opac/errors/500.pl b/opac/errors/500.pl index fb0350e..2b082db 100755 --- a/opac/errors/500.pl +++ b/opac/errors/500.pl @@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); $template->param( admin => $admin ); -output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error'; +output_html_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error'; -- 1.6.0.6 From M.de.Rooy at rijksmuseum.nl Mon Jun 7 14:24:37 2010 From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy) Date: Mon, 7 Jun 2010 14:24:37 +0200 Subject: [Koha-patches] [PATCH] Bug 4513 (Resetting framework to Default) [v3.0.x] Message-ID: <1417924BB841B14C98A90E1C1569C0A31A9854BA11@S-MAIL-1.rijksmuseum.intra> Resubmitting this patch for 3.0.x only. --- cataloguing/addbiblio.pl | 5 +++-- .../prog/en/modules/cataloguing/addbiblio.tmpl | 2 +- 26 files changed, 79 insertions(+), 30 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index 3a64ebf..c837158 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -852,7 +852,8 @@ foreach my $thisframeworkcode ( keys %$frameworks ) { push @frameworkcodeloop, \%row; } $template->param( frameworkcodeloop => \@frameworkcodeloop, - breedingid => $breedingid ); + breedingid => $breedingid , + frameworkcode => $frameworkcode||"Default" ); # ++ Global $tagslib = &GetMarcStructure( 1, $frameworkcode ); @@ -994,7 +995,7 @@ elsif ( $op eq "delete" ) { $template->param( title => $record->title() ) if ( $record ne "-1" ); $template->param( popup => $mode, - frameworkcode => $frameworkcode, + frameworkcode => $frameworkcode||'Default', itemtype => $frameworkcode, ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl index 25c9086..2e6b769 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -653,7 +653,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
  • - - - - - - -=back + =cut @@ -834,11 +780,7 @@ sub GetItemStatus { =head2 GetItemLocation -=over 4 - -$itemlochash = GetItemLocation($fwk); - -=back + $itemlochash = GetItemLocation($fwk); Returns a list of valid values for the C field. @@ -851,34 +793,26 @@ Create a location selector with the following code =head3 in PERL SCRIPT -=over 4 - -my $itemlochash = getitemlocation; -my @itemlocloop; -foreach my $thisloc (keys %$itemlochash) { - my $selected = 1 if $thisbranch eq $branch; - my %row =(locval => $thisloc, - selected => $selected, - locname => $itemlochash->{$thisloc}, - ); - push @itemlocloop, \%row; -} -$template->param(itemlocationloop => \@itemlocloop); - -=back + my $itemlochash = getitemlocation; + my @itemlocloop; + foreach my $thisloc (keys %$itemlochash) { + my $selected = 1 if $thisbranch eq $branch; + my %row =(locval => $thisloc, + selected => $selected, + locname => $itemlochash->{$thisloc}, + ); + push @itemlocloop, \%row; + } + $template->param(itemlocationloop => \@itemlocloop); =head3 in TEMPLATE -=over 4 - - - -=back + =cut @@ -932,11 +866,7 @@ sub GetItemLocation { =head2 GetLostItems -=over 4 - -$items = GetLostItems( $where, $orderby ); - -=back + $items = GetLostItems( $where, $orderby ); This function gets a list of lost items. @@ -960,9 +890,9 @@ from the "items" table as keys. =item usage in the perl script: -my $where = { barcode => '0001548' }; -my $items = GetLostItems( $where, "homebranch" ); -$template->param( itemsloop => $items ); + my $where = { barcode => '0001548' }; + my $items = GetLostItems( $where, "homebranch" ); + $template->param( itemsloop => $items ); =back @@ -1007,11 +937,9 @@ sub GetLostItems { =head2 GetItemsForInventory -=over 4 - -$itemlist = GetItemsForInventory($minlocation, $maxlocation, $location, $itemtype $datelastseen, $branch, $offset, $size, $statushash); - -=back + $itemlist = GetItemsForInventory($minlocation, $maxlocation, + $location, $itemtype $datelastseen, $branch, + $offset, $size, $statushash); Retrieve a list of title/authors/barcode/callnumber, for biblio inventory. @@ -1105,10 +1033,7 @@ END_SQL =head2 GetItemsCount -=over 4 -$count = &GetItemsCount( $biblionumber); - -=back + $count = &GetItemsCount( $biblionumber); This function return count of item with $biblionumber @@ -1128,11 +1053,7 @@ sub GetItemsCount { =head2 GetItemInfosOf -=over 4 - -GetItemInfosOf(@itemnumbers); - -=back + GetItemInfosOf(@itemnumbers); =cut @@ -1149,11 +1070,7 @@ sub GetItemInfosOf { =head2 GetItemsByBiblioitemnumber -=over 4 - -GetItemsByBiblioitemnumber($biblioitemnumber); - -=back + GetItemsByBiblioitemnumber($biblioitemnumber); Returns an arrayref of hashrefs suitable for use in a TMPL_LOOP Called by C @@ -1205,11 +1122,7 @@ sub GetItemsByBiblioitemnumber { =head2 GetItemsInfo -=over 4 - - at results = GetItemsInfo($biblionumber, $type); - -=back + @results = GetItemsInfo($biblionumber, $type); Returns information about books with the given biblionumber. @@ -1407,11 +1320,8 @@ sub GetItemsInfo { =head2 GetLastAcquisitions -=over 4 - -my $lastacq = GetLastAcquisitions({'branches' => ('branch1','branch2'), 'itemtypes' => ('BK','BD')}, 10); - -=back + my $lastacq = GetLastAcquisitions({'branches' => ('branch1','branch2'), + 'itemtypes' => ('BK','BD')}, 10); =cut @@ -1461,11 +1371,7 @@ sub GetLastAcquisitions { =head2 get_itemnumbers_of -=over 4 - -my @itemnumbers_of = get_itemnumbers_of(@biblionumbers); - -=back + my @itemnumbers_of = get_itemnumbers_of(@biblionumbers); Given a list of biblionumbers, return the list of corresponding itemnumbers for each biblionumber. @@ -1500,11 +1406,7 @@ sub get_itemnumbers_of { =head2 GetItemnumberFromBarcode -=over 4 - -$result = GetItemnumberFromBarcode($barcode); - -=back + $result = GetItemnumberFromBarcode($barcode); =cut @@ -1521,11 +1423,7 @@ sub GetItemnumberFromBarcode { =head2 GetBarcodeFromItemnumber -=over 4 - -$result = GetBarcodeFromItemnumber($itemnumber); - -=back + $result = GetBarcodeFromItemnumber($itemnumber); =cut @@ -1542,12 +1440,11 @@ sub GetBarcodeFromItemnumber { =head3 get_item_authorised_values - find the types and values for all authorised values assigned to this item. +find the types and values for all authorised values assigned to this item. - parameters: - itemnumber +parameters: itemnumber - returns: a hashref malling the authorised value to the value set for this itemnumber +returns: a hashref malling the authorised value to the value set for this itemnumber $authorised_values = { 'CCODE' => undef, @@ -1563,7 +1460,7 @@ sub GetBarcodeFromItemnumber { 'itemtypes' => 'SER', }; - Notes: see C4::Biblio::get_biblio_authorised_values for a similar method at the biblio level. +Notes: see C4::Biblio::get_biblio_authorised_values for a similar method at the biblio level. =cut @@ -1593,25 +1490,24 @@ sub get_item_authorised_values { =head3 get_authorised_value_images - find a list of icons that are appropriate for display based on the - authorised values for a biblio. +find a list of icons that are appropriate for display based on the +authorised values for a biblio. - parameters: listref of authorised values, such as comes from - get_item_authorised_values or - from C4::Biblio::get_biblio_authorised_values +parameters: listref of authorised values, such as comes from +get_item_authorised_values or +from C4::Biblio::get_biblio_authorised_values - returns: listref of hashrefs for each image. Each hashref looks like - this: +returns: listref of hashrefs for each image. Each hashref looks like this: { imageurl => '/intranet-tmpl/prog/img/itemtypeimg/npl/WEB.gif', label => '', category => '', value => '', } - Notes: Currently, I put on the full path to the images on the staff - side. This should either be configurable or not done at all. Since I - have to deal with 'intranet' or 'opac' in - get_biblio_authorised_values, perhaps I should be passing it in. +Notes: Currently, I put on the full path to the images on the staff +side. This should either be configurable or not done at all. Since I +have to deal with 'intranet' or 'opac' in +get_biblio_authorised_values, perhaps I should be passing it in. =cut @@ -1652,11 +1548,7 @@ without careful thought. =head2 GetMarcItem -=over 4 - -my $item_marc = GetMarcItem($biblionumber, $itemnumber); - -=back + my $item_marc = GetMarcItem($biblionumber, $itemnumber); Returns MARC::Record of the item passed in parameter. This function is meant for use only in C, @@ -1743,11 +1635,7 @@ my %derived_columns = ( =head2 _set_derived_columns_for_add -=over 4 - -_set_derived_column_for_add($item); - -=back + _set_derived_column_for_add($item); Given an item hash representing a new item to be added, calculate any derived columns. Currently the only @@ -1771,11 +1659,7 @@ sub _set_derived_columns_for_add { =head2 _set_derived_columns_for_mod -=over 4 - -_set_derived_column_for_mod($item); - -=back + _set_derived_column_for_mod($item); Given an item hash representing a new item to be modified. calculate any derived columns. Currently the only @@ -1822,11 +1706,7 @@ sub _set_derived_columns_for_mod { =head2 _do_column_fixes_for_mod -=over 4 - -_do_column_fixes_for_mod($item); - -=back + _do_column_fixes_for_mod($item); Given an item hashref containing one or more columns to modify, fix up certain values. @@ -1863,11 +1743,7 @@ sub _do_column_fixes_for_mod { =head2 _get_single_item_column -=over 4 - -_get_single_item_column($column, $itemnumber); - -=back + _get_single_item_column($column, $itemnumber); Retrieves the value of a single column from an C row specified by C<$itemnumber>. @@ -1887,11 +1763,7 @@ sub _get_single_item_column { =head2 _calc_items_cn_sort -=over 4 - -_calc_items_cn_sort($item, $source_values); - -=back + _calc_items_cn_sort($item, $source_values); Helper routine to calculate C. @@ -1906,11 +1778,7 @@ sub _calc_items_cn_sort { =head2 _set_defaults_for_add -=over 4 - -_set_defaults_for_add($item_hash); - -=back + _set_defaults_for_add($item_hash); Given an item hash representing an item to be added, set correct default values for columns whose default value @@ -1951,11 +1819,7 @@ sub _set_defaults_for_add { =head2 _koha_new_item -=over 4 - -my ($itemnumber,$error) = _koha_new_item( $item, $barcode ); - -=back + my ($itemnumber,$error) = _koha_new_item( $item, $barcode ); Perform the actual insert into the C table. @@ -2048,16 +1912,14 @@ sub _koha_new_item { =head2 MoveItemFromBiblio -=over 4 - -MoveItemFromBiblio($itenumber, $frombiblio, $tobiblio); - -=back + MoveItemFromBiblio($itenumber, $frombiblio, $tobiblio); Moves an item from a biblio to another Returns undef if the move failed or the biblionumber of the destination record otherwise + =cut + sub MoveItemFromBiblio { my ($itemnumber, $frombiblio, $tobiblio) = @_; my $dbh = C4::Context->dbh; @@ -2124,11 +1986,7 @@ sub MoveItemFromBiblio { =head2 DelItemCheck -=over 4 - -DelItemCheck($dbh, $biblionumber, $itemnumber); - -=back + DelItemCheck($dbh, $biblionumber, $itemnumber); Exported function (core API) for deleting an item record in Koha if there no current issue. @@ -2163,11 +2021,7 @@ sub DelItemCheck { =head2 _koha_modify_item -=over 4 - -my ($itemnumber,$error) =_koha_modify_item( $item ); - -=back + my ($itemnumber,$error) =_koha_modify_item( $item ); Perform the actual update of the C row. Note that this routine accepts a hashref specifying the columns to update. @@ -2199,11 +2053,7 @@ sub _koha_modify_item { =head2 _koha_delete_item -=over 4 - -_koha_delete_item( $dbh, $itemnum ); - -=back + _koha_delete_item( $dbh, $itemnum ); Internal function to delete an item record from the koha tables @@ -2234,11 +2084,7 @@ sub _koha_delete_item { =head2 _marc_from_item_hash -=over 4 - -my $item_marc = _marc_from_item_hash($item, $frameworkcode[, $unlinked_item_subfields]); - -=back + my $item_marc = _marc_from_item_hash($item, $frameworkcode[, $unlinked_item_subfields]); Given an item hash representing a complete item record, create a C object containing an embedded @@ -2285,11 +2131,7 @@ sub _marc_from_item_hash { =head2 _add_item_field_to_biblio -=over 4 - -_add_item_field_to_biblio($item_marc, $biblionumber, $frameworkcode); - -=back + _add_item_field_to_biblio($item_marc, $biblionumber, $frameworkcode); Adds the fields from a MARC record containing the representation of a Koha item record to the MARC @@ -2312,11 +2154,7 @@ sub _add_item_field_to_biblio { =head2 _replace_item_field_in_biblio -=over - -&_replace_item_field_in_biblio($item_marc, $biblionumber, $itemnumber, $frameworkcode) - -=back + &_replace_item_field_in_biblio($item_marc, $biblionumber, $itemnumber, $frameworkcode) Given a MARC::Record C<$item_marc> containing one tag with the MARC representation of the item, examine the biblio MARC @@ -2381,11 +2219,7 @@ sub _repack_item_errors { =head2 _get_unlinked_item_subfields -=over 4 - -my $unlinked_item_subfields = _get_unlinked_item_subfields($original_item_marc, $frameworkcode); - -=back + my $unlinked_item_subfields = _get_unlinked_item_subfields($original_item_marc, $frameworkcode); =cut @@ -2415,11 +2249,7 @@ sub _get_unlinked_item_subfields { =head2 _get_unlinked_subfields_xml -=over 4 - -my $unlinked_subfields_xml = _get_unlinked_subfields_xml($unlinked_item_subfields); - -=back + my $unlinked_subfields_xml = _get_unlinked_subfields_xml($unlinked_item_subfields); =cut @@ -2441,11 +2271,7 @@ sub _get_unlinked_subfields_xml { =head2 _parse_unlinked_item_subfields_from_xml -=over 4 - -my $unlinked_item_subfields = _parse_unlinked_item_subfields_from_xml($whole_item->{'more_subfields_xml'}): - -=back + my $unlinked_item_subfields = _parse_unlinked_item_subfields_from_xml($whole_item->{'more_subfields_xml'}): =cut diff --git a/C4/Matcher.pm b/C4/Matcher.pm index 5da0801..3f44783 100644 --- a/C4/Matcher.pm +++ b/C4/Matcher.pm @@ -38,37 +38,33 @@ C4::Matcher - find MARC records matching another one =head1 SYNOPSIS -=over 4 + my @matchers = C4::Matcher::GetMatcherList(); -my @matchers = C4::Matcher::GetMatcherList(); + my $matcher = C4::Matcher->new($record_type); + $matcher->threshold($threshold); + $matcher->code($code); + $matcher->description($description); -my $matcher = C4::Matcher->new($record_type); -$matcher->threshold($threshold); -$matcher->code($code); -$matcher->description($description); + $matcher->add_simple_matchpoint('isbn', 1000, '020', 'a', -1, 0, ''); + $matcher->add_simple_matchpoint('Date', 1000, '008', '', 7, 4, ''); + $matcher->add_matchpoint('isbn', 1000, [ { tag => '020', subfields => 'a', norms => [] } ]); -$matcher->add_simple_matchpoint('isbn', 1000, '020', 'a', -1, 0, ''); -$matcher->add_simple_matchpoint('Date', 1000, '008', '', 7, 4, ''); -$matcher->add_matchpoint('isbn', 1000, [ { tag => '020', subfields => 'a', norms => [] } ]); + $matcher->add_simple_required_check('245', 'a', -1, 0, '', '245', 'a', -1, 0, ''); + $matcher->add_required_check([ { tag => '245', subfields => 'a', norms => [] } ], + [ { tag => '245', subfields => 'a', norms => [] } ]); -$matcher->add_simple_required_check('245', 'a', -1, 0, '', '245', 'a', -1, 0, ''); -$matcher->add_required_check([ { tag => '245', subfields => 'a', norms => [] } ], - [ { tag => '245', subfields => 'a', norms => [] } ]); + my @matches = $matcher->get_matches($marc_record, $max_matches); -my @matches = $matcher->get_matches($marc_record, $max_matches); + foreach $match (@matches) { -foreach $match (@matches) { + # matches already sorted in order of + # decreasing score + print "record ID: $match->{'record_id'}; + print "score: $match->{'score'}; - # matches already sorted in order of - # decreasing score - print "record ID: $match->{'record_id'}; - print "score: $match->{'score'}; + } -} - -my $matcher_description = $matcher->dump(); - -=back + my $matcher_description = $matcher->dump(); =head1 FUNCTIONS @@ -76,18 +72,14 @@ my $matcher_description = $matcher->dump(); =head2 GetMatcherList -=over 4 - -my @matchers = C4::Matcher::GetMatcherList(); - -=back + my @matchers = C4::Matcher::GetMatcherList(); Returns an array of hashrefs list all matchers present in the database. Each hashref includes: -matcher_id -code -description + * matcher_id + * code + * description =cut @@ -105,15 +97,9 @@ sub GetMatcherList { =head1 METHODS -=cut - =head2 new -=over 4 - -my $matcher = C4::Matcher->new($record_type, $threshold); - -=back + my $matcher = C4::Matcher->new($record_type, $threshold); Creates a new Matcher. C<$record_type> indicates which search database to use, e.g., 'biblio' or 'authority' and defaults to @@ -152,11 +138,7 @@ sub new { =head2 fetch -=over 4 - -my $matcher = C4::Matcher->fetch($id); - -=back + my $matcher = C4::Matcher->fetch($id); Creates a matcher object from the version stored in the database. If a matcher with the given @@ -245,11 +227,7 @@ sub _fetch_matchpoint { =head2 store -=over 4 - -my $id = $matcher->store(); - -=back + my $id = $matcher->store(); Stores matcher in database. The return value is the ID of the marc_matchers row. If the matcher was @@ -374,11 +352,7 @@ sub _store_matchpoint { =head2 delete -=over 4 - -C4::Matcher->delete($id); - -=back + C4::Matcher->delete($id); Deletes the matcher of the specified ID from the database. @@ -396,12 +370,8 @@ sub delete { =head2 threshold -=over 4 - -$matcher->threshold(1000); -my $threshold = $matcher->threshold(); - -=back + $matcher->threshold(1000); + my $threshold = $matcher->threshold(); Accessor method. @@ -414,12 +384,8 @@ sub threshold { =head2 _id -=over 4 - -$matcher->_id(123); -my $id = $matcher->_id(); - -=back + $matcher->_id(123); + my $id = $matcher->_id(); Accessor method. Note that using this method to set the DB ID of the matcher should not be @@ -434,12 +400,8 @@ sub _id { =head2 code -=over 4 - -$matcher->code('ISBN'); -my $code = $matcher->code(); - -=back + $matcher->code('ISBN'); + my $code = $matcher->code(); Accessor method. @@ -452,12 +414,8 @@ sub code { =head2 description -=over 4 - -$matcher->description('match on ISBN'); -my $description = $matcher->description(); - -=back + $matcher->description('match on ISBN'); + my $description = $matcher->description(); Accessor method. @@ -470,11 +428,7 @@ sub description { =head2 add_matchpoint -=over 4 - -$matcher->add_matchpoint($index, $score, $matchcomponents); - -=back + $matcher->add_matchpoint($index, $score, $matchcomponents); Adds a matchpoint that may include multiple components. The $index parameter identifies the index that will be searched, while $score @@ -512,13 +466,10 @@ sub add_matchpoint { =head2 add_simple_matchpoint -=over 4 + $matcher->add_simple_matchpoint($index, $score, $source_tag, + $source_subfields, $source_offset, + $source_length, $source_normalizer); -$matcher->add_simple_matchpoint($index, $score, $source_tag, $source_subfields, - $source_offset, $source_length, - $source_normalizer); - -=back Adds a simple matchpoint rule -- after composing a key based on the source tag and subfields, normalized per the normalization fuction, search the index. All records retrieved @@ -540,11 +491,7 @@ sub add_simple_matchpoint { =head2 add_required_check -=over 4 - -$match->add_required_check($source_matchpoint, $target_matchpoint); - -=back + $match->add_required_check($source_matchpoint, $target_matchpoint); Adds a required check definition. A required check means that in order for a match to be considered valid, the key derived from the @@ -596,16 +543,14 @@ sub add_required_check { =head2 add_simple_required_check -$matcher->add_simple_required_check($source_tag, $source_subfields, $source_offset, $source_length, $source_normalizer, - $target_tag, $target_subfields, $target_offset, $target_length, $target_normalizer); - -=over 4 + $matcher->add_simple_required_check($source_tag, $source_subfields, + $source_offset, $source_length, $source_normalizer, + $target_tag, $target_subfields, $target_offset, + $target_length, $target_normalizer); Adds a required check, which requires that the normalized keys made from the source and targets must match for a match to be considered valid. -=back - =cut sub add_simple_required_check { @@ -623,17 +568,13 @@ sub add_simple_required_check { =head2 find_matches -=over 4 - -my @matches = $matcher->get_matches($marc_record, $max_matches); -foreach $match (@matches) { - # matches already sorted in order of - # decreasing score - print "record ID: $match->{'record_id'}; - print "score: $match->{'score'}; -} - -=back + my @matches = $matcher->get_matches($marc_record, $max_matches); + foreach $match (@matches) { + # matches already sorted in order of + # decreasing score + print "record ID: $match->{'record_id'}; + print "score: $match->{'score'}; + } Identifies all of the records matching the given MARC record. For a record already in the database to be considered a match, it must meet the following criteria: @@ -697,11 +638,7 @@ sub get_matches { =head2 dump -=over 4 - -$description = $matcher->dump(); - -=back + $description = $matcher->dump(); Returns a reference to a structure containing all of the information in the matcher object. This is mainly a convenience method to diff --git a/C4/Members.pm b/C4/Members.pm index 30e9f2d..eba71f5 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -133,13 +133,10 @@ This module contains routines for adding, modifying and deleting members/patrons =head1 FUNCTIONS -=over 2 +=head2 SearchMember -=item SearchMember - - ($count, $borrowers) = &SearchMember($searchstring, $type,$category_type,$filter,$showallbranches); - -=back + ($count, $borrowers) = &SearchMember($searchstring, $type, + $category_type, $filter, $showallbranches); Looks up patrons (borrowers) by name. @@ -245,13 +242,10 @@ sub SearchMember { return ( scalar(@$data), $data ); } -=over 2 +=head2 Search -=item Search - - $borrowers_result_array_ref = &Search($filter,$orderby, $limit, $columns_out, $search_on_fields,$searchtype); - -=back + $borrowers_result_array_ref = &Search($filter,$orderby, $limit, + $columns_out, $search_on_fields,$searchtype); Looks up patrons (borrowers) on filter. @@ -378,9 +372,9 @@ sub GetMemberDetails { $flags = &patronflags($patron); - This function is not exported. +This function is not exported. - The following will be set where applicable: +The following will be set where applicable: $flags->{CHARGES}->{amount} Amount of debt $flags->{CHARGES}->{noissues} Set if debt amount >$5.00 (or syspref noissuescharge) $flags->{CHARGES}->{message} Message -- deprecated @@ -412,17 +406,17 @@ sub GetMemberDetails { $flags->{WAITING}->{message} Message -- deprecated $flags->{WAITING}->{itemlist} ref-to-array: list of available items -=over 4 +=over -C<$flags-E{ODUES}-E{itemlist}> is a reference-to-array listing the +=item C<$flags-E{ODUES}-E{itemlist}> is a reference-to-array listing the overdue items. Its elements are references-to-hash, each describing an overdue item. The keys are selected fields from the issues, biblio, biblioitems, and items tables of the Koha database. -C<$flags-E{ODUES}-E{itemlisttext}> is a string giving a text listing of +=item C<$flags-E{ODUES}-E{itemlisttext}> is a string giving a text listing of the overdue items, one per line. Deprecated. -C<$flags-E{WAITING}-E{itemlist}> is a reference-to-array listing the +=item C<$flags-E{WAITING}-E{itemlist}> is a reference-to-array listing the available items. Each element is a reference-to-hash whose keys are fields from the reserves table of the Koha database. @@ -577,11 +571,7 @@ sub GetMember { =head2 IsMemberBlocked -=over 4 - -my ($block_status, $count) = IsMemberBlocked( $borrowernumber ); - -=back + my ($block_status, $count) = IsMemberBlocked( $borrowernumber ); Returns whether a patron has overdue items that may result in a block or whether the patron has active fine days @@ -698,22 +688,18 @@ sub columns(;$) { return @{C4::Context->dbh->selectcol_arrayref("SHOW columns from borrowers")}; } -=head2 - =head2 ModMember -=over 4 - -my $success = ModMember(borrowernumber => $borrowernumber, [ field => value ]... ); + my $success = ModMember(borrowernumber => $borrowernumber, + [ field => value ]... ); Modify borrower's data. All date fields should ALREADY be in ISO format. return : true on success, or false on failure -=back - =cut + sub ModMember { my (%data) = @_; # test to know if you must update or not the borrower password @@ -740,8 +726,6 @@ sub ModMember { } -=head2 - =head2 AddMember $borrowernumber = &AddMember(%borrower); @@ -1357,8 +1341,9 @@ sub GetborCatFromCatType { Given the borrower's category code, the function returns the corresponding data hashref for a comprehensive information display. - + $arrayref_hashref = &GetBorrowercategory; + If no category code provided, the function returns all the categories. =cut @@ -1382,7 +1367,7 @@ sub GetBorrowercategory { } # sub getborrowercategory =head2 GetBorrowercategoryList - + $arrayref_hashref = &GetBorrowercategoryList; If no category code provided, the function returns all the categories. @@ -1478,6 +1463,7 @@ sub GetAge{ } # sub get_age =head2 get_institutions + $insitutions = get_institutions(); Just returns a list of all the borrowers of type I, borrownumber and name @@ -1603,7 +1589,7 @@ sub MoveMemberToDeleted { =head2 DelMember -DelMember($borrowernumber); + DelMember($borrowernumber); This function remove directly a borrower whitout writing it on deleteborrower. + Deletes reserves for the borrower @@ -1813,10 +1799,10 @@ WHERE roadtypeid=?|; =head2 GetBorrowersWhoHaveNotBorrowedSince -&GetBorrowersWhoHaveNotBorrowedSince($date) + &GetBorrowersWhoHaveNotBorrowedSince($date) this function get all borrowers who haven't borrowed since the date given on input arg. - + =cut sub GetBorrowersWhoHaveNotBorrowedSince { @@ -1874,9 +1860,9 @@ sub GetBorrowersWhoHaveNotBorrowedSince { =head2 GetBorrowersWhoHaveNeverBorrowed -$results = &GetBorrowersWhoHaveNeverBorrowed + $results = &GetBorrowersWhoHaveNeverBorrowed -this function get all borrowers who have never borrowed. +This function get all borrowers who have never borrowed. I<$result> is a ref to an array which all elements are a hasref. @@ -1921,7 +1907,7 @@ sub GetBorrowersWhoHaveNeverBorrowed { =head2 GetBorrowersWithIssuesHistoryOlderThan -$results = &GetBorrowersWithIssuesHistoryOlderThan($date) + $results = &GetBorrowersWithIssuesHistoryOlderThan($date) this function get all borrowers who has an issue history older than I<$date> given on input arg. @@ -1966,7 +1952,7 @@ sub GetBorrowersWithIssuesHistoryOlderThan { =head2 GetBorrowersNamesAndLatestIssue -$results = &GetBorrowersNamesAndLatestIssueList(@borrowernumbers) + $results = &GetBorrowersNamesAndLatestIssueList(@borrowernumbers) this function get borrowers Names and surnames and Issue information. @@ -1992,9 +1978,7 @@ sub GetBorrowersNamesAndLatestIssue { =head2 DebarMember -=over 4 - -my $success = DebarMember( $borrowernumber ); + my $success = DebarMember( $borrowernumber ); marks a Member as debarred, and therefore unable to checkout any more items. @@ -2002,8 +1986,6 @@ items. return : true on success, false on failure -=back - =cut sub DebarMember { @@ -2019,9 +2001,7 @@ sub DebarMember { =head2 AddMessage -=over 4 - -AddMessage( $borrowernumber, $message_type, $message, $branchcode ); + AddMessage( $borrowernumber, $message_type, $message, $branchcode ); Adds a message to the messages table for the given borrower. @@ -2029,8 +2009,6 @@ Returns: True on success False on failure -=back - =cut sub AddMessage { @@ -2051,17 +2029,13 @@ sub AddMessage { =head2 GetMessages -=over 4 - -GetMessages( $borrowernumber, $type ); + GetMessages( $borrowernumber, $type ); $type is message type, B for borrower, or L for Librarian. Empty type returns all messages of any type. Returns all messages for the given borrowernumber -=back - =cut sub GetMessages { @@ -2096,17 +2070,13 @@ sub GetMessages { =head2 GetMessages -=over 4 - -GetMessagesCount( $borrowernumber, $type ); + GetMessagesCount( $borrowernumber, $type ); $type is message type, B for borrower, or L for Librarian. Empty type returns all messages of any type. Returns the number of messages for the given borrowernumber -=back - =cut sub GetMessagesCount { @@ -2133,11 +2103,7 @@ sub GetMessagesCount { =head2 DeleteMessage -=over 4 - -DeleteMessage( $message_id ); - -=back + DeleteMessage( $message_id ); =cut diff --git a/C4/Record.pm b/C4/Record.pm index 233fa6e..37fc3e1 100644 --- a/C4/Record.pm +++ b/C4/Record.pm @@ -71,14 +71,10 @@ New in Koha 3.x. This module handles all record-related management functions. =head2 marc2marc - Convert from one flavour of ISO-2709 to another -=over 4 - -my ($error,$newmarc) = marc2marc($marc,$to_flavour,$from_flavour,$encoding); + my ($error,$newmarc) = marc2marc($marc,$to_flavour,$from_flavour,$encoding); Returns an ISO-2709 scalar -=back - =cut sub marc2marc { @@ -89,14 +85,10 @@ sub marc2marc { =head2 marc2marcxml - Convert from ISO-2709 to MARCXML -=over 4 - -my ($error,$marcxml) = marc2marcxml($marc,$encoding,$flavour); + my ($error,$marcxml) = marc2marcxml($marc,$encoding,$flavour); Returns a MARCXML scalar -=over 2 - C<$marc> - an ISO-2709 scalar or MARC::Record object C<$encoding> - UTF-8 or MARC-8 [UTF-8] @@ -105,10 +97,6 @@ C<$flavour> - MARC21 or UNIMARC C<$dont_entity_encode> - a flag that instructs marc2marcxml not to entity encode the xml before returning (optional) -=back - -=back - =cut sub marc2marcxml { @@ -175,24 +163,16 @@ sub marc2marcxml { =head2 marcxml2marc - Convert from MARCXML to ISO-2709 -=over 4 - -my ($error,$marc) = marcxml2marc($marcxml,$encoding,$flavour); + my ($error,$marc) = marcxml2marc($marcxml,$encoding,$flavour); Returns an ISO-2709 scalar -=over 2 - C<$marcxml> - a MARCXML record C<$encoding> - UTF-8 or MARC-8 [UTF-8] C<$flavour> - MARC21 or UNIMARC -=back - -=back - =cut sub marcxml2marc { @@ -215,24 +195,16 @@ sub marcxml2marc { =head2 marc2dcxml - Convert from ISO-2709 to Dublin Core -=over 4 - -my ($error,$dcxml) = marc2dcxml($marc,$qualified); + my ($error,$dcxml) = marc2dcxml($marc,$qualified); Returns a DublinCore::Record object, will eventually return a Dublin Core scalar FIXME: should return actual XML, not just an object -=over 2 - C<$marc> - an ISO-2709 scalar or MARC::Record object C<$qualified> - specify whether qualified Dublin Core should be used in the input or output [0] -=back - -=back - =cut sub marc2dcxml { @@ -269,16 +241,13 @@ sub marc2dcxml { $dcxmlfinal .= "\n"; return ($error,$dcxmlfinal); } -=head2 marc2modsxml - Convert from ISO-2709 to MODS -=over 4 +=head2 marc2modsxml - Convert from ISO-2709 to MODS -my ($error,$modsxml) = marc2modsxml($marc); + my ($error,$modsxml) = marc2modsxml($marc); Returns a MODS scalar -=back - =cut sub marc2modsxml { @@ -330,25 +299,19 @@ sub marc2endnote { } =head2 marc2csv - Convert several records from UNIMARC to CSV -Pre and postprocessing can be done through a YAML file -=over 4 + my ($csv) = marc2csv($biblios, $csvprofileid); -my ($csv) = marc2csv($biblios, $csvprofileid); +Pre and postprocessing can be done through a YAML file Returns a CSV scalar -=over 2 - C<$biblio> - a list of biblionumbers C<$csvprofileid> - the id of the CSV profile to use for the export (see export_format.export_format_id and the GetCsvProfiles function in C4::Csv) -=back - -=back - =cut + sub marc2csv { my ($biblios, $id) = @_; my $output; @@ -379,14 +342,10 @@ sub marc2csv { =head2 marcrecord2csv - Convert a single record from UNIMARC to CSV -=over 4 - -my ($csv) = marcrecord2csv($biblio, $csvprofileid, $header); + my ($csv) = marcrecord2csv($biblio, $csvprofileid, $header); Returns a CSV scalar -=over 2 - C<$biblio> - a biblionumber C<$csvprofileid> - the id of the CSV profile to use for the export (see export_format.export_format_id and the GetCsvProfiles function in C4::Csv) @@ -395,10 +354,6 @@ C<$header> - true if the headers are to be printed (typically at first pass) C<$csv> - an already initialised Text::CSV object -=back - -=back - =cut @@ -539,9 +494,7 @@ sub marcrecord2csv { =head2 html2marcxml -=over 4 - -my ($error,$marcxml) = html2marcxml($tags,$subfields,$values,$indicator,$ind_tag); + my ($error,$marcxml) = html2marcxml($tags,$subfields,$values,$indicator,$ind_tag); Returns a MARCXML scalar @@ -550,8 +503,6 @@ the form submission. FIXME: this could use some better code documentation -=back - =cut sub html2marcxml { @@ -628,12 +579,8 @@ sub html2marcxml { =head2 html2marc -=over 4 - Probably best to avoid using this ... it has some rather striking problems: -=over 2 - * saves blank subfields * subfield order is hardcoded to always start with 'a' for repeatable tags (because it is hardcoded in the addfield routine). @@ -642,12 +589,8 @@ Probably best to avoid using this ... it has some rather striking problems: * the underlying routines didn't support subfield reordering or subfield repeatability. -=back - I've left it in here because it could be useful if someone took the time to fix it. -- kados -=back - =cut sub html2marc { @@ -717,14 +660,10 @@ sub html2marc { =head2 changeEncoding - Change the encoding of a record -=over 4 - -my ($error, $newrecord) = changeEncoding($record,$format,$flavour,$to_encoding,$from_encoding); + my ($error, $newrecord) = changeEncoding($record,$format,$flavour,$to_encoding,$from_encoding); Changes the encoding of a record -=over 2 - C<$record> - the record itself can be in ISO-2709, a MARC::Record object, or MARCXML for now (required) C<$format> - MARC or MARCXML (required) @@ -735,16 +674,12 @@ C<$to_encoding> - the encoding you want the record to end up in (optional) [UTF- C<$from_encoding> - the encoding the record is currently in (optional, it will probably be able to tell unless there's a problem with the record) -=back - FIXME: the from_encoding doesn't work yet FIXME: better handling for UNIMARC, it should allow management of 100 field FIXME: shouldn't have to convert to and from xml/marc just to change encoding someone needs to re-write MARC::Record's 'encoding' method to actually alter the encoding rather than just changing the leader -=back - =cut sub changeEncoding { @@ -780,22 +715,14 @@ sub changeEncoding { =head2 marc2bibtex - Convert from MARC21 and UNIMARC to BibTex -=over 4 - -my ($bibtex) = marc2bibtex($record, $id); + my ($bibtex) = marc2bibtex($record, $id); Returns a BibTex scalar -=over 2 - C<$record> - a MARC::Record object C<$id> - an id for the BibTex record (might be the biblionumber) -=back - -=back - =cut @@ -870,18 +797,14 @@ sub marc2bibtex { =head2 _entity_encode - Entity-encode an array of strings -=over 4 - -my ($entity_encoded_string) = _entity_encode($string); + my ($entity_encoded_string) = _entity_encode($string); or -my (@entity_encoded_strings) = _entity_encode(@strings); + my (@entity_encoded_strings) = _entity_encode(@strings); Entity-encode an array of strings -=back - =cut sub _entity_encode { diff --git a/C4/UploadedFile.pm b/C4/UploadedFile.pm index 3329936..f75518f 100644 --- a/C4/UploadedFile.pm +++ b/C4/UploadedFile.pm @@ -38,26 +38,23 @@ for later processing. =head1 SYNOPSIS -=over 4 - -# create and store data -my $uploaded_file = C4::UploadedFile->new($sessionID); -my $fileID = $uploaded_file->id(); -$uploaded_file->name('c:\temp\file.mrc'); -$uploaded_file->max_size(1024); -while ($have_more_data) { + # create and store data + my $uploaded_file = C4::UploadedFile->new($sessionID); + my $fileID = $uploaded_file->id(); + $uploaded_file->name('c:\temp\file.mrc'); + $uploaded_file->max_size(1024); + while ($have_more_data) { $uploaded_file->stash($data, $bytes_read); -} -$uploaded_file->done(); + } + $uploaded_file->done(); -# check status of current file upload -my $progress = C4::UploadedFile->upload_progress($sessionID); + # check status of current file upload + my $progress = C4::UploadedFile->upload_progress($sessionID); -# get file handle for reading uploaded file -my $uploaded_file = C4::UploadedFile->fetch($fileID); -my $fh = $uploaded_file->fh(); + # get file handle for reading uploaded file + my $uploaded_file = C4::UploadedFile->fetch($fileID); + my $fh = $uploaded_file->fh(); -=back Stores files uploaded by the user from their web browser. The uploaded files are temporary and at present are not guaranteed @@ -76,11 +73,7 @@ TODO: implement secure persistant storage of uploaded files. =head2 new -=over 4 - -my $uploaded_file = C4::UploadedFile->new($sessionID); - -=back + my $uploaded_file = C4::UploadedFile->new($sessionID); Creates a new object to represent the uploaded file. Requires the current session ID. @@ -138,11 +131,7 @@ sub _serialize { =head2 id -=over 4 - -my $fileID = $uploaded_file->id(); - -=back + my $fileID = $uploaded_file->id(); =cut @@ -153,12 +142,8 @@ sub id { =head2 name -=over 4 - -my $name = $uploaded_file->name(); -$uploaded_file->name($name); - -=back + my $name = $uploaded_file->name(); + $uploaded_file->name($name); Accessor method for the name by which the file is to be known. @@ -176,12 +161,8 @@ sub name { =head2 max_size -=over 4 - -my $max_size = $uploaded_file->max_size(); -$uploaded_file->max_size($max_size); - -=back + my $max_size = $uploaded_file->max_size(); + $uploaded_file->max_size($max_size); Accessor method for the maximum size of the uploaded file. @@ -194,11 +175,7 @@ sub max_size { =head2 stash -=over 4 - -$uploaded_file->stash($dataref, $bytes_read); - -=back + $uploaded_file->stash($dataref, $bytes_read); Write C<$dataref> to the temporary file. C<$bytes_read> represents the number of bytes (out of C<$max_size>) transmitted so far. @@ -222,11 +199,7 @@ sub stash { =head2 done -=over 4 - -$uploaded_file->done(); - -=back + $uploaded_file->done(); Indicates that all of the bytes have been uploaded. @@ -241,11 +214,7 @@ sub done { =head2 upload_progress -=over 4 - -my $upload_progress = C4::UploadFile->upload_progress($sessionID); - -=back + my $upload_progress = C4::UploadFile->upload_progress($sessionID); Returns (as an integer from 0 to 100) the percentage progress of the current file upload. @@ -276,11 +245,7 @@ sub upload_progress { =head2 fetch -=over 4 - - my $uploaded_file = C4::UploadedFile->fetch($sessionID, $fileID); - -=back + my $uploaded_file = C4::UploadedFile->fetch($sessionID, $fileID); Retrieves an uploaded file object from the current session. @@ -303,11 +268,7 @@ sub fetch { =head2 fh -=over - -my $fh = $uploaded_file->fh(); - -=back + my $fh = $uploaded_file->fh(); Returns an IO::File handle to read the uploaded file. -- 1.7.0.4 From Katrin.Fischer at bsz-bw.de Mon Jun 7 17:24:56 2010 From: Katrin.Fischer at bsz-bw.de (Fischer, Katrin) Date: Mon, 7 Jun 2010 17:24:56 +0200 Subject: [Koha-patches] Bug 4854: Show same subfields for 245 and 880$6245 Message-ID: <028B1A54D03E7B4482CDCA4EC8F06BFD7E4A24@Bodensee.bsz-bw.de> --- .../prog/en/xslt/MARC21slim2OPACResults.xsl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl index 62a9f46..47045b9 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl @@ -386,7 +386,7 @@ 245 - abh + abhfgknps -- 1.6.3.3 From lars at catalyst.net.nz Tue Jun 8 04:37:38 2010 From: lars at catalyst.net.nz (Lars Wirzenius) Date: Tue, 8 Jun 2010 14:37:38 +1200 Subject: [Koha-patches] [PATCH] Build with pdebuild, not debuild. Message-ID: <1275964658-24190-1-git-send-email-lars@catalyst.net.nz> This checks build dependency declarations more thoroughly. --- debian/build-git-snapshot | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot index e46069c..4b63141 100755 --- a/debian/build-git-snapshot +++ b/debian/build-git-snapshot @@ -46,7 +46,7 @@ reset_debian_changelog() { build_package() { git archive --format=tar --prefix="koha-$1/" HEAD | gzip -9 > "../koha_$1.tar.gz" - debuild -us -uc + pdebuild } if ! everything_is_commited -- 1.7.1 From nahuel.angelinetti at biblibre.com Tue Jun 8 11:16:36 2010 From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI) Date: Tue, 8 Jun 2010 11:16:36 +0200 Subject: [Koha-patches] [PATCH] (bug #4856) fix rebuild zebra to delete NSB/NSE chars Message-ID: <1275988596-17846-1-git-send-email-nahuel.angelinetti@biblibre.com> --- misc/migration_tools/rebuild_zebra.pl | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl index fe85e13..c8ab757 100755 --- a/misc/migration_tools/rebuild_zebra.pl +++ b/misc/migration_tools/rebuild_zebra.pl @@ -385,6 +385,7 @@ sub get_corrected_marc_record { } if ( C4::Context->preference("marcflavour") eq "UNIMARC" ) { fix_unimarc_100($marc); + fix_unimarc_titles( $marc ); } } @@ -494,6 +495,27 @@ sub fix_authority_id { } } +sub fix_unimarc_titles { + my $marc = shift; + + for my $field ($marc->field('200'), $marc->field('225'), $marc->field('400'), $marc->field('410') ){ + my $newfield; + for ($field->subfields()){ + # remove SUDOC specific NSB NSE + $_->[1] =~ s/\x{98}|\x{9C}/ /g; + $_->[1] =~ s/\x{88}|\x{89}/ /g; + $_->[1] =~ s/Histoires//g; + unless ($newfield) { + $newfield = MARC::Field->new($field->tag(), '', '', @$_); + }else{ + $newfield->add_subfields(@$_); + } + + } + $field->replace_with($newfield); + } +} + sub fix_unimarc_100 { # FIXME - again, if this is necessary, it belongs in C4::AuthoritiesMarc. -- 1.7.0.4 From nahuel.angelinetti at biblibre.com Tue Jun 8 11:21:48 2010 From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI) Date: Tue, 8 Jun 2010 11:21:48 +0200 Subject: [Koha-patches] [PATCH] [followup] (bug #4239) forgotten syspref definition Message-ID: <1275988908-18463-1-git-send-email-nahuel.angelinetti@biblibre.com> --- .../en/modules/admin/preferences/circulation.pref | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index f1af73a..1f14090 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -268,6 +268,10 @@ Circulation: yes: Enable no: "Don't enable" - "sending an email to the Koha administrator email address whenever a hold request is placed." + - + - pref: AllowMultipleHoldsPerBib + class: multi + - This allows multiple items per record to be placed on hold by a single patron. To enable, enter a list of space separated itemtype codes in the field (i.e. "MAG JMAG YMAG"). Useful for magazines, encyclopedias and other bibs where the attached items are not identical. Fines Policy: - - Calculate fines based on days overdue -- 1.7.0.4 From nahuel.angelinetti at biblibre.com Tue Jun 8 11:35:31 2010 From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI) Date: Tue, 8 Jun 2010 11:35:31 +0200 Subject: [Koha-patches] [PATCH] [followup] (bug #4856) delete forgotten debug code Message-ID: <1275989731-19102-1-git-send-email-nahuel.angelinetti@biblibre.com> --- misc/migration_tools/rebuild_zebra.pl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl index 3d04822..e620eaa 100755 --- a/misc/migration_tools/rebuild_zebra.pl +++ b/misc/migration_tools/rebuild_zebra.pl @@ -526,7 +526,6 @@ sub fix_unimarc_titles { # remove SUDOC specific NSB NSE $_->[1] =~ s/\x{98}|\x{9C}/ /g; $_->[1] =~ s/\x{88}|\x{89}/ /g; - $_->[1] =~ s/Histoires//g; unless ($newfield) { $newfield = MARC::Field->new($field->tag(), '', '', @$_); }else{ -- 1.7.0.4 From frederic at tamil.fr Tue Jun 8 12:19:50 2010 From: frederic at tamil.fr (Frederic Demians) Date: Tue, 08 Jun 2010 12:19:50 +0200 Subject: [Koha-patches] [PATCH] (bug #4856) fix rebuild zebra to delete NSB/NSE chars In-Reply-To: <1275988596-17846-1-git-send-email-nahuel.angelinetti@biblibre.com> References: <1275988596-17846-1-git-send-email-nahuel.angelinetti@biblibre.com> Message-ID: <4C0E1946.6070608@tamil.fr> What kind of problem do you have with NSB/NSE characters and Zebra? It works for me. With your patch, we loose information. NSB/NSE is not a UNIMARC specific issue: http://www.loc.gov/marc/nonsorting.html NSB/NSE characters are already removed from biblio records before displaying in several places in Koha (too many?). For me, regarding those characters, there is a display issue and an indexing issue. Display issue is solved by XSLT. Indexing issue should be fixed by improving zebra indexation scheme: zebra phrase indexes should be populated striping out string surrounded by NSB/NSE. I'm sure this could be achieved by using Zebra DOM indexing model and appropriate XSLT. Regards, -- Fr?d?ric DEMIANS http://www.tamil.fr/u/fdemians.html From nahuel.angelinetti at biblibre.com Tue Jun 8 12:25:24 2010 From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI) Date: Tue, 08 Jun 2010 12:25:24 +0200 Subject: [Koha-patches] [PATCH] (bug #4856) fix rebuild zebra to delete NSB/NSE chars In-Reply-To: <4C0E1946.6070608@tamil.fr> References: <1275988596-17846-1-git-send-email-nahuel.angelinetti@biblibre.com> <4C0E1946.6070608@tamil.fr> Message-ID: <4C0E1A94.8010600@biblibre.com> We have some examples like: \x{88}Des \x{89}savons pour la vie If you search for "savons", in title index, you will never find your record. Le 08/06/2010 12:19, Frederic Demians a ?crit : > What kind of problem do you have with NSB/NSE characters and Zebra? It > works for me. With your patch, we loose information. > > NSB/NSE is not a UNIMARC specific issue: > > http://www.loc.gov/marc/nonsorting.html > > NSB/NSE characters are already removed from biblio records before > displaying in several places in Koha (too many?). For me, regarding > those characters, there is a display issue and an indexing issue. > Display issue is solved by XSLT. Indexing issue should be fixed by > improving zebra indexation scheme: zebra phrase indexes should be > populated striping out string surrounded by NSB/NSE. I'm sure this > could be achieved by using Zebra DOM indexing model and appropriate XSLT. > > Regards, -- Nahuel ANGELINETTI From frederic at tamil.fr Tue Jun 8 12:40:52 2010 From: frederic at tamil.fr (Frederic Demians) Date: Tue, 08 Jun 2010 12:40:52 +0200 Subject: [Koha-patches] [PATCH] (bug #4856) fix rebuild zebra to delete NSB/NSE chars In-Reply-To: <4C0E1A94.8010600@biblibre.com> References: <1275988596-17846-1-git-send-email-nahuel.angelinetti@biblibre.com> <4C0E1946.6070608@tamil.fr> <4C0E1A94.8010600@biblibre.com> Message-ID: <4C0E1E34.20608@tamil.fr> > We have some examples like: > > \x{88}Des \x{89}savons pour la vie > > If you search for "savons", in title index, you will never find your > record. NSB et NSE must be handled by Zebra as word separator, otherwise they are indexed with beginning or following word. You must specify that in word-phrase-utf.chr. space {\001-\040}!"#$%&'\()*+,-./:;<=>?@\[\\]^_`\{|}~?{\x88-\x89} I will send a patch for that. -- Fr?d?ric From f.demians at tamil.fr Tue Jun 8 12:43:48 2010 From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=) Date: Tue, 8 Jun 2010 12:43:48 +0200 Subject: [Koha-patches] [PATCH] Bug 4856 NSB/NSE correctly used by Zebra Message-ID: <1275993828-11683-1-git-send-email-f.demians@tamil.fr> --- etc/zebradb/etc/word-phrase-utf.chr | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/etc/zebradb/etc/word-phrase-utf.chr b/etc/zebradb/etc/word-phrase-utf.chr index 3268c62..e6b7754 100644 --- a/etc/zebradb/etc/word-phrase-utf.chr +++ b/etc/zebradb/etc/word-phrase-utf.chr @@ -9,7 +9,7 @@ lowercase {0-9}{a-z} uppercase {0-9}{A-Z} # Breaking characters -space {\001-\040}!"#$%&'\()*+,-./:;<=>?@\[\\]^_`\{|}~? +space {\001-\040}!"#$%&'\()*+,-./:;<=>?@\[\\]^_`\{|}~?{\x88-\x89} # Characters to be considered equivalent for searching purposes equivalent a??????????? -- 1.7.1 From chrisc at catalyst.net.nz Tue Jun 8 13:06:15 2010 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Tue, 8 Jun 2010 23:06:15 +1200 Subject: [Koha-patches] [PATCH] Enable session storage in Memcached Message-ID: <1275995175-24417-1-git-send-email-chrisc@catalyst.net.nz> Note: this requires CGI::Session::Driver::memcached to be installed --- C4/Auth.pm | 17 +++++++++++++++-- .../prog/en/modules/admin/preferences/admin.pref | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 4f76ea6..f2e3949 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -34,7 +34,7 @@ use C4::VirtualShelves; use POSIX qw/strftime/; # use utf8; -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout); +use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout $servers $memcached); BEGIN { $VERSION = 3.02; # set version for version checking @@ -54,7 +54,17 @@ BEGIN { require C4::Auth_with_cas; # no import import C4::Auth_with_cas qw(checkpw_cas login_cas logout_cas login_cas_url); } - + $servers = C4::Context->config('memcached_servers'); + $memcached; + if ($servers) { + require Cache::Memcached; + $memcached = Cache::Memcached->new({ + servers => [ $servers ], + debug => 0, + compress_threshold => 10_000, + namespace => C4::Context->config('memcached_namespace') || 'koha', + }); + } } =head1 NAME @@ -1349,6 +1359,9 @@ sub get_session { elsif ($storage_method eq 'Pg') { $session = new CGI::Session("driver:PostgreSQL;serializer:yaml;id:md5", $sessionID, {Handle=>$dbh}); } + elsif ($storage_method eq 'memcached' && $servers){ + $session = new CGI::Session("driver:memcached;serializer:yaml;id:md5", $sessionID, { Memcached => $memcached } ); + } else { # catch all defaults to tmp should work on all systems $session = new CGI::Session("driver:File;serializer:yaml;id:md5", $sessionID, {Directory=>'/tmp'}); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index 069ea9d..c08e3ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -70,6 +70,7 @@ Administration: mysql: in the MySQL database. Pg: in the PostgreSQL database (not supported). tmp: as temporary files. + memcached: in a memcached server. - - Control staff access to pages within Koha based on - pref: GranularPermissions -- 1.6.3.3 From nahuel.angelinetti at biblibre.com Tue Jun 8 13:16:11 2010 From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI) Date: Tue, 08 Jun 2010 13:16:11 +0200 Subject: [Koha-patches] [PATCH] (bug #4856) fix rebuild zebra to delete NSB/NSE chars In-Reply-To: <4C0E1E34.20608@tamil.fr> References: <1275988596-17846-1-git-send-email-nahuel.angelinetti@biblibre.com> <4C0E1946.6070608@tamil.fr> <4C0E1A94.8010600@biblibre.com> <4C0E1E34.20608@tamil.fr> Message-ID: <4C0E267B.5070802@biblibre.com> Le 08/06/2010 12:40, Frederic Demians a ?crit : > >> We have some examples like: >> >> \x{88}Des \x{89}savons pour la vie >> >> If you search for "savons", in title index, you will never find your >> record. > > NSB et NSE must be handled by Zebra as word separator, otherwise they > are indexed with beginning or following word. You must specify that in > word-phrase-utf.chr. > > space {\001-\040}!"#$%&'\()*+,-./:;<=>?@\[\\]^_`\{|}~?{\x88-\x89} > > I will send a patch for that. > This as already been integrated, and does not work. -- Nahuel ANGELINETTI From frederic at tamil.fr Tue Jun 8 13:33:09 2010 From: frederic at tamil.fr (Frederic Demians) Date: Tue, 08 Jun 2010 13:33:09 +0200 Subject: [Koha-patches] [PATCH] (bug #4856) fix rebuild zebra to delete NSB/NSE chars In-Reply-To: <4C0E267B.5070802@biblibre.com> References: <1275988596-17846-1-git-send-email-nahuel.angelinetti@biblibre.com> <4C0E1946.6070608@tamil.fr> <4C0E1A94.8010600@biblibre.com> <4C0E1E34.20608@tamil.fr> <4C0E267B.5070802@biblibre.com> Message-ID: <4C0E2A75.4080706@tamil.fr> > This as already been integrated, and does not work. On Koha community? I don't see it: http://tinyurl.com/3ypszru Did you also take a look on you lang_defs/fr/sort-string-utf.chr? -- Fr?d?ric From alex.arnaud at biblibre.com Tue Jun 8 13:55:54 2010 From: alex.arnaud at biblibre.com (Alex Arnaud) Date: Tue, 8 Jun 2010 13:55:54 +0200 Subject: [Koha-patches] [PATCH] (BUG #4857) aqplan.pl: consideration of Planning categories with authorised values. Message-ID: <1275998154-4550-1-git-send-email-alex.arnaud@biblibre.com> --- admin/aqplan.pl | 16 ++++++++++++++-- .../prog/en/modules/admin/aqplan.tmpl | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/admin/aqplan.pl b/admin/aqplan.pl index 0090208..2e5a7dd 100755 --- a/admin/aqplan.pl +++ b/admin/aqplan.pl @@ -56,7 +56,7 @@ my ( $template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user ); my $budget_period_id = $input->param('budget_period_id'); - +warn "budget_period_id : " . Data::Dumper::Dumper($budget_period_id); # ' ------- get periods stuff ------------------' # IF PERIOD_ID IS DEFINED, GET THE PERIOD - ELSE GET THE ACTIVE PERIOD BY DEFAULT my $period = GetBudgetPeriod($budget_period_id); @@ -156,6 +156,7 @@ while ( my ($category) = $sth->fetchrow_array ) { push( @category_list, 'MONTHS' ); push( @category_list, 'ITEMTYPES' ); push( @category_list, 'BRANCHES' ); +push( @category_list, $$_{'authcat'} ) foreach @$auth_cats_loop; #reorder the list @category_list = sort { $a cmp $b } @category_list; @@ -177,7 +178,6 @@ my @authvals; my %labels; my @names = $input->param(); - # ------------------------------------------------------------ if ( $op eq 'save' ) { @@ -294,6 +294,18 @@ elsif ( $authcat eq 'ITEMTYPES' ) { } } $sth->finish; +} elsif ($authcat) { + my $query = qq{ SELECT * FROM authorised_values WHERE category=? order by lib }; + my $sth = $dbh->prepare($query); + $sth->execute($authcat); + if ( $sth->rows > 0 ) { + for ( my $i = 0 ; $i < $sth->rows ; $i++ ) { + my $results = $sth->fetchrow_hashref; + push @authvals, $results->{authorised_value}; + $labels{ $results->{authorised_value} } = $results->{lib}; + } + } + $sth->finish; } my @authvals_row; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl index 97e4aed..91bd6a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl @@ -103,6 +103,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
    +"/>
    Planning for by -- 1.6.3.3 From chrisc at catalyst.net.nz Tue Jun 8 14:03:13 2010 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Wed, 9 Jun 2010 00:03:13 +1200 Subject: [Koha-patches] [PATCH] (BUG #4857) aqplan.pl: consideration of Planning categories with authorised values. In-Reply-To: <1275998154-4550-1-git-send-email-alex.arnaud@biblibre.com> References: <1275998154-4550-1-git-send-email-alex.arnaud@biblibre.com> Message-ID: <20100608120313.GY380@rorohiko> Hi Alex * Alex Arnaud (alex.arnaud at biblibre.com) wrote: > --- > admin/aqplan.pl | 16 ++++++++++++++-- > .../prog/en/modules/admin/aqplan.tmpl | 1 + > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/admin/aqplan.pl b/admin/aqplan.pl > index 0090208..2e5a7dd 100755 > --- a/admin/aqplan.pl > +++ b/admin/aqplan.pl > @@ -56,7 +56,7 @@ my ( $template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user > ); > > my $budget_period_id = $input->param('budget_period_id'); > - > +warn "budget_period_id : " . Data::Dumper::Dumper($budget_period_id); Looks like an unconditional warn has snuck in, might need to fix this and resubmit. Chris -- Chris Cormack Catalyst IT Ltd. +64 4 803 2238 PO Box 11-053, Manners St, Wellington 6142, New Zealand From oleonard at myacpl.org Tue Jun 8 18:03:00 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Tue, 8 Jun 2010 12:03:00 -0400 Subject: [Koha-patches] [PATCH] Page structure correction, helps Bug 3850 (Page Need Design Work) Message-ID: <1276012980-1465-1-git-send-email-oleonard@myacpl.org> --- .../prog/en/modules/admin/aqplan.tmpl | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl index 97e4aed..93a3d6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl @@ -1,20 +1,7 @@ - -Budget & fund planning - +Koha › Administration › Budgets › Budget planning -/reset/reset.css" rel="stylesheet" type="text/css" /> -/fonts/fonts.css" rel="stylesheet" type="text/css" /> -/menu/assets/menu.css" rel="stylesheet" type="text/css" /> -/container/assets/skins/sam/container.css" rel="stylesheet" type="text/css" /> - - - - - - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl index b4158eb..dd22f10 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl @@ -129,7 +129,7 @@ Serials updated :   - &serstatus=1,3,7">Serial receive + &serstatus=1,3,7">Serial receive diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl index dd8f069..5a665de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl @@ -985,8 +985,15 @@ $(document).ready(function() { " size="8" /> (" disabled="disabled" readonly="readonly" />) Required -
    Search for Biblio | ); return false;">Edit biblio - Create Biblio
    +
    Search for Biblio + + + | ); return false;">Edit biblio + + | Create Biblio + + +
  • diff --git a/kohaversion.pl b/kohaversion.pl index 3fa5030..e7972f8 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -10,7 +10,7 @@ use strict; sub kohaversion { - our $VERSION = '3.01.00.136'; + our $VERSION = '3.01.00.137'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install diff --git a/serials/acqui-search-result.pl b/serials/acqui-search-result.pl index f5b216f..e671e96 100755 --- a/serials/acqui-search-result.pl +++ b/serials/acqui-search-result.pl @@ -55,7 +55,7 @@ my ($template, $loggedinuser, $cookie) query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => '*'}, debug => 1, }); diff --git a/serials/acqui-search.pl b/serials/acqui-search.pl index 113e763..1e5d917 100755 --- a/serials/acqui-search.pl +++ b/serials/acqui-search.pl @@ -32,7 +32,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => { serials => 1 }, + flagsrequired => { serials => '*' }, debug => 1, } ); diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl index 16529b0..02a4fbc 100755 --- a/serials/checkexpiration.pl +++ b/serials/checkexpiration.pl @@ -60,7 +60,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => { serials => 1 }, + flagsrequired => { serials => 'check_expiration' }, debug => 1, } ); diff --git a/serials/claims.pl b/serials/claims.pl index af0143d..b723136 100755 --- a/serials/claims.pl +++ b/serials/claims.pl @@ -49,7 +49,7 @@ my ($template, $loggedinuser, $cookie) query => $input, type => 'intranet', authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => 'claim_serials'}, debug => 1, }); diff --git a/serials/member-search.pl b/serials/member-search.pl index 2d9a031..f18c2f3 100755 --- a/serials/member-search.pl +++ b/serials/member-search.pl @@ -43,6 +43,8 @@ foreach (keys %$patron){ my @categories=C4::Category->all; my $branches=(defined $$patron{branchcode}?GetBranchesLoop($$patron{branchcode}):GetBranchesLoop()); +my $subscriptionid = $cgi->param('subscriptionid'); +my $searchstring = $cgi->param('member'); my %categories_dislay; my ($template, $loggedinuser, $cookie); @@ -51,7 +53,7 @@ my ($template, $loggedinuser, $cookie); query => $cgi, type => "intranet", authnotrequired => 0, - flagsrequired => {borrowers => 1}, + flagsrequired => { serials => 'routing' }, }); foreach my $category (@categories){ diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl index 716cced..477ae81 100755 --- a/serials/routing-preview.pl +++ b/serials/routing-preview.pl @@ -100,7 +100,7 @@ if($ok){ query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => 'routing'}, debug => 1, }); $template->param("libraryname"=>$branchname); @@ -110,7 +110,7 @@ if($ok){ query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => 'routing'}, debug => 1, }); } diff --git a/serials/routing.pl b/serials/routing.pl index 524c71d..18519e3 100755 --- a/serials/routing.pl +++ b/serials/routing.pl @@ -90,7 +90,7 @@ my ($template, $loggedinuser, $cookie) query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => 'routing'}, debug => 1, }); diff --git a/serials/serial-issues.pl b/serials/serial-issues.pl index 4eb53c3..4a971b5 100755 --- a/serials/serial-issues.pl +++ b/serials/serial-issues.pl @@ -71,7 +71,7 @@ if ($selectview eq "full"){ query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => '*'}, debug => 1, }); diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index e6d737b..23e2abc 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -40,7 +40,7 @@ my ($template, $loggedinuser, $cookie); query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => 'receive_serials'}, debug => 1, }); my $biblionumber = $query->param('biblionumber'); diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl index b407ca9..dee624c 100755 --- a/serials/serials-edit.pl +++ b/serials/serials-edit.pl @@ -108,14 +108,15 @@ unless ( scalar(@serialids) ) { print $query->redirect($string); } + my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "serials/serials-edit.tmpl", - query => $query, - type => "intranet", - authnotrequired => 0, - flagsrequired => { serials => 1 }, - debug => 1, + template_name => "serials/serials-edit.tmpl", + query => $query, + type => "intranet", + authnotrequired => 0, + flagsrequired => {serials => 'receive_serials'}, + debug => 1, } ); diff --git a/serials/serials-home.pl b/serials/serials-home.pl index a4a7bd3..8a82df7 100755 --- a/serials/serials-home.pl +++ b/serials/serials-home.pl @@ -67,7 +67,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => { serials => 1 }, + flagsrequired => { serials => '*' }, debug => 1, } ); diff --git a/serials/statecollection.pl b/serials/statecollection.pl index bcbfbda..6d01c35 100755 --- a/serials/statecollection.pl +++ b/serials/statecollection.pl @@ -47,7 +47,7 @@ my ($template, $loggedinuser, $cookie) query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => '*'}, debug => 1, }); diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index f87dae5..d8c0ea3 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -39,12 +39,18 @@ my $op = $query->param('op') || ''; my $dbh = C4::Context->dbh; my $sub_length; +my @budgets; + +# Permission needed if it is a modification : edit_subscription +# Permission needed otherwise (nothing or dup) : create_subscription +my $permission = ($op eq "mod") ? "edit_subscription" : "create_subscription"; + my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "serials/subscription-add.tmpl", query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => $permission}, debug => 1, }); diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl index 90a4098..d1b0f63 100755 --- a/serials/subscription-bib-search.pl +++ b/serials/subscription-bib-search.pl @@ -122,8 +122,7 @@ if ($op eq "do_search" && $query) { query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, - flagsrequired => {catalogue => 1}, + flagsrequired => {catalogue => 1, serials => '*'}, debug => 1, }); @@ -178,7 +177,17 @@ if ($op eq "do_search" && $query) { numbers=>\@numbers, ); } # end of if ($op eq "do_search" & $query) - else { +else { + ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "serials/subscription-bib-search.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {catalogue => 1, serials => '*'}, + debug => 1, + }); + # load the itemtypes + my $itemtypes = GetItemTypes; my @itemtypesloop; if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { # load the itemtypes @@ -219,7 +228,7 @@ if ($op eq "do_search" && $query) { query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => {catalogue => 1, serials=>1}, + flagsrequired => {catalogue => 1, serials => '*'}, debug => 1, }); diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl index d8c44ee..b6538fe 100755 --- a/serials/subscription-detail.pl +++ b/serials/subscription-detail.pl @@ -35,12 +35,32 @@ my ($template, $loggedinuser, $cookie, $hemisphere); my $subscriptionid = $query->param('subscriptionid'); my $subs = GetSubscription($subscriptionid); +$subs->{enddate} = GetExpirationDate($subscriptionid); + +if ($op && $op eq 'del') { + if ($subs->{'cannotedit'}){ + carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed"; + print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); + } + DelSubscription($subscriptionid); + print "Content-Type: text/html\n\n"; + exit; +} +my ($routing, @routinglist) = getroutinglist($subscriptionid); +my ($totalissues, at serialslist) = GetSerials($subscriptionid); +$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue) +# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...) + +# Permission needed if it is a deletion (del) : delete_subscription +# Permission needed otherwise : * +my $permission = ($op eq "del") ? "delete_subscription" : "*"; + ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "serials/subscription-detail.tmpl", query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => $permission}, debug => 1, }); diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl index 02dce30..48861bc 100755 --- a/serials/subscription-renew.pl +++ b/serials/subscription-renew.pl @@ -69,7 +69,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $query, type => "intranet", authnotrequired => 0, - flagsrequired => { serials => 1 }, + flagsrequired => { serials => 'renew_subscription' }, debug => 1, } ); diff --git a/serials/viewalerts.pl b/serials/viewalerts.pl index ad804f0..d2d1368 100755 --- a/serials/viewalerts.pl +++ b/serials/viewalerts.pl @@ -38,7 +38,7 @@ my ($template, $loggedinuser, $cookie) query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => {serials => 1}, + flagsrequired => {serials => '*'}, debug => 1, }); -- 1.6.3.3 From chrisc at catalyst.net.nz Wed Jun 16 06:42:14 2010 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Wed, 16 Jun 2010 16:42:14 +1200 Subject: [Koha-patches] [PATCH] Follow up patch, removing missed conflict marker Message-ID: <1276663334-5183-1-git-send-email-chrisc@catalyst.net.nz> --- .../intranet-tmpl/prog/en/includes/header.inc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 1dd1884..95ce8dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -1,6 +1,5 @@
    Your cart is empty.
    -<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
    • -
  • To give staff members more granular permissions, you can turn on the GranularPermissions system preference -
      -
    • Get there: More > Administration > General preferences > Admin > GranularPermissions
      • -
    • If this setting is on the permissions menu will offer more granual permissions
      • -
    • This allows staff members access to specific tools -
        -
      • - -TIP: If this preference is turned OFF after being ON, the system reverts to the original behavior, although the specific permissions are retained.  This means if a staff member has been given granular permissions they will retain those even if this is turned OFF
        • -
      • -

    • What will each permission level do?

    @@ -37,10 +26,6 @@ TIP: If this preference is turned OFF after being ON, the system reverts to the
  • circulate
    • Ability for logged in user to check books out and back in
      • -
    • With GranularPermissions on this section will be expanded to allow access to specific ciculation functions. -
        -
      • Get there: More > Administration > Global System Preferences > Admin > GranularPermissions
        • -
  • catalog
      @@ -86,10 +71,6 @@ TIP: If this preference is turned OFF after being ON, the system reverts to the
    • tools
      • Use tools (export, import, barcodes)
        • -
      • With GranularPermissions on this section will be expanded to allow access only to specific tools -
          -
        • Get there: More > Administration > Global System Preferences > Admin > GranularPermissions
          • -
    • editauthorities
        @@ -107,4 +88,4 @@ TIP: If this preference is turned OFF after being ON, the system reverts to the
        • Provides the ability to modify login / permissions for staff users
        -
      \ No newline at end of file +
    diff --git a/kohaversion.pl b/kohaversion.pl index e7972f8..8da986b 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -10,7 +10,7 @@ use strict; sub kohaversion { - our $VERSION = '3.01.00.137'; + our $VERSION = '3.01.00.138'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install diff --git a/members/member-flags.pl b/members/member-flags.pl index 749cecc..321e526 100755 --- a/members/member-flags.pl +++ b/members/member-flags.pl @@ -66,19 +66,17 @@ if ($input->param('newflags')) { $sth = $dbh->prepare("UPDATE borrowers SET flags=? WHERE borrowernumber=?"); $sth->execute($module_flags, $member); - if (C4::Context->preference('GranularPermissions')) { - # deal with subpermissions - $sth = $dbh->prepare("DELETE FROM user_permissions WHERE borrowernumber = ?"); - $sth->execute($member); - $sth = $dbh->prepare("INSERT INTO user_permissions (borrowernumber, module_bit, code) - SELECT ?, bit, ? - FROM userflags - WHERE flag = ?"); - foreach my $module (keys %sub_perms) { - next if exists $all_module_perms{$module}; - foreach my $sub_perm (@{ $sub_perms{$module} }) { - $sth->execute($member, $sub_perm, $module); - } + # deal with subpermissions + $sth = $dbh->prepare("DELETE FROM user_permissions WHERE borrowernumber = ?"); + $sth->execute($member); + $sth = $dbh->prepare("INSERT INTO user_permissions (borrowernumber, module_bit, code) + SELECT ?, bit, ? + FROM userflags + WHERE flag = ?"); + foreach my $module (keys %sub_perms) { + next if exists $all_module_perms{$module}; + foreach my $sub_perm (@{ $sub_perms{$module} }) { + $sth->execute($member, $sub_perm, $module); } } @@ -104,53 +102,51 @@ if ($input->param('newflags')) { checked => $checked, flagdesc => $flagdesc ); - if (C4::Context->preference('GranularPermissions')) { - my @sub_perm_loop = (); - my $expand_parent = 0; - if ($checked) { - if (exists $all_perms->{$flag}) { - $expand_parent = 1; - foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) { - push @sub_perm_loop, { - id => "${flag}_$sub_perm", - perm => "$flag:$sub_perm", - code => $sub_perm, - description => $all_perms->{$flag}->{$sub_perm}, - checked => 1 - }; - } + my @sub_perm_loop = (); + my $expand_parent = 0; + if ($checked) { + if (exists $all_perms->{$flag}) { + $expand_parent = 1; + foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) { + push @sub_perm_loop, { + id => "${flag}_$sub_perm", + perm => "$flag:$sub_perm", + code => $sub_perm, + description => $all_perms->{$flag}->{$sub_perm}, + checked => 1 + }; } - } else { - if (exists $user_perms->{$flag}) { - $expand_parent = 1; - # put selected ones first - foreach my $sub_perm (sort keys %{ $user_perms->{$flag} }) { - push @sub_perm_loop, { - id => "${flag}_$sub_perm", - perm => "$flag:$sub_perm", - code => $sub_perm, - description => $all_perms->{$flag}->{$sub_perm}, - checked => 1 - }; - } + } + } else { + if (exists $user_perms->{$flag}) { + $expand_parent = 1; + # put selected ones first + foreach my $sub_perm (sort keys %{ $user_perms->{$flag} }) { + push @sub_perm_loop, { + id => "${flag}_$sub_perm", + perm => "$flag:$sub_perm", + code => $sub_perm, + description => $all_perms->{$flag}->{$sub_perm}, + checked => 1 + }; } - # then ones not selected - if (exists $all_perms->{$flag}) { - foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) { - push @sub_perm_loop, { - id => "${flag}_$sub_perm", - perm => "$flag:$sub_perm", - code => $sub_perm, - description => $all_perms->{$flag}->{$sub_perm}, - checked => 0 - } unless exists $user_perms->{$flag} and exists $user_perms->{$flag}->{$sub_perm}; - } + } + # then ones not selected + if (exists $all_perms->{$flag}) { + foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) { + push @sub_perm_loop, { + id => "${flag}_$sub_perm", + perm => "$flag:$sub_perm", + code => $sub_perm, + description => $all_perms->{$flag}->{$sub_perm}, + checked => 0 + } unless exists $user_perms->{$flag} and exists $user_perms->{$flag}->{$sub_perm}; } } - $row{expand} = $expand_parent; - if ($#sub_perm_loop > -1) { + } + $row{expand} = $expand_parent; + if ($#sub_perm_loop > -1) { $row{sub_perm_loop} = \@sub_perm_loop; - } } push @loop, \%row; } diff --git a/svc/config/systempreferences b/svc/config/systempreferences index 6fe714a..8622f6a 100755 --- a/svc/config/systempreferences +++ b/svc/config/systempreferences @@ -83,9 +83,9 @@ pref_$pref1=$value1&pref_$pref2=$value2 Used to set several system preferences at once. Each preference you want to set should be sent prefixed with pref. If you wanted to turn off the -GranularPermissions syspref, for instance, you would POST the following: +virtualshelves syspref, for instance, you would POST the following: -pref_GranularPermissions=0 +pref_virtualshelves=0 =cut -- 1.7.0 From Katrin.Fischer.83 at web.de Thu Jun 17 23:51:40 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Thu, 17 Jun 2010 23:51:40 +0200 Subject: [Koha-patches] [PATCH] Bug 3682: change message_attributes.message_name from varchar(20) to varchar(40) Message-ID: <1276811500-10788-1-git-send-email-Katrin.Fischer.83@web.de> --- installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 9 ++++++++- kohaversion.pl | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 9d97edf..d8ed27d 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2154,7 +2154,7 @@ CREATE TABLE `message_transport_types` ( DROP TABLE IF EXISTS `message_attributes`; CREATE TABLE `message_attributes` ( `message_attribute_id` int(11) NOT NULL auto_increment, - `message_name` varchar(20) NOT NULL default '', + `message_name` varchar(40) NOT NULL default '', `takes_days` tinyint(1) NOT NULL default '0', PRIMARY KEY (`message_attribute_id`), UNIQUE KEY `message_name` (`message_name`) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 7ea266e..adaab3e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3641,7 +3641,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } - $DBversion = "3.01.00.138"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { $dbh->do("DELETE FROM systempreferences WHERE variable = 'GranularPermissions'"); @@ -3649,6 +3648,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = '3.01.00.XXX'; +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ + $dbh->do("ALTER TABLE message_attributes CHANGE message_name message_name varchar(40);"); + print "Upgrade to $DBversion done (bug 3682: change message_name from varchar(20) to varchar(40))\n"; + SetVersion ($DBversion); +} + + =item DropAllForeignKeys($table) Drop all foreign keys of the table $table diff --git a/kohaversion.pl b/kohaversion.pl index 8da986b..9925cda 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -10,7 +10,9 @@ use strict; sub kohaversion { - our $VERSION = '3.01.00.138'; + + our $VERSION = '3.01.00.XXX'; + # version needs to be set this way # so that it can be picked up by Makefile.PL # during install -- 1.6.3.3 From Katrin.Fischer.83 at web.de Sat Jun 19 15:20:15 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Sat, 19 Jun 2010 15:20:15 +0200 Subject: [Koha-patches] [PATCH 2/2] Bug 4895: Add missing granular permissions Message-ID: <1276953615-11031-1-git-send-email-Katrin.Fischer.83@web.de> Add missing granular permissions for serials to userpermissons.sql de-DE, pl-PL --- .../data/mysql/de-DE/mandatory/userpermissions.sql | 8 ++++++++ .../data/mysql/pl-PL/mandatory/userpermissions.sql | 9 +++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/installer/data/mysql/de-DE/mandatory/userpermissions.sql b/installer/data/mysql/de-DE/mandatory/userpermissions.sql index 74f4e84..7e4bf7d 100644 --- a/installer/data/mysql/de-DE/mandatory/userpermissions.sql +++ b/installer/data/mysql/de-DE/mandatory/userpermissions.sql @@ -36,6 +36,14 @@ (13, 'manage_csv_profiles', 'CSV-Profile f?r Export verwalten'), (13, 'moderate_tags', 'Von Benutzern vergebene Tags moderieren'), (13, 'rotating_collections', 'Wandernde Sammlungen verwalten'), + (15, 'check_expiration', 'Ablauf eines Abonnements pr?fen'), + (15, 'claim_serials', 'Fehlende Hefte reklamieren'), + (15, 'create_subscription', 'Neues Abonnement anlegen'), + (15, 'delete_subscription', 'Bestehende Abonnements l?schen'), + (15, 'edit_subscription', 'Bestehende Abonnements bearbeiten'), + (15, 'receive_serials', 'Zugang von Heften'), + (15, 'renew_subscription', 'Abonnements verl?ngern'), + (15, 'routing', 'Umlauflisten verwalten'), (16, 'execute_reports', 'SQL-Reports ausf?hren'), (16, 'create_reports', 'SQL-Reports erstellen') ; diff --git a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql index 1318fa7..acb4ddf 100644 --- a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql +++ b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql @@ -37,5 +37,14 @@ INSERT INTO permissions (module_bit, code, description) VALUES (13, 'moderate_tags', 'Moderate patron tags'), (16, 'execute_reports', 'Execute SQL reports'), (13, 'rotating_collections', 'Manage rotating collections'), + (15, 'check_expiration', 'Check the expiration of a serial'), + (15, 'claim_serials', 'Claim missing serials'), + (15, 'create_subscription', 'Create a new subscription'), + (15, 'delete_subscription', 'Delete an existing subscription'), + (15, 'edit_subscription', 'Edit an existing subscription'), + (15, 'receive_serials', 'Serials receiving'), + (15, 'renew_subscription', 'Renew a subscription'), + (15, 'routing', 'Routing'), + (16, 'execute_reports', 'Execute SQL reports'), (16, 'create_reports', 'Create SQL Reports') ; -- 1.6.3.3 From gcollum at gmail.com Mon Jun 21 03:50:50 2010 From: gcollum at gmail.com (Garry Collum) Date: Sun, 20 Jun 2010 21:50:50 -0400 Subject: [Koha-patches] [PATCH] Bug 4897: Invalid XHTML in opac-userupdate.tmpl. Message-ID: <1277085050-2890-1-git-send-email-gcollum@gmail.com> Removes several duplicate name tags. --- .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl index 62ec6be..bb0a473 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl @@ -31,8 +31,8 @@ " id="address" /> " id="address2" />
  • " name="city" />
    • -
  • " name="zipcode" />
    • -
  • " name="country" />
    • +
  • " name="zipcode" />
    • +
  • " name="country" />
  • " name="phone" />
  • " name="mobile" />
  • " name="phonepro" />
    • @@ -55,10 +55,10 @@
  • " name="B_city" />
    • -
  • " name="B_zipcode" />
    • -
  • " name="B_country" />
    • -
  • " name="B_phone" />
    • -
  • " name="B_email" />
    • +
  • " name="B_zipcode" />
    • +
  • " name="B_country" />
    • +
  • " name="B_phone" />
    • +
  • " name="B_email" />
    • -- 1.5.6.5 From tajoli at cilea.it Mon Jun 21 16:57:49 2010 From: tajoli at cilea.it (Zeno Tajoli) Date: Mon, 21 Jun 2010 16:57:49 +0200 Subject: [Koha-patches] [PATCH] [3.0.x] [bug 4898] Fix COUNTRY authorised values to uppercase In-Reply-To: tajoli@cilea.it References: tajoli@cilea.it Message-ID: <1277132269-27880-1-git-send-email-tajoli@cilea.it> --- installer/data/mysql/it-IT/necessari/auth_val.sql | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/installer/data/mysql/it-IT/necessari/auth_val.sql b/installer/data/mysql/it-IT/necessari/auth_val.sql index d047bb0..f6a0d6d 100644 --- a/installer/data/mysql/it-IT/necessari/auth_val.sql +++ b/installer/data/mysql/it-IT/necessari/auth_val.sql @@ -83,14 +83,14 @@ INSERT INTO `authorised_values` (`category`, `authorised_value`, `lib`) VALUES -- Codici dei Paesi (COUNTRY) INSERT INTO `authorised_values` (`category`, `authorised_value`, `lib`) VALUES -('COUNTRY', 'it', 'Italia'), -('COUNTRY', 'us', 'Stati Uniti'), -('COUNTRY', 'gb', 'Regno Unito - UK '), -('COUNTRY', 'de', 'Germania'), -('COUNTRY', 'fr', 'Francia'), -('COUNTRY', 'va', 'Vaticano'), -('COUNTRY', 'cn', 'Cina'), -('COUNTRY', 'in', 'India'); +('COUNTRY', 'IT', 'Italia'), +('COUNTRY', 'US', 'Stati Uniti'), +('COUNTRY', 'GB', 'Regno Unito - UK '), +('COUNTRY', 'DE', 'Germania'), +('COUNTRY', 'FR', 'Francia'), +('COUNTRY', 'VA', 'Vaticano'), +('COUNTRY', 'CN', 'Cina'), +('COUNTRY', 'IN', 'India'); -- Codici delle lingue (LANG) INSERT INTO `authorised_values` (`category`, `authorised_value`, `lib`) VALUES -- 1.5.3.7 From tajoli at cilea.it Mon Jun 21 16:58:12 2010 From: tajoli at cilea.it (Zeno Tajoli) Date: Mon, 21 Jun 2010 16:58:12 +0200 Subject: [Koha-patches] [PATCH] [3.0.x] bug 2434 In-Reply-To: tajoli@cilea.it References: tajoli@cilea.it Message-ID: <1277132292-27908-1-git-send-email-tajoli@cilea.it> --- installer/data/mysql/it-IT/necessari/notices.sql | 3 +-- .../sample_notices_message_attributes.sql | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql index 6ad971c..34bacde 100644 --- a/installer/data/mysql/it-IT/necessari/notices.sql +++ b/installer/data/mysql/it-IT/necessari/notices.sql @@ -11,9 +11,8 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)' ), ('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), -('circulation','EVENT','Upcoming Library Event','Upcoming Library Event','Dear <> <>,\r\n\r\nThis is a reminder of an upcoming library event in which you have expressed interest.'), ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>\r\n<> <>'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n<>\r\n----\r\nThank you for visiting <>.'); -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS=1; diff --git a/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql b/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql index 87a462e..aec38b5 100644 --- a/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql +++ b/installer/data/mysql/it-IT/necessari/sample_notices_message_attributes.sql @@ -5,7 +5,6 @@ insert into `message_attributes` values (1, 'Copia scaduta', 0), (2, 'Avviso preventivo', 1), -(3, 'Eventi in arrivo', 1), (4, 'Prenotazione compilata', 0), (5, 'Check In', 0), (6, 'Check Out', 0); -- 1.5.3.7 From tajoli at cilea.it Mon Jun 21 16:58:38 2010 From: tajoli at cilea.it (Zeno Tajoli) Date: Mon, 21 Jun 2010 16:58:38 +0200 Subject: [Koha-patches] [PATCH] [3.0.x] [bug 4899] Update userpermissions.sql of it-IT for manage of CSV export In-Reply-To: tajoli@cilea.it References: tajoli@cilea.it Message-ID: <1277132318-27928-1-git-send-email-tajoli@cilea.it> --- .../data/mysql/it-IT/necessari/userpermissions.sql | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/installer/data/mysql/it-IT/necessari/userpermissions.sql b/installer/data/mysql/it-IT/necessari/userpermissions.sql index 12ac136..d9798f0 100644 --- a/installer/data/mysql/it-IT/necessari/userpermissions.sql +++ b/installer/data/mysql/it-IT/necessari/userpermissions.sql @@ -18,6 +18,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (13, 'delete_anonymize_patrons', 'Cancella i vecchi prestiti e rendi anonimo lo storico della circolazione (canella in lettura lo storico utenti prestito)'), (13, 'batch_upload_patron_images', 'Aggiorna le foto utente in modalit? batch o al momento'), (13, 'schedule_tasks', 'Schedula i task da far andare'), + (13, 'manage_csv_profiles', 'Gestisci i profili CSV di export'), (15, 'check_expiration', 'Controlla la scadenza di una risora in continuazione'), (15, 'claim_serials', 'Richiedi i fascicoli non arrivati'), (15, 'create_subscription', 'Crea un nuovo abbonamento'), @@ -27,4 +28,4 @@ INSERT INTO permissions (module_bit, code, description) VALUES (15, 'renew_subscription', 'Rinnova un abbonamento'), (15, 'routing', 'Routing') ; -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS=1; -- 1.5.3.7 From tajoli at cilea.it Mon Jun 21 16:59:03 2010 From: tajoli at cilea.it (Zeno Tajoli) Date: Mon, 21 Jun 2010 16:59:03 +0200 Subject: [Koha-patches] [PATCH] [3.0.x] [bug 4899] Update userpermissions.sql of en for manage of CSV export In-Reply-To: tajoli@cilea.it References: tajoli@cilea.it Message-ID: <1277132343-27950-1-git-send-email-tajoli@cilea.it> --- .../data/mysql/en/mandatory/userpermissions.sql | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql index 5fea3a8..785b5e3 100644 --- a/installer/data/mysql/en/mandatory/userpermissions.sql +++ b/installer/data/mysql/en/mandatory/userpermissions.sql @@ -16,6 +16,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (13, 'delete_anonymize_patrons', 'Delete old borrowers and anonymize circulation history (deletes borrower reading history)'), (13, 'batch_upload_patron_images', 'Upload patron images in batch or one at a time'), (13, 'schedule_tasks', 'Schedule tasks to run'), + (13, 'manage_csv_profiles', 'Manage CSV export profiles'), (15, 'check_expiration', 'Check the expiration of a serial'), (15, 'claim_serials', 'Claim missing serials'), (15, 'create_subscription', 'Create a new subscription'), -- 1.5.3.7 From nengard at bywatersolutions.com Mon Jun 21 16:32:21 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Mon, 21 Jun 2010 10:32:21 -0400 Subject: [Koha-patches] [PATCH] bug 4900: add in missing value for usedaysmode pref Message-ID: <1277130741-2525-1-git-send-email-nengard@bywatersolutions.com> The usedaysmode preference was missing the option to calculate due date by finding the next open date on the calendar instead of ignoring all days the library is closed. --- .../en/modules/admin/preferences/circulation.pref | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index c69a34d..ab92915 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -140,11 +140,12 @@ Circulation: class: date - . - + - Calculate the due date using - pref: useDaysMode choices: - Days: Include - Calendar: "Don't include" - - days when the library in closed when calculating due dates. + Days: circulation rules only. + Calendar: the calendar to skip all days the library is closed. + Datedue: the calendar to push the due date to the next open day - - When renewing checkouts, base the new due date on - pref: RenewalPeriodBase -- 1.5.6.5 From Katrin.Fischer.83 at web.de Mon Jun 21 20:49:52 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 21 Jun 2010 20:49:52 +0200 Subject: [Koha-patches] [PATCH] Bug 4474 swap options for sys pref singleBranchMode Message-ID: <1277146192-18394-1-git-send-email-Katrin.Fischer.83@web.de> --- .../prog/en/modules/admin/preferences/opac.pref | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 77da550..c8018f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -244,8 +244,8 @@ OPAC: - pref: singleBranchMode default: 0 choices: - yes: Allow - no: "Don't allow" + yes: "Dont't allow" + no: Allow - patrons to select their branch on the OPAC. - - pref: SearchMyLibraryFirst -- 1.6.3.3 From Katrin.Fischer.83 at web.de Mon Jun 21 23:09:41 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 21 Jun 2010 23:09:41 +0200 Subject: [Koha-patches] [PATCH] Bug 4902: Add missing b_phone and b_email to borrower details Message-ID: <1277154581-19532-1-git-send-email-Katrin.Fischer.83@web.de> --- .../prog/en/modules/members/moremember.tmpl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index 67e9397..dfad6ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -337,7 +337,9 @@ if (nodename =="barcodes[]"){
  • Address 2:
  • City, State:
  • Zip/Postal Code:
    • -
  • Country:
    • +
  • Country:
    • +
  • Phone:
    • +
  • Email:
    1. Surname:
      2. -- 1.6.3.3 From Katrin.Fischer.83 at web.de Tue Jun 22 07:10:22 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Tue, 22 Jun 2010 07:10:22 +0200 Subject: [Koha-patches] [PATCH] Bug 4474 swap options for sys pref singleBranchMode In-Reply-To: References: <1277146192-18394-1-git-send-email-Katrin.Fischer.83@web.de> Message-ID: <4C2045BE.6080606@web.de> Thanks Jesse, I will resend the patch with correct spelling. Am 21.06.2010 23:44, schrieb Jesse: > Thanks for the patch, but there's a slight spelling error in the yes > option; Dont't rather than Don't. > > 2010/6/21 Katrin Fischer > > > --- > .../prog/en/modules/admin/preferences/opac.pref | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git > a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref > index 77da550..c8018f2 100644 > --- > a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref > +++ > b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref > @@ -244,8 +244,8 @@ OPAC: > - pref: singleBranchMode > default: 0 > choices: > - yes: Allow > - no: "Don't allow" > + yes: "Dont't allow" > + no: Allow > - patrons to select their branch on the OPAC. > - > - pref: SearchMyLibraryFirst > -- > 1.6.3.3 > > _______________________________________________ > Koha-patches mailing list > Koha-patches at lists.koha-community.org > > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches > > > > > -- > Jesse Weaver From Katrin.Fischer.83 at web.de Tue Jun 22 07:22:54 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Tue, 22 Jun 2010 07:22:54 +0200 Subject: [Koha-patches] [PATCH] Bug 4474 swap options for sys pref singleBranchMode Message-ID: <1277184174-20128-1-git-send-email-Katrin.Fischer.83@web.de> Resend with corrected spelling. --- .../prog/en/modules/admin/preferences/opac.pref | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 77da550..e919dd1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -244,8 +244,8 @@ OPAC: - pref: singleBranchMode default: 0 choices: - yes: Allow - no: "Don't allow" + yes: "Don't allow" + no: Allow - patrons to select their branch on the OPAC. - - pref: SearchMyLibraryFirst -- 1.6.3.3 From nengard at bywatersolutions.com Tue Jun 22 23:49:17 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Tue, 22 Jun 2010 17:49:17 -0400 Subject: [Koha-patches] [PATCH] bug 4312 change default for tagsmoderation to 0 from NULL Message-ID: <1277243357-2822-1-git-send-email-nengard@bywatersolutions.com> --- installer/data/mysql/en/mandatory/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 49a02ea..8bfed37 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -204,7 +204,7 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('TagsExternalDictionary',NULL,'','Path on server to local ispell executable, used to set $Lingua::Ispell::path This dictionary is used as a \"whitelist\" of pre-allowed tags.',''), ('TagsInputOnDetail','1','','Allow users to input tags from the detail page.', 'YesNo'), ('TagsInputOnList', '0','','Allow users to input tags from the search results list.', 'YesNo'), - ('TagsModeration', NULL,'','Require tags from patrons to be approved before becoming visible.','YesNo'), + ('TagsModeration', '0','','Require tags from patrons to be approved before becoming visible.','YesNo'), ('TagsShowOnDetail','10','','Number of tags to display on detail page. 0 is off.', 'Integer'), ('TagsShowOnList', '6','','Number of tags to display on search results list. 0 is off.','Integer'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index e9943a6..05ab550 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3655,6 +3655,13 @@ if (C4::Context->preference('Version') < TransformToNum($DBversion)){ SetVersion ($DBversion); } +$DBversion = 'XXX'; +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ + $dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'TagsModeration' AND value = 'NULL'"); + print "Upgrade to $DBversion done (bug 4312 TagsModeration changed from NULL to 0)\n"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) -- 1.5.6.5 From henridamien.laurent at biblibre.com Wed Jun 23 18:15:49 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Wed, 23 Jun 2010 18:15:49 +0200 Subject: [Koha-patches] [PATCH] Bug3916 : Batch Modify tool overwrites branches fields Message-ID: <1277309749-18750-1-git-send-email-henridamien.laurent@biblibre.com> This was owed to the Item modification construction and the change in GetBranchesLoop behaviour which selects the user branch by default. Adding a void branch selected Changing default value to "" --- tools/batchMod.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/batchMod.pl b/tools/batchMod.pl index 310624f..abeaf15 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -226,8 +226,8 @@ my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM auth my $branches = GetBranchesLoop(); # build once ahead of time, instead of multiple times later. # Adding a default choice, in case the user does not want to modify the branch -my @nochange_branch = { branchname => '', value => '', selected => 1 }; -unshift (@$branches, @nochange_branch); +my $nochange_branch = { branchname => '', value => '', selected => 1 }; +unshift (@$branches, $nochange_branch); my $pref_itemcallnumber = C4::Context->preference('itemcallnumber'); @@ -280,8 +280,8 @@ foreach my $tag (sort keys %{$tagslib}) { foreach my $thisbranch (@$branches) { push @authorised_values, $thisbranch->{value}; $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname}; - $value = $thisbranch->{value} if $thisbranch->{selected}; } + $value = ""; } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) { push @authorised_values, "" unless ( $tagslib->{$tag}->{$subfield}->{mandatory} ); -- 1.7.0.4 From gmcharlt at gmail.com Thu Jun 24 04:35:55 2010 From: gmcharlt at gmail.com (Galen Charlton) Date: Wed, 23 Jun 2010 22:35:55 -0400 Subject: [Koha-patches] [PATCH] bug 4312 change default for tagsmoderation to 0 from NULL In-Reply-To: <1277243357-2822-1-git-send-email-nengard@bywatersolutions.com> References: <1277243357-2822-1-git-send-email-nengard@bywatersolutions.com> Message-ID: Hi, On Tue, Jun 22, 2010 at 5:49 PM, Nicole Engard wrote: > + ? ?$dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'TagsModeration' AND value = 'NULL'"); SQL handles null variables in a special way - the test you have to use to check for nullity is 'is null', not "= 'NULL'". Regards, Galen -- Galen Charlton gmcharlt at gmail.com From Katrin.Fischer at bsz-bw.de Thu Jun 24 11:59:29 2010 From: Katrin.Fischer at bsz-bw.de (Fischer, Katrin) Date: Thu, 24 Jun 2010 11:59:29 +0200 Subject: [Koha-patches] Bug 4904: Problem with printing fines in overdue notices Message-ID: <028B1A54D03E7B4482CDCA4EC8F06BFD89F0CC@Bodensee.bsz-bw.de> From nengard at bywatersolutions.com Wed Jun 23 09:31:49 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Wed, 23 Jun 2010 03:31:49 -0400 Subject: [Koha-patches] [PATCH] bug 4312 change default for tagsmoderation to 0 from NULL Message-ID: <1277278309-4097-1-git-send-email-nengard@bywatersolutions.com> --- installer/data/mysql/en/mandatory/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 49a02ea..8bfed37 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -204,7 +204,7 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('TagsExternalDictionary',NULL,'','Path on server to local ispell executable, used to set $Lingua::Ispell::path This dictionary is used as a \"whitelist\" of pre-allowed tags.',''), ('TagsInputOnDetail','1','','Allow users to input tags from the detail page.', 'YesNo'), ('TagsInputOnList', '0','','Allow users to input tags from the search results list.', 'YesNo'), - ('TagsModeration', NULL,'','Require tags from patrons to be approved before becoming visible.','YesNo'), + ('TagsModeration', '0','','Require tags from patrons to be approved before becoming visible.','YesNo'), ('TagsShowOnDetail','10','','Number of tags to display on detail page. 0 is off.', 'Integer'), ('TagsShowOnList', '6','','Number of tags to display on search results list. 0 is off.','Integer'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index e9943a6..0279b08 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3655,6 +3655,13 @@ if (C4::Context->preference('Version') < TransformToNum($DBversion)){ SetVersion ($DBversion); } +$DBversion = 'XXX'; +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ + $dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'TagsModeration' AND value is 'NULL'"); + print "Upgrade to $DBversion done (bug 4312 TagsModeration changed from NULL to 0)\n"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) -- 1.5.6.5 From nengard at bywatersolutions.com Wed Jun 23 09:50:34 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Wed, 23 Jun 2010 03:50:34 -0400 Subject: [Koha-patches] [PATCH] bug 4312 change default for tagsmoderation to 0 from NULL Message-ID: <1277279434-4261-1-git-send-email-nengard@bywatersolutions.com> resending with fixes --- installer/data/mysql/en/mandatory/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 49a02ea..8bfed37 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -204,7 +204,7 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('TagsExternalDictionary',NULL,'','Path on server to local ispell executable, used to set $Lingua::Ispell::path This dictionary is used as a \"whitelist\" of pre-allowed tags.',''), ('TagsInputOnDetail','1','','Allow users to input tags from the detail page.', 'YesNo'), ('TagsInputOnList', '0','','Allow users to input tags from the search results list.', 'YesNo'), - ('TagsModeration', NULL,'','Require tags from patrons to be approved before becoming visible.','YesNo'), + ('TagsModeration', '0','','Require tags from patrons to be approved before becoming visible.','YesNo'), ('TagsShowOnDetail','10','','Number of tags to display on detail page. 0 is off.', 'Integer'), ('TagsShowOnList', '6','','Number of tags to display on search results list. 0 is off.','Integer'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index e9943a6..78f5622 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3655,6 +3655,13 @@ if (C4::Context->preference('Version') < TransformToNum($DBversion)){ SetVersion ($DBversion); } +$DBversion = 'XXX'; +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ + $dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'TagsModeration' AND value is NULL"); + print "Upgrade to $DBversion done (bug 4312 TagsModeration changed from NULL to 0)\n"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) -- 1.5.6.5 From colin.campbell at ptfs-europe.com Thu Jun 24 16:57:21 2010 From: colin.campbell at ptfs-europe.com (Colin Campbell) Date: Thu, 24 Jun 2010 15:57:21 +0100 Subject: [Koha-patches] [PATCH] Bug 4905 Runtime errors in about.pl Message-ID: <1277391441-5414-1-git-send-email-colin.campbell@ptfs-europe.com> Calls to VERSION were generating errors when called on a string. Use a bit of sleight of hand to avoid this Added a couple of tests on Installer/PerlModules Module needs better coverage testing (esp on newer perls) Sorted to list of modules to make koha_perl_deps.pl more human-friendly --- C4/Installer/PerlModules.pm | 11 ++++++----- t/Installer_pm.t | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) create mode 100755 t/Installer_pm.t diff --git a/C4/Installer/PerlModules.pm b/C4/Installer/PerlModules.pm index 9419ce8..35d7ce0 100644 --- a/C4/Installer/PerlModules.pm +++ b/C4/Installer/PerlModules.pm @@ -80,16 +80,17 @@ sub version_info { } } else { - for (keys(%$PERL_DEPS)) { - eval "require $_"; + for (sort keys(%{$PERL_DEPS})) { + my $pkg = $_; # $_ holds the string + eval "require $pkg"; if ($@) { push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}}); } - elsif ($_->VERSION lt $PERL_DEPS->{$_}->{'min_ver'}) { - push (@{$self->{'upgrade_pm'}}, {$_ => {cur_ver => $_->VERSION, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}}); + elsif ($pkg->VERSION lt $PERL_DEPS->{$_}->{'min_ver'}) { + push (@{$self->{'upgrade_pm'}}, {$_ => {cur_ver => $pkg->VERSION, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}}); } else { - push (@{$self->{'current_pm'}}, {$_ => {cur_ver => $_->VERSION, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}}); + push (@{$self->{'current_pm'}}, {$_ => {cur_ver => $pkg->VERSION, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}}); } } return; diff --git a/t/Installer_pm.t b/t/Installer_pm.t new file mode 100755 index 0000000..4370174 --- /dev/null +++ b/t/Installer_pm.t @@ -0,0 +1,25 @@ +#!/usr/bin/perl +# +use strict; +use warnings; + +use Test::More tests => 4; +use Data::Dumper; + +BEGIN { + use_ok('C4::Installer::PerlModules'); +} + +my $obj = C4::Installer::PerlModules->new; + +isa_ok($obj,'C4::Installer::PerlModules'); + +my $hash_ref = $obj->version_info(module => 'Test::More'); + +my $control = $Test::More::VERSION; + +like($hash_ref->{'Test::More'}->{cur_ver}, qr/\d/, 'returns numeric version'); + +ok($hash_ref->{'Test::More'}->{cur_ver} == $control, 'returns correct version'); + + -- 1.7.0.1 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:13 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:13 +0200 Subject: [Koha-patches] [PATCH 03/11] Select in budget add forum In-Reply-To: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277400381-14883-3-git-send-email-henridamien.laurent@biblibre.com> From: Jean-Andr? Santoni Sorted the branches select. Modified display to "branchcode - branchname" Fixed a bug, selection was inverted. --- .../prog/en/modules/admin/aqbudgets.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl index 957a81c..e0644a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl @@ -303,7 +303,7 @@ -- 1.7.0.4 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:12 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:12 +0200 Subject: [Koha-patches] [PATCH 02/11] (BUG #4356) Basket.pl: adding a link to the basketgroup In-Reply-To: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277400381-14883-2-git-send-email-henridamien.laurent@biblibre.com> From: Alex Arnaud --- acqui/basket.pl | 1 + .../prog/en/modules/acqui/basket.tmpl | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index afdc460..005fcb9 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -205,6 +205,7 @@ if ( $op eq 'delete_confirm' ) { name => "No group"); if ( ! $basket->{basketgroupid} ) { $emptygroup{default} = 1; + $emptygroup{nogroup} = 1; } unshift( @$basketgroups, \%emptygroup ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index ab9810c..3021681 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -177,6 +177,8 @@

      + + &basketgroupid=">
    -- 1.7.0.4 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:14 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:14 +0200 Subject: [Koha-patches] [PATCH 04/11] (BUG #4521) aqbudgets.pl - Transform undefined budget spent value to 0.00 value In-Reply-To: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277400381-14883-4-git-send-email-henridamien.laurent@biblibre.com> From: Alex Arnaud This patch tranform the undefined value of budget spent to a money value which equals 0.00. --- admin/aqbudgets.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index 9da555d..95f5f26 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -293,11 +293,11 @@ if ($op eq 'add_form') { $budget->{'remaining_pos'} = 1 if $budget->{'budget_remaining'} > 0; $budget->{'remaining_neg'} = 1 if $budget->{'budget_remaining'} < 0; for (grep {/total_levels_spent|budget_spent|budget_amount|budget_remaining|budget_unalloc/} keys %$budget){ - $$budget{$_} = $num->format_price( $$budget{$_} ) if defined($$budget{$_}) + $budget->{$_} = $num->format_price( $budget->{$_} ) if defined($budget->{$_}) } # Value of budget_spent equals 0 instead of undefined value - $$budget{"budget_spent"} = $num->format_price(0) unless defined($$budget{"budget_spent"}); + $budget->{"budget_spent"} = $num->format_price(0) unless defined($budget->{"budget_spent"}); my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} ); $budget->{"budget_owner_name"} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'}; -- 1.7.0.4 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:15 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:15 +0200 Subject: [Koha-patches] [PATCH 05/11] (bug #4523) possibility to show / hide the filters menu In-Reply-To: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277400381-14883-5-git-send-email-henridamien.laurent@biblibre.com> From: Alex Arnaud --- .../prog/en/modules/admin/aqbudgets.tmpl | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl index e0644a6..ce4d7da 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl @@ -129,6 +129,11 @@ $("#budgeth").treeTable(); + + $("#filterbutton").click(function() { + $("#fundfilters").slideToggle(0); + $("#content").css({ marginLeft: $("#content").css("marginLeft") == "4em"?"15em":"4em"}); + }); }); //]]> @@ -147,7 +152,7 @@
    -
    +
    @@ -393,7 +398,8 @@
    -
    + Filters +

    Fund filters

    1. -- 1.7.0.4 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:16 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:16 +0200 Subject: [Koha-patches] [PATCH 06/11] (BUG #4810) parcel.pl: Fix a bug with applying a filter on pending orders displaying In-Reply-To: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277400381-14883-6-git-send-email-henridamien.laurent@biblibre.com> From: Alex Arnaud When we apply a filter and click on "Click here to show x items" link, there are duplicates orders which are display. --- .../prog/en/modules/acqui/parcel.tmpl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl index 93422c2..9f7f11e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl @@ -31,6 +31,7 @@ // Collapse pending items table function pendingCollapse() { $("#pendingcollapserow").remove(); + $("#pendingt tr").show(); $("#pendingt tbody.filterclass tr:gt(" + (rowsToCollapse-1) + ")").hide(); $("#pendingt").before("

      " + _("Only the first ") + rowsToCollapse + _(" items are displayed.") + "" + _("Click here to show all ") + rowCountPending + _(" items") + "<\/a>.<\/p>"); @@ -40,6 +41,7 @@ function pendingExpand() { $("#pendingcollapserow").remove(); $("#pendingt tr").show(); + $("#pendingt tbody.filterclass tr.orderfound").remove(); $("#pendingt").before("

      " + rowCountPending + _(" items are displayed.") + "" + _("Click here to show only the first ") + rowsToCollapse + _(" items") + "<\/a>.<\/p>"); } @@ -114,7 +116,7 @@ function clearFilters() { $("#nothingfoundrow").remove(); $("#pendingt tbody.filterclass tr").show(); - $("#pendingt tbody.filterclass tr.orderfound").remove(); + //$("#pendingt tbody.filterclass tr.orderfound").remove(); pendingExpand(); } -- 1.7.0.4 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:11 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:11 +0200 Subject: [Koha-patches] [PATCH 01/11] (MT2371) basket.tmpl, in basket details, change Open on => Opened on Message-ID: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> From: Alex Arnaud --- .../prog/en/modules/acqui/basket.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index b46f02b..ab9810c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -157,7 +157,7 @@

      Contract name: &booksellerid=">

      Managed by:

      -

      Open on:

      +

      Opened on:

      Closed on:

      -- 1.7.0.4 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:17 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:17 +0200 Subject: [Koha-patches] [PATCH 07/11] (BUG #4811) suggestion.pl: display borrowers name in suggestion information filters (Suggested By, Managed by, Accepted by) In-Reply-To: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277400381-14883-7-git-send-email-henridamien.laurent@biblibre.com> From: Alex Arnaud --- .../prog/en/modules/suggestion/suggestion.tmpl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index 30350ac..74cc5fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -305,11 +305,11 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
    -- 1.7.0.4 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:18 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:18 +0200 Subject: [Koha-patches] [PATCH 08/11] MT3652 : Unifying the search of neworder with Search In-Reply-To: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277400381-14883-8-git-send-email-henridamien.laurent@biblibre.com> This patch unifies the search in neworder so that the same biblios should be sent back when searching from catalogue search or from box. --- acqui/neworderbiblio.pl | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl index 09709d7..a06faca 100755 --- a/acqui/neworderbiblio.pl +++ b/acqui/neworderbiblio.pl @@ -91,7 +91,13 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( ); # Searching the catalog. -my ($error, $marcresults, $total_hits) = SimpleSearch($query, $results_per_page * ($page - 1), $results_per_page); +my @operands = $query; +my ( @operators, @indexes, @sort_by, @limits ) = (); +my ( $builterror, $builtquery, $simple_query, $query_cgi, $query_desc, $limit, $limit_cgi, $limit_desc, $stopwords_removed, $query_type ) = + buildQuery( \@operators, \@operands, \@indexes, @limits, \@sort_by, undef, undef ); + + # find results +my ( $error, $marcresults, $total_hits ) = SimpleSearch( $builtquery, $results_per_page * ( $page - 1 ), $results_per_page ); if (defined $error) { warn "error: ".$error; -- 1.7.0.4 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:19 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:19 +0200 Subject: [Koha-patches] [PATCH 09/11] (MT #3651) Fills "book fund" combobox with bugdets and fix some bugs of research by filter. In-Reply-To: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277400381-14883-9-git-send-email-henridamien.laurent@biblibre.com> From: Alex Arnaud --- .../prog/en/modules/suggestion/suggestion.tmpl | 10 ++++---- suggestion/suggestion.pl | 25 +++++++++++++++++-- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index 74cc5fb..694002a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -304,20 +304,20 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
    • -
    • -

    • Acquistion information

    -
    1. - +
    2. diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 68f35be..c744dc4 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -57,9 +57,13 @@ sub GetCriteriumDesc{ if ($displayby =~/managedby/||$displayby =~/acceptedby/){ my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue); return "" unless $borr; -# warn '$borr : ',Data::Dumper::Dumper($borr); - return $$borr{firstname}.", ".$$borr{surname}; - } + return $$borr{firstname} . ", " . $$borr{surname}; + } + if ( $displayby =~ /budgetid/) { + my $budget = GetBudget($criteriumvalue); + return "" unless $budget; + return $$budget{budget_name}; + } } my $input = CGI->new; @@ -161,11 +165,21 @@ if ($op=~/else/) { my $reasonsloop = GetAuthorisedValues("SUGGEST"); foreach my $criteriumvalue (map{$$_{'value'}} @$criteria_list){ my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne ""; +<<<<<<< HEAD next if ($definedvalue && $$suggestion_ref{$displayby} ne $criteriumvalue); $$suggestion_ref{$displayby}=$criteriumvalue; # warn $$suggestion_ref{$displayby}."=$criteriumvalue; $displayby"; +======= + + next if ( $definedvalue && $$suggestion_ref{$displayby} ne $criteriumvalue ); + $$suggestion_ref{$displayby} = $criteriumvalue; + + # warn $$suggestion_ref{$displayby}."=$criteriumvalue; $displayby"; + #warn "==========================================="; + #warn Data::Dumper::Dumper($suggestion_ref); +>>>>>>> (MT #3651) Fills "book fund" combobox with bugdets and fix some bugs of research by filter. my $suggestions = &SearchSuggestion($suggestion_ref); foreach my $suggestion (@$suggestions){ $suggestion->{budget_name}=GetBudget($suggestion->{budgetid})->{budget_name} if $suggestion->{budgetid}; @@ -265,8 +279,13 @@ foreach my $budget (@$budgets){ $template->param( budgetsloop => $budgets); +<<<<<<< HEAD my %hashlists; foreach my $field qw(managedby acceptedby suggestedby STATUS){ +======= +my %hashlists; +foreach my $field qw(managedby acceptedby suggestedby budgetid STATUS) { +>>>>>>> (MT #3651) Fills "book fund" combobox with bugdets and fix some bugs of research by filter. my $values_list; $values_list=GetDistinctValues("suggestions.".$field) ; my @codes_list = map{ -- 1.7.0.4 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:20 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:20 +0200 Subject: [Koha-patches] [PATCH 10/11] (MT #3651) Fix problems on search filters. In-Reply-To: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277400381-14883-10-git-send-email-henridamien.laurent@biblibre.com> From: Alex Arnaud removing of useless value "no tabs" in organize by combo. removing of useless value "Sort 1" in organize by combo. Adding combodate for suggesteddate, manageddate, accepteddate. Adding research on dates in query. --- .../prog/en/modules/suggestion/suggestion.tmpl | 91 ++++++++++++++++++- suggestion/suggestion.pl | 2 +- 2 files changed, 87 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index 694002a..f2227a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -1,6 +1,7 @@ Koha › Acquisitions › <!-- TMPL_IF name="op_save" --><!-- TMPL_IF name="suttesionid" -->Edit purchase suggestion #<!-- TMPL_VAR name="suggestionid" --><!--TMPL_ELSE-->Enter a new purchase suggestion<!-- /TMPL_IF --><!--TMPL_ELSE-->Suggestions Management<!-- /TMPL_IF --> + + +
    + + +
    to :/lib/calendar/cal.gif" id="suggesteddate_to_button" alt="Show Calendar" /> +
    +
    • -
    • +
  • + + + + + + + +
    from :/lib/calendar/cal.gif" id="manageddate_from_button" alt="Show Calendar" /> +
    to :/lib/calendar/cal.gif" id="manageddate_to_button" alt="Show Calendar" /> +
    +
    • -
    • +
  • + + + + + + + +
    from :/lib/calendar/cal.gif" id="accepteddate_from_button" alt="Show Calendar" /> +
    to :/lib/calendar/cal.gif" id="accepteddate_to_button" alt="Show Calendar" /> +
    +
    • +

    • Acquistion information

    diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index c744dc4..c12086f 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -297,5 +297,5 @@ foreach my $field qw(managedby acceptedby suggestedby budgetid STATUS) { $hashlists{lc($field)."_loop"}=\@codes_list; } $template->param(%hashlists); - +$template->param(DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),); output_html_with_http_headers $input, $cookie, $template->output; -- 1.7.0.4 From henridamien.laurent at biblibre.com Thu Jun 24 19:26:21 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Thu, 24 Jun 2010 19:26:21 +0200 Subject: [Koha-patches] [PATCH 11/11] (BUG #4857) aqplan.pl: consideration of Planning categories with authorised values In-Reply-To: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277400381-14883-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277400381-14883-11-git-send-email-henridamien.laurent@biblibre.com> From: Alex Arnaud --- admin/aqplan.pl | 17 ++++++++++++++--- .../prog/en/modules/admin/aqplan.tmpl | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/admin/aqplan.pl b/admin/aqplan.pl index 5fb7097..da47179 100755 --- a/admin/aqplan.pl +++ b/admin/aqplan.pl @@ -153,6 +153,7 @@ while ( my ($category) = $sth->fetchrow_array ) { push( @category_list, 'MONTHS' ); push( @category_list, 'ITEMTYPES' ); push( @category_list, 'BRANCHES' ); +push( @category_list, $$_{'authcat'} ) foreach @$auth_cats_loop; #reorder the list @category_list = sort { $a cmp $b } @category_list; @@ -173,9 +174,7 @@ my $CGISort; my @authvals; my %labels; - - my @names = $input->param(); - +my @names = $input->param(); # ------------------------------------------------------------ if ( $op eq 'save' ) { #get budgets @@ -292,6 +291,18 @@ elsif ( $authcat eq 'ITEMTYPES' ) { } } $sth->finish; +} elsif ($authcat) { + my $query = qq{ SELECT * FROM authorised_values WHERE category=? order by lib }; + my $sth = $dbh->prepare($query); + $sth->execute($authcat); + if ( $sth->rows > 0 ) { + for ( my $i = 0 ; $i < $sth->rows ; $i++ ) { + my $results = $sth->fetchrow_hashref; + push @authvals, $results->{authorised_value}; + $labels{ $results->{authorised_value} } = $results->{lib}; + } + } + $sth->finish; } my @authvals_row; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl index 93a3d6a..627b3f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl @@ -90,6 +90,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () { +"/>
    Planning for by -- 1.7.0.4 From f.demians at tamil.fr Thu Jun 24 21:13:46 2010 From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=) Date: Thu, 24 Jun 2010 21:13:46 +0200 Subject: [Koha-patches] [PATCH] Bug 3217 Impossible to change biblio record FW to Default Message-ID: <1277406826-15847-1-git-send-email-f.demians@tamil.fr> --- .../prog/en/modules/cataloguing/addbiblio.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl index 8c5d499..e722afb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -705,7 +705,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
    • -
    • -

    • Acquistion information

    -
    1. - +
    2. diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 68f35be..876c26a 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -57,9 +57,13 @@ sub GetCriteriumDesc{ if ($displayby =~/managedby/||$displayby =~/acceptedby/){ my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue); return "" unless $borr; -# warn '$borr : ',Data::Dumper::Dumper($borr); - return $$borr{firstname}.", ".$$borr{surname}; - } + return $$borr{firstname} . ", " . $$borr{surname}; + } + if ( $displayby =~ /budgetid/) { + my $budget = GetBudget($criteriumvalue); + return "" unless $budget; + return $$budget{budget_name}; + } } my $input = CGI->new; @@ -265,8 +269,8 @@ foreach my $budget (@$budgets){ $template->param( budgetsloop => $budgets); -my %hashlists; -foreach my $field qw(managedby acceptedby suggestedby STATUS){ +my %hashlists; +foreach my $field qw(managedby acceptedby suggestedby budgetid STATUS) { my $values_list; $values_list=GetDistinctValues("suggestions.".$field) ; my @codes_list = map{ -- 1.7.0.4 From henridamien.laurent at biblibre.com Fri Jun 25 10:59:37 2010 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Fri, 25 Jun 2010 10:59:37 +0200 Subject: [Koha-patches] [PATCH 2/2] (MT #3651) Fix problems on search filters. In-Reply-To: <1277456377-22749-1-git-send-email-henridamien.laurent@biblibre.com> References: <1277456377-22749-1-git-send-email-henridamien.laurent@biblibre.com> Message-ID: <1277456377-22749-2-git-send-email-henridamien.laurent@biblibre.com> From: Alex Arnaud removing of useless value "no tabs" in organize by combo. removing of useless value "Sort 1" in organize by combo. Adding combodate for suggesteddate, manageddate, accepteddate. Adding research on dates in query. --- .../prog/en/modules/suggestion/suggestion.tmpl | 91 ++++++++++++++++++- suggestion/suggestion.pl | 2 +- 2 files changed, 87 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index 694002a..f2227a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -1,6 +1,7 @@ Koha › Acquisitions › <!-- TMPL_IF name="op_save" --><!-- TMPL_IF name="suttesionid" -->Edit purchase suggestion #<!-- TMPL_VAR name="suggestionid" --><!--TMPL_ELSE-->Enter a new purchase suggestion<!-- /TMPL_IF --><!--TMPL_ELSE-->Suggestions Management<!-- /TMPL_IF --> + + +
    + + +
    to :/lib/calendar/cal.gif" id="suggesteddate_to_button" alt="Show Calendar" /> +
    +
    • -
    • +
  • + + + + + + + +
    from :/lib/calendar/cal.gif" id="manageddate_from_button" alt="Show Calendar" /> +
    to :/lib/calendar/cal.gif" id="manageddate_to_button" alt="Show Calendar" /> +
    +
    • -
    • +
  • + + + + + + + +
    from :/lib/calendar/cal.gif" id="accepteddate_from_button" alt="Show Calendar" /> +
    to :/lib/calendar/cal.gif" id="accepteddate_to_button" alt="Show Calendar" /> +
    +
    • +

    • Acquistion information

    diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 876c26a..57a1ba7 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -282,5 +282,5 @@ foreach my $field qw(managedby acceptedby suggestedby budgetid STATUS) { $hashlists{lc($field)."_loop"}=\@codes_list; } $template->param(%hashlists); - +$template->param(DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),); output_html_with_http_headers $input, $cookie, $template->output; -- 1.7.0.4 From gmcharlt at gmail.com Fri Jun 25 11:17:03 2010 From: gmcharlt at gmail.com (Galen Charlton) Date: Fri, 25 Jun 2010 05:17:03 -0400 Subject: [Koha-patches] [PATCH] added dependency for using memcached for sessions Message-ID: <1277457427-11013-1-git-send-email-gmcharlt@gmail.com> Signed-off-by: Galen Charlton --- C4/Installer/PerlDependencies.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm index 19a84a0..7ebac1b 100644 --- a/C4/Installer/PerlDependencies.pm +++ b/C4/Installer/PerlDependencies.pm @@ -389,6 +389,11 @@ our $PERL_DEPS = { 'required' => '1', 'min_ver' => '4.2' }, + 'CGI::Session::Driver::memcached' => { + 'usage' => 'Memcached Feature (Experimental)', + 'required' => '0', + 'min_ver' => '0.04', + }, 'POSIX' => { 'usage' => 'Core', 'required' => '1', -- 1.7.0 From gmcharlt at gmail.com Fri Jun 25 11:17:05 2010 From: gmcharlt at gmail.com (Galen Charlton) Date: Fri, 25 Jun 2010 05:17:05 -0400 Subject: [Koha-patches] [PATCH] fixes to edit_items granular permission In-Reply-To: <1277457427-11013-2-git-send-email-gmcharlt@gmail.com> References: <1277457427-11013-1-git-send-email-gmcharlt@gmail.com> <1277457427-11013-2-git-send-email-gmcharlt@gmail.com> Message-ID: <1277457427-11013-3-git-send-email-gmcharlt@gmail.com> * cataloging toolbar now properly handles case where staff user has permission to edit items but not bibs * fixed wrong permission introduced in the bib details page that prevented circulation users from being able to change item statuses, which is the very point of that page. A possible future direction is to introduce another permission for the benefit of circulation staff who need to be able to change item statues, e.g., a circulate/change_item_status. Signed-off-by: Galen Charlton --- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 17 +++++++++++++++++ .../prog/en/modules/catalogue/moredetail.tmpl | 2 +- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index eda7985..3dfceac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -75,12 +75,19 @@ function confirm_items_deletion() { // YUI Toolbar Functions function yuiToolbar() { + var newmenu = [ {text: _("New Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl" }, {text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=#additema" }, {text: _("New Subscription"), url: "/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription="}, ]; + + var newmenu = [ + {text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=#additema" } + ]; + + var editmenu = [ { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&frameworkcode=&op=" }, { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=" }, @@ -89,6 +96,12 @@ function confirm_items_deletion() { { text: _("Delete Record"), onclick: {fn: confirm_deletion },id:'disabled' }, { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion } } ]; + + var editmenu = [ + { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=" }, + { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion } } + ]; + var savemenu = [ { text: _("MODS (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=" }, @@ -170,6 +183,10 @@ function confirm_items_deletion() {
  • ">Edit Items
  • &frameworkcode=&op=duplicate">Duplicate Record
  • ">Delete
    • + + +
  • ">New Item
    • +
  • ">Edit Items
  • ">Add to shelf
  • ">Print
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl index 8577193..93a46a5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl @@ -167,7 +167,7 @@
  • Previous Borrower: "> 
  • Paid for?:  
  • Public Note: - + " /> " />" /> -- 1.7.0 From gmcharlt at gmail.com Fri Jun 25 11:17:07 2010 From: gmcharlt at gmail.com (Galen Charlton) Date: Fri, 25 Jun 2010 05:17:07 -0400 Subject: [Koha-patches] [PATCH 2/2] replace references to defunct info email address In-Reply-To: <1277457427-11013-4-git-send-email-gmcharlt@gmail.com> References: <1277457427-11013-1-git-send-email-gmcharlt@gmail.com> <1277457427-11013-2-git-send-email-gmcharlt@gmail.com> <1277457427-11013-3-git-send-email-gmcharlt@gmail.com> <1277457427-11013-4-git-send-email-gmcharlt@gmail.com> Message-ID: <1277457427-11013-5-git-send-email-gmcharlt@gmail.com> Now links to Koha project website. Signed-off-by: Galen Charlton --- C4/Acquisition.pm | 2 +- C4/AuthoritiesMarc.pm | 2 +- C4/AuthoritiesMarc/MARC21.pm | 2 +- C4/AuthoritiesMarc/UNIMARC.pm | 2 +- C4/BackgroundJob.pm | 2 +- C4/Biblio.pm | 2 +- C4/Bookseller.pm | 2 +- C4/Boolean.pm | 2 +- C4/Branch.pm | 2 +- C4/Budgets.pm | 2 +- C4/Charset.pm | 2 +- C4/Circulation.pm | 2 +- C4/ClassSortRoutine.pm | 2 +- C4/ClassSortRoutine/Dewey.pm | 2 +- C4/ClassSortRoutine/Generic.pm | 2 +- C4/ClassSortRoutine/LCC.pm | 2 +- C4/ClassSource.pm | 2 +- C4/Contract.pm | 2 +- C4/Form/MessagingPreferences.pm | 2 +- C4/Heading.pm | 2 +- C4/Heading/MARC21.pm | 2 +- C4/ImportBatch.pm | 2 +- C4/Input.pm | 2 +- C4/Installer.pm | 2 +- C4/Log.pm | 2 +- C4/Maintainance.pm | 2 +- C4/Matcher.pm | 2 +- C4/Members/AttributeTypes.pm | 2 +- C4/Members/Attributes.pm | 2 +- C4/Members/Messaging.pm | 2 +- C4/Output.pm | 2 +- C4/Overdues.pm | 2 +- C4/Print.pm | 2 +- C4/Reserves.pm | 2 +- C4/Search.pm | 2 +- C4/Search/PazPar2.pm | 2 +- C4/Serials.pm | 2 +- C4/Serials/Frequency.pm | 2 +- C4/Serials/NumberPattern.pm | 2 +- C4/Stats.pm | 2 +- C4/Suggestions.pm | 2 +- C4/UploadedFile.pm | 2 +- C4/VirtualShelves.pm | 2 +- C4/Z3950.pm | 2 +- install_misc/UpgradeBackup.pm | 2 +- xt/author/test_template.pl | 2 +- xt/author/valid-templates.t | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index fc99f7d..4ce47fc 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -1704,6 +1704,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index f276987..f6c9d35 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -1443,7 +1443,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team Paul POULAIN paul.poulain at free.fr diff --git a/C4/AuthoritiesMarc/MARC21.pm b/C4/AuthoritiesMarc/MARC21.pm index e532ae1..bd0eb2e 100644 --- a/C4/AuthoritiesMarc/MARC21.pm +++ b/C4/AuthoritiesMarc/MARC21.pm @@ -119,7 +119,7 @@ sub fix_marc21_auth_type_location { =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/AuthoritiesMarc/UNIMARC.pm b/C4/AuthoritiesMarc/UNIMARC.pm index 244eec9..a7af735 100644 --- a/C4/AuthoritiesMarc/UNIMARC.pm +++ b/C4/AuthoritiesMarc/UNIMARC.pm @@ -79,7 +79,7 @@ sub default_auth_type_location { =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/BackgroundJob.pm b/C4/BackgroundJob.pm index 45e404e..3dc3bce 100644 --- a/C4/BackgroundJob.pm +++ b/C4/BackgroundJob.pm @@ -265,7 +265,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 11767a7..974f068 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -3392,7 +3392,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team Paul POULAIN paul.poulain at free.fr diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm index 3937880..8d60938 100644 --- a/C4/Bookseller.pm +++ b/C4/Bookseller.pm @@ -277,6 +277,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Boolean.pm b/C4/Boolean.pm index d8c14fb..f546464 100644 --- a/C4/Boolean.pm +++ b/C4/Boolean.pm @@ -118,6 +118,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Branch.pm b/C4/Branch.pm index 296011d..056a1d1 100644 --- a/C4/Branch.pm +++ b/C4/Branch.pm @@ -611,6 +611,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Budgets.pm b/C4/Budgets.pm index 3e99316..005bba8 100644 --- a/C4/Budgets.pm +++ b/C4/Budgets.pm @@ -828,6 +828,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Charset.pm b/C4/Charset.pm index 5324ff9..b3b4b72 100644 --- a/C4/Charset.pm +++ b/C4/Charset.pm @@ -1124,7 +1124,7 @@ sub char_decode5426 { =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/Circulation.pm b/C4/Circulation.pm index f47812c..034a8d6 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2768,7 +2768,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/ClassSortRoutine.pm b/C4/ClassSortRoutine.pm index 19fd998..fcd797d 100644 --- a/C4/ClassSortRoutine.pm +++ b/C4/ClassSortRoutine.pm @@ -126,7 +126,7 @@ sub _get_class_sort_key { =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/ClassSortRoutine/Dewey.pm b/C4/ClassSortRoutine/Dewey.pm index aff01b7..b4ba921 100644 --- a/C4/ClassSortRoutine/Dewey.pm +++ b/C4/ClassSortRoutine/Dewey.pm @@ -87,7 +87,7 @@ sub get_class_sort_key { =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/ClassSortRoutine/Generic.pm b/C4/ClassSortRoutine/Generic.pm index e787096..924e6a8 100644 --- a/C4/ClassSortRoutine/Generic.pm +++ b/C4/ClassSortRoutine/Generic.pm @@ -68,7 +68,7 @@ sub get_class_sort_key { =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/ClassSortRoutine/LCC.pm b/C4/ClassSortRoutine/LCC.pm index b72c58e..4fcf731 100644 --- a/C4/ClassSortRoutine/LCC.pm +++ b/C4/ClassSortRoutine/LCC.pm @@ -71,7 +71,7 @@ sub get_class_sort_key { =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/ClassSource.pm b/C4/ClassSource.pm index 13c2186..c527089 100644 --- a/C4/ClassSource.pm +++ b/C4/ClassSource.pm @@ -358,6 +358,6 @@ sub GetClassSort { =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Contract.pm b/C4/Contract.pm index 9a49116..0259470 100644 --- a/C4/Contract.pm +++ b/C4/Contract.pm @@ -69,6 +69,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Form/MessagingPreferences.pm b/C4/Form/MessagingPreferences.pm index 2a8252c..bad3aa6 100644 --- a/C4/Form/MessagingPreferences.pm +++ b/C4/Form/MessagingPreferences.pm @@ -158,7 +158,7 @@ L, F, F, F +Koha Development Team Galen Charlton refactoring code by Andrew Moore. diff --git a/C4/Heading.pm b/C4/Heading.pm index fd11737..9d7d98a 100644 --- a/C4/Heading.pm +++ b/C4/Heading.pm @@ -174,7 +174,7 @@ sub _marc_format_handler { =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/Heading/MARC21.pm b/C4/Heading/MARC21.pm index 8d45d1a..4867c4b 100644 --- a/C4/Heading/MARC21.pm +++ b/C4/Heading/MARC21.pm @@ -237,7 +237,7 @@ sub _get_display_heading { =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm index 6672b50..f5b42a9 100644 --- a/C4/ImportBatch.pm +++ b/C4/ImportBatch.pm @@ -1259,7 +1259,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/Input.pm b/C4/Input.pm index 41be2fb..2ee07f3 100644 --- a/C4/Input.pm +++ b/C4/Input.pm @@ -155,6 +155,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Installer.pm b/C4/Installer.pm index 2436d3b..80ef627 100644 --- a/C4/Installer.pm +++ b/C4/Installer.pm @@ -575,7 +575,7 @@ sub get_file_path_from_name { C4::Installer is a refactoring of logic originally from installer/installer.pl, which was originally written by Henri-Damien Laurant. -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/Log.pm b/C4/Log.pm index 2f791de..141621a 100644 --- a/C4/Log.pm +++ b/C4/Log.pm @@ -257,6 +257,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Maintainance.pm b/C4/Maintainance.pm index 570a413..aea6028 100644 --- a/C4/Maintainance.pm +++ b/C4/Maintainance.pm @@ -210,6 +210,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Matcher.pm b/C4/Matcher.pm index 3f44783..5915c12 100644 --- a/C4/Matcher.pm +++ b/C4/Matcher.pm @@ -769,7 +769,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/Members/AttributeTypes.pm b/C4/Members/AttributeTypes.pm index 0506e23..9fb39e0 100644 --- a/C4/Members/AttributeTypes.pm +++ b/C4/Members/AttributeTypes.pm @@ -440,7 +440,7 @@ sub get_patrons { =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/Members/Attributes.pm b/C4/Members/Attributes.pm index 4fdc9ec..72af3c8 100644 --- a/C4/Members/Attributes.pm +++ b/C4/Members/Attributes.pm @@ -292,7 +292,7 @@ sub _sort_by_code { =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/Members/Messaging.pm b/C4/Members/Messaging.pm index 7f7464c..13b91fe 100644 --- a/C4/Members/Messaging.pm +++ b/C4/Members/Messaging.pm @@ -307,7 +307,7 @@ L =head1 AUTHOR -Koha Development Team +Koha Development Team Andrew Moore diff --git a/C4/Output.pm b/C4/Output.pm index 5a767a3..9f5ed5e 100644 --- a/C4/Output.pm +++ b/C4/Output.pm @@ -492,6 +492,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Overdues.pm b/C4/Overdues.pm index fc0af93..032ca93 100644 --- a/C4/Overdues.pm +++ b/C4/Overdues.pm @@ -1282,6 +1282,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Print.pm b/C4/Print.pm index 706afc3..09c18bf 100644 --- a/C4/Print.pm +++ b/C4/Print.pm @@ -193,7 +193,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =head1 SEE ALSO diff --git a/C4/Reserves.pm b/C4/Reserves.pm index bcb27bb..9b7014e 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -1841,7 +1841,7 @@ sub _ShiftPriorityByDateAndPriority { =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Search.pm b/C4/Search.pm index cb97a1e..cb9eb71 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -2659,6 +2659,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Search/PazPar2.pm b/C4/Search/PazPar2.pm index bf786bc..59f4103 100644 --- a/C4/Search/PazPar2.pm +++ b/C4/Search/PazPar2.pm @@ -164,7 +164,7 @@ sub termlist { =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/Serials.pm b/C4/Serials.pm index 48cb150..35cc5be 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -2333,6 +2333,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Serials/Frequency.pm b/C4/Serials/Frequency.pm index 95d867f..e4bc341 100644 --- a/C4/Serials/Frequency.pm +++ b/C4/Serials/Frequency.pm @@ -137,6 +137,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Serials/NumberPattern.pm b/C4/Serials/NumberPattern.pm index 9aeb9f5..0d46545 100644 --- a/C4/Serials/NumberPattern.pm +++ b/C4/Serials/NumberPattern.pm @@ -124,6 +124,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Stats.pm b/C4/Stats.pm index d423b1f..11710f8 100644 --- a/C4/Stats.pm +++ b/C4/Stats.pm @@ -125,7 +125,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm index 01bd3e2..b5eb7a4 100644 --- a/C4/Suggestions.pm +++ b/C4/Suggestions.pm @@ -453,7 +453,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/C4/UploadedFile.pm b/C4/UploadedFile.pm index f75518f..da29c1f 100644 --- a/C4/UploadedFile.pm +++ b/C4/UploadedFile.pm @@ -284,7 +284,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm index 97cd150..fa599bd 100644 --- a/C4/VirtualShelves.pm +++ b/C4/VirtualShelves.pm @@ -628,7 +628,7 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =head1 SEE ALSO diff --git a/C4/Z3950.pm b/C4/Z3950.pm index 5618089..3f2f987 100644 --- a/C4/Z3950.pm +++ b/C4/Z3950.pm @@ -297,6 +297,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut diff --git a/install_misc/UpgradeBackup.pm b/install_misc/UpgradeBackup.pm index f84f338..a3b3564 100644 --- a/install_misc/UpgradeBackup.pm +++ b/install_misc/UpgradeBackup.pm @@ -86,7 +86,7 @@ Code based on parts of ExtUtils::Install in order to approximately track how it identifies files to install. -Koha Development Team +Koha Development Team Galen Charlton diff --git a/xt/author/test_template.pl b/xt/author/test_template.pl index dd81b4a..1414d4b 100755 --- a/xt/author/test_template.pl +++ b/xt/author/test_template.pl @@ -51,7 +51,7 @@ $template->output; # tossing output =head1 AUTHOR -Koha Development Team +Koha Development Team Galen Charlton diff --git a/xt/author/valid-templates.t b/xt/author/valid-templates.t index 87a6b6c..95825a6 100644 --- a/xt/author/valid-templates.t +++ b/xt/author/valid-templates.t @@ -83,7 +83,7 @@ sub gen_template_test { =head1 AUTHOR -Koha Developement team +Koha Developement Team Galen Charlton -- 1.7.0 From gmcharlt at gmail.com Fri Jun 25 11:17:06 2010 From: gmcharlt at gmail.com (Galen Charlton) Date: Fri, 25 Jun 2010 05:17:06 -0400 Subject: [Koha-patches] [PATCH 1/2] remove old revision history notes from a couple files In-Reply-To: <1277457427-11013-3-git-send-email-gmcharlt@gmail.com> References: <1277457427-11013-1-git-send-email-gmcharlt@gmail.com> <1277457427-11013-2-git-send-email-gmcharlt@gmail.com> <1277457427-11013-3-git-send-email-gmcharlt@gmail.com> Message-ID: <1277457427-11013-4-git-send-email-gmcharlt@gmail.com> Signed-off-by: Galen Charlton --- C4/Context.pm | 214 --------------------------------------------------------- C4/Z3950.pm | 75 -------------------- 2 files changed, 0 insertions(+), 289 deletions(-) diff --git a/C4/Context.pm b/C4/Context.pm index fa69c76..484d4e1 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -1068,217 +1068,3 @@ Andrew Arensburger Joshua Ferraro =cut - -# Revision 1.57 2007/05/22 09:13:55 tipaul -# Bugfixes & improvements (various and minor) : -# - updating templates to have tmpl_process3.pl running without any errors -# - adding a drupal-like css for prog templates (with 3 small images) -# - fixing some bugs in circulation & other scripts -# - updating french translation -# - fixing some typos in templates -# -# Revision 1.56 2007/04/23 15:21:17 tipaul -# renaming currenttransfers to transferstoreceive -# -# Revision 1.55 2007/04/17 08:48:00 tipaul -# circulation cleaning continued: bufixing -# -# Revision 1.54 2007/03/29 16:45:53 tipaul -# Code cleaning of Biblio.pm (continued) -# -# All subs have be cleaned : -# - removed useless -# - merged some -# - reordering Biblio.pm completly -# - using only naming conventions -# -# Seems to have broken nothing, but it still has to be heavily tested. -# Note that Biblio.pm is now much more efficient than previously & probably more reliable as well. -# -# Revision 1.53 2007/03/29 13:30:31 tipaul -# Code cleaning : -# == Biblio.pm cleaning (useless) == -# * some sub declaration dropped -# * removed modbiblio sub -# * removed moditem sub -# * removed newitems. It was used only in finishrecieve. Replaced by a TransformKohaToMarc+AddItem, that is better. -# * removed MARCkoha2marcItem -# * removed MARCdelsubfield declaration -# * removed MARCkoha2marcBiblio -# -# == Biblio.pm cleaning (naming conventions) == -# * MARCgettagslib renamed to GetMarcStructure -# * MARCgetitems renamed to GetMarcItem -# * MARCfind_frameworkcode renamed to GetFrameworkCode -# * MARCmarc2koha renamed to TransformMarcToKoha -# * MARChtml2marc renamed to TransformHtmlToMarc -# * MARChtml2xml renamed to TranformeHtmlToXml -# * zebraop renamed to ModZebra -# -# == MARC=OFF == -# * removing MARC=OFF related scripts (in cataloguing directory) -# * removed checkitems (function related to MARC=off feature, that is completly broken in head. If someone want to reintroduce it, hard work coming...) -# * removed getitemsbybiblioitem (used only by MARC=OFF scripts, that is removed as well) -# -# Revision 1.52 2007/03/16 01:25:08 kados -# Using my precrash CVS copy I did the following: -# -# cvs -z3 -d:ext:kados at cvs.savannah.nongnu.org:/sources/koha co -P koha -# find koha.precrash -type d -name "CVS" -exec rm -v {} \; -# cp -r koha.precrash/* koha/ -# cd koha/ -# cvs commit -# -# This should in theory put us right back where we were before the crash -# -# Revision 1.52 2007/03/12 21:17:05 rych -# add server, serverinfo as arrays from config -# -# Revision 1.51 2007/03/09 14:31:47 tipaul -# rel_3_0 moved to HEAD -# -# Revision 1.43.2.10 2007/02/09 17:17:56 hdl -# Managing a little better database absence. -# (preventing from BIG 550) -# -# Revision 1.43.2.9 2006/12/20 16:50:48 tipaul -# improving "insecure" management -# -# WARNING KADOS : -# you told me that you had some libraries with insecure=ON (behind a firewall). -# In this commit, I created a "fake" user when insecure=ON. It has a fake branch. You may find better to have the 1st branch in branch table instead of a fake one. -# -# Revision 1.43.2.8 2006/12/19 16:48:16 alaurin -# reident programs, and adding branchcode value in reserves -# -# Revision 1.43.2.7 2006/12/06 21:55:38 hdl -# Adding ModZebrations for servers to get serverinfos in Context.pm -# Using this function in rebuild_zebra.pl -# -# Revision 1.43.2.6 2006/11/24 21:18:31 kados -# very minor changes, no functional ones, just comments, etc. -# -# Revision 1.43.2.5 2006/10/30 13:24:16 toins -# fix some minor POD error. -# -# Revision 1.43.2.4 2006/10/12 21:42:49 hdl -# Managing multiple zebra connections -# -# Revision 1.43.2.3 2006/10/11 14:27:26 tipaul -# removing a warning -# -# Revision 1.43.2.2 2006/10/10 15:28:16 hdl -# BUG FIXING : using database name in Zconn if defined and not hard coded value -# -# Revision 1.43.2.1 2006/10/06 13:47:28 toins -# Synch with dev_week. -# /!\ WARNING :: Please now use the new version of koha.xml. -# -# Revision 1.18.2.5.2.14 2006/09/24 15:24:06 kados -# remove Zebraauth routine, fold the functionality into Zconn -# Zconn can now take several arguments ... this will probably -# change soon as I'm not completely happy with the readability -# of the current format ... see the POD for details. -# -# cleaning up Biblio.pm, removing unnecessary routines. -# -# DeleteBiblio - used to delete a biblio from zebra and koha tables -# -- checks to make sure there are no existing issues -# -- saves backups of biblio,biblioitems,items in deleted* tables -# -- does commit operation -# -# getRecord - used to retrieve one record from zebra in piggyback mode using biblionumber -# brought back z3950_extended_services routine -# -# Lots of modifications to Context.pm, you can now store user and pass info for -# multiple servers (for federated searching) using the element. -# I'll commit my koha.xml to demonstrate this or you can refer to the POD in -# Context.pm (which I also expanded on). -# -# Revision 1.18.2.5.2.13 2006/08/10 02:10:21 kados -# Turned warnings on, and running a search turned up lots of warnings. -# Cleaned up those ... -# -# removed getitemtypes from Koha.pm (one in Search.pm looks newer) -# removed itemcount from Biblio.pm -# -# made some local subs local with a _ prefix (as they were redefined -# elsewhere) -# -# Add two new search subs to Search.pm the start of a new search API -# that's a bit more scalable -# -# Revision 1.18.2.5.2.10 2006/07/21 17:50:51 kados -# moving the *.properties files to intranetdir/etc dir -# -# Revision 1.18.2.5.2.9 2006/07/17 08:05:20 tipaul -# there was a hardcoded link to /koha/etc/ I replaced it with intranetdir config value -# -# Revision 1.18.2.5.2.8 2006/07/11 12:20:37 kados -# adding ccl and cql files ... Tumer, if you want to fit these into the -# config file by all means do. -# -# Revision 1.18.2.5.2.7 2006/06/04 22:50:33 tgarip1957 -# We do not hard code cql2rpn conversion file in context.pm our koha.xml configuration file already describes the path for this file. -# At cql searching we use method CQL not CQL2RPN as the cql2rpn conversion file is defined at server level -# -# Revision 1.18.2.5.2.6 2006/06/02 23:11:24 kados -# Committing my working dev_week. It's been tested only with -# searching, and there's quite a lot of config stuff to set up -# beforehand. As things get closer to a release, we'll be making -# some scripts to do it for us -# -# Revision 1.18.2.5.2.5 2006/05/28 18:49:12 tgarip1957 -# This is an unusual commit. The main purpose is a working model of Zebra on a modified rel2_2. -# Any questions regarding these commits should be asked to Joshua Ferraro unless you are Joshua whom I'll report to -# -# Revision 1.36 2006/05/09 13:28:08 tipaul -# adding the branchname and the librarian name in every page : -# - modified userenv to add branchname -# - modifier menus.inc to have the librarian name & userenv displayed on every page. they are in a librarian_information div. -# -# Revision 1.35 2006/04/13 08:40:11 plg -# bug fixed: typo on Zconnauth name -# -# Revision 1.34 2006/04/10 21:40:23 tgarip1957 -# A new handler defined for zebra Zconnauth with read/write permission. Zconnauth should only be called in biblio.pm where write operations are. Use of this handler will break things unless koha.conf contains new variables: -# zebradb=localhost -# zebraport= -# zebrauser= -# zebrapass= -# -# The zebra.cfg file should read: -# perm.anonymous:r -# perm.username:rw -# passw.c: -# -# Password file should be prepared with Apaches htpasswd utility in encrypted mode and should exist in a folder zebra.cfg can read -# -# Revision 1.33 2006/03/15 11:21:56 plg -# bug fixed: utf-8 data where not displayed correctly in screens. Supposing -# your data are truely utf-8 encoded in your database, they should be -# correctly displayed. "set names 'UTF8'" on mysql connection (C4/Context.pm) -# is mandatory and "binmode" to utf8 (C4/Interface/CGI/Output.pm) seemed to -# converted data twice, so it was removed. -# -# Revision 1.32 2006/03/03 17:25:01 hdl -# Bug fixing : a line missed a comment sign. -# -# Revision 1.31 2006/03/03 16:45:36 kados -# Remove the search that tests the Zconn -- warning, still no fault -# tollerance -# -# Revision 1.30 2006/02/22 00:56:59 kados -# First go at a connection object for Zebra. You can now get a -# connection object by doing: -# -# my $Zconn = C4::Context->Zconn; -# -# My initial tests indicate that as soon as your funcion ends -# (ie, when you're done doing something) the connection will be -# closed automatically. There may be some other way to make the -# connection more stateful, I'm not sure... -# -# Local Variables: -# tab-width: 4 -# End: diff --git a/C4/Z3950.pm b/C4/Z3950.pm index 8f97d8b..5618089 100644 --- a/C4/Z3950.pm +++ b/C4/Z3950.pm @@ -300,78 +300,3 @@ __END__ Koha Development Team =cut - -#-------------------------------------- -# Revision 1.14 2007/03/09 14:31:47 tipaul -# rel_3_0 moved to HEAD -# -# Revision 1.10.10.1 2006/12/22 15:09:54 toins -# removing C4::Database; -# -# Revision 1.10 2003/10/01 15:08:14 tipaul -# fix fog bug #622 : processz3950queue fails -# -# Revision 1.9 2003/04/29 16:50:51 tipaul -# really proud of this commit :-) -# z3950 search and import seems to works fine. -# Let me explain how : -# * a "search z3950" button is added in the addbiblio template. -# * when clicked, a popup appears and z3950/search.pl is called -# * z3950/search.pl calls addz3950search in the DB -# * the z3950 daemon retrieve the records and stores them in import_batches/import_records/import_biblios tables. -# * as long as there as searches pending, the popup auto refresh every 2 seconds, and says how many searches are pending. -# * when the user clicks on a z3950 result => the parent popup is called with the requested biblio, and auto-filled -# -# Note : -# * character encoding support : (It's a nightmare...) In the z3950servers table, a "encoding" column has been added. You can put "UNIMARC" or "USMARC" in this column. Depending on this, the char_decode in C4::Biblio.pm replaces marc-char-encode by an iso 8859-1 encoding. Note that in the breeding import this value has been added too, for a better support. -# * the mport_records and z3950* tables have been modified : they have an encoding column and the random z3950 number is stored too for convenience => it's the key I use to list only requested biblios in the popup. -# -# Revision 1.8 2003/04/29 08:09:45 tipaul -# z3950 support is coming... -# * adding a syntax column in z3950 table = this column will say wether the z3950 must be called with PerferedRecordsyntax => USMARC or PerferedRecordsyntax => UNIMARC. I tried some french UNIMARC z3950 servers, and some only send USMARC, some only UNIMARC, some can answer with both. -# Note this is a 1st draft. More to follow (today ? I hope). -# -# Revision 1.7 2003/02/19 01:01:06 wolfpac444 -# Removed the unecessary $dbh argument from being passed. -# Resolved a few minor FIXMEs. -# -# Revision 1.6 2002/10/13 08:30:53 arensb -# Deleted unused variables. -# Removed trailing whitespace. -# -# Revision 1.5 2002/10/13 06:13:23 arensb -# Removed bogus #! line (this isn't a script!) -# Removed unused global variables. -# Added POD. -# Added some explanatory comments. -# Added some FIXME comments. -# -# Revision 1.4 2002/10/11 12:35:35 arensb -# Replaced &requireDBI with C4::Context->dbh -# -# Revision 1.3 2002/08/14 18:12:52 tonnesen -# Added copyright statement to all .pl and .pm files -# -# Revision 1.2 2002/07/02 20:31:33 tonnesen -# module added from rel-1-2 branch -# -# Revision 1.1.2.5 2002/06/29 17:33:47 amillar -# Allow DEFAULT as input to addz3950search. -# Check for existence of pid file (cat crashed otherwise). -# Return error messages in addz3950search. -# -# Revision 1.1.2.4 2002/06/28 18:07:27 tonnesen -# marcimport.pl will print an error message if it can not signal the -# processz3950queue program. The message contains instructions for starting the -# daemon. -# -# Revision 1.1.2.3 2002/06/28 17:45:39 tonnesen -# z3950queue now listens for a -HUP signal before processing the queue. Z3950.pm -# sends the -HUP signal when queries are added to the queue. -# -# Revision 1.1.2.2 2002/06/26 20:54:31 tonnesen -# use warnings breaks on perl 5.005... -# -# Revision 1.1.2.1 2002/06/26 07:26:41 amillar -# New module for Z39.50 searching -# -- 1.7.0 From gmcharlt at gmail.com Fri Jun 25 11:17:04 2010 From: gmcharlt at gmail.com (Galen Charlton) Date: Fri, 25 Jun 2010 05:17:04 -0400 Subject: [Koha-patches] [PATCH] bug 4896: granular permissions now always on (DB rev 138) In-Reply-To: <1277457427-11013-1-git-send-email-gmcharlt@gmail.com> References: <1277457427-11013-1-git-send-email-gmcharlt@gmail.com> Message-ID: <1277457427-11013-2-git-send-email-gmcharlt@gmail.com> Per the following koha-devel thread, the use of staff user subpermissions, AKA granular permissions, is now the default behavior in Koha. This patch removes the GranularPermissions system preference. [1] http://lists.koha-community.org/pipermail/koha-devel/2010-February/033670.html Signed-off-by: Galen Charlton --- C4/Auth.pm | 55 ++++------ admin/authorised_values.pl | 6 +- admin/systempreferences.pl | 1 - installer/data/mysql/de-DE/mandatory/sysprefs.sql | 1 - installer/data/mysql/en/mandatory/sysprefs.sql | 1 - .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 - installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 1 - ...m_preferences_full_optimal_for_install_only.sql | 1 - ...ystem_preferences_only_translation_updating.sql | 2 - ...m_preferences_full_optimal_for_install_only.sql | 1 - ...ystem_preferences_only_translation_updating.sql | 3 - installer/data/mysql/updatedatabase.pl | 6 + .../prog/en/modules/admin/preferences/admin.pref | 9 +-- .../prog/en/modules/help/members/member-flags.tmpl | 21 +---- kohaversion.pl | 2 +- members/member-flags.pl | 106 ++++++++++---------- svc/config/systempreferences | 4 +- 17 files changed, 85 insertions(+), 136 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index cb52a66..593f36e 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -206,24 +206,16 @@ sub get_template_and_user { } } - if (C4::Context->preference('GranularPermissions')) { - if ( $flags ) { - foreach my $module (keys %$all_perms) { - if ( $flags->{$module} == 1) { - foreach my $subperm (keys %{ $all_perms->{$module} }) { - $template->param( "CAN_user_${module}_${subperm}" => 1 ); - } - } elsif ( ref($flags->{$module}) ) { - foreach my $subperm (keys %{ $flags->{$module} } ) { - $template->param( "CAN_user_${module}_${subperm}" => 1 ); - } - } - } - } - } else { + if ( $flags ) { foreach my $module (keys %$all_perms) { - foreach my $subperm (keys %{ $all_perms->{$module} }) { - $template->param( "CAN_user_${module}_${subperm}" => 1 ); + if ( $flags->{$module} == 1) { + foreach my $subperm (keys %{ $all_perms->{$module} }) { + $template->param( "CAN_user_${module}_${subperm}" => 1 ); + } + } elsif ( ref($flags->{$module}) ) { + foreach my $subperm (keys %{ $flags->{$module} } ) { + $template->param( "CAN_user_${module}_${subperm}" => 1 ); + } } } } @@ -504,9 +496,10 @@ that the user must have the "circulate" privilege in order to proceed. To make sure that access control is correct, the C<$flagsrequired> parameter must be specified correctly. -If the GranularPermissions system preference is ON, the -value of each key in the C hash takes on an additional -meaning, e.g., +Koha also has a concept of sub-permissions, also known as +granular permissions. This makes the value of each key +in the C hash take on an additional +meaning, i.e., 1 @@ -1561,20 +1554,16 @@ sub haspermission { } return $flags if $flags->{superlibrarian}; foreach my $module ( keys %$flagsrequired ) { - if (C4::Context->preference('GranularPermissions')) { - my $subperm = $flagsrequired->{$module}; - if ($subperm eq '*') { - return 0 unless ( $flags->{$module} == 1 or ref($flags->{$module}) ); - } else { - return 0 unless ( $flags->{$module} == 1 or - ( ref($flags->{$module}) and - exists $flags->{$module}->{$subperm} and - $flags->{$module}->{$subperm} == 1 - ) - ); - } + my $subperm = $flagsrequired->{$module}; + if ($subperm eq '*') { + return 0 unless ( $flags->{$module} == 1 or ref($flags->{$module}) ); } else { - return 0 unless ( $flags->{$module} ); + return 0 unless ( $flags->{$module} == 1 or + ( ref($flags->{$module}) and + exists $flags->{$module}->{$subperm} and + $flags->{$module}->{$subperm} == 1 + ) + ); } } return $flags; diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index 32acb5b..de05512 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -52,14 +52,10 @@ $searchfield =~ s/\,//g; my $script_name = "/cgi-bin/koha/admin/authorised_values.pl"; my $dbh = C4::Context->dbh; -# my $subpermission = C4::Context->preference('GranularPermissions') ? -# { editcatalogue => ... } : -# { parameters => 1 } ; - my ($template, $borrowernumber, $cookie)= get_template_and_user({ template_name => "admin/authorised_values.tmpl", authnotrequired => 0, - flagsrequired => {parameters => 1}, # soon $subpermission + flagsrequired => {parameters => 1}, query => $input, type => "intranet", debug => 1, diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 6ed5310..9e90d61 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -97,7 +97,6 @@ $tabsysprefs{DebugLevel} = "Admin"; $tabsysprefs{SessionStorage} = "Admin"; $tabsysprefs{noItemTypeImages} = "Admin"; $tabsysprefs{OPACBaseURL} = "Admin"; -$tabsysprefs{GranularPermissions} = "Admin"; # Authorities $tabsysprefs{authoritysep} = "Authorities"; diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql index 276c7cd..2a0be55 100644 --- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql +++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql @@ -184,7 +184,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:ConfFile','','If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode.',NULL,'File'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','1','Allow OPAC users to place hold on specific items. If OFF, users can only request next available copy.','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('GranularPermissions','0','Use detailed staff user permissions',NULL,'YesNo'); INSERT INTO `systempreferences` (variable, value,options,type, explanation) VALUES ('AddPatronLists','categorycode','categorycode|category_type','Choice','Allow user to choose what list to pick up from when adding patrons'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ExtendedPatronAttributes','0','Use extended patron IDs and attributes',NULL,'YesNo'); diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 7060fa2..49a02ea 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -184,7 +184,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:ConfFile','','If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode.',NULL,'File'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','1','Allow OPAC users to place hold on specific items. If OFF, users can only request next available copy.','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('GranularPermissions','0','Use detailed staff user permissions',NULL,'YesNo'); INSERT INTO `systempreferences` (variable, value,options,type, explanation) VALUES ('AddPatronLists','categorycode','categorycode|category_type','Choice','Allow user to choose what list to pick up from when adding patrons'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ExtendedPatronAttributes','0','Use extended patron IDs and attributes',NULL,'YesNo'); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql index d6d6dc6..76db9c9 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql @@ -187,7 +187,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('CircControl',"ItemHomeLibrary",'Pr??cise la biblioth??que qui contr??le les r??gles de pr??t et d''amende',"PickupLibrary|PatronLibrary|ItemHomeLibrary",'Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','1','Si activ??, les adh??rents peuvent placer des r??servations sur un exemplaire sp??cifique. Sinon, il ne peuvent que r??server le prochain disponible.','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('GranularPermissions','0','Utiliser les permissions d??taill??es',NULL,'YesNo'); INSERT INTO `systempreferences` (variable, value,options,type, explanation) VALUES ('AddPatronLists','categorycode','categorycode|category_type','Choice','Slectionner categorycode ou category_type permet d''afficher la liste des cat??gories ou des types de cat??gories ?? l''ajout d''un lecteur'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ExtendedPatronAttributes','0','Utiliser les attributs ??tendus pour les adh??rents',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RenewSerialAddsSuggestion','0','Si activ??, g??n??re une suggestion d''achat ?? chaque Renouvellement d''abonnement',NULL,'YesNo'); diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql index 54f4194..3707294 100644 --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql @@ -185,7 +185,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:Subset','itemtype=\'BOOK\'','Restrict answer to matching raws of the biblioitems table EXPERIMENTAL',NULL,'Free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','1','Allow OPAC users to place hold on specific items. If OFF, users can only request next available copy.','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('GranularPermissions','0','Use detailed staff user permissions',NULL,'YesNo'); INSERT INTO `systempreferences` (variable, value,options,type, explanation) VALUES ('AddPatronLists','categorycode','categorycode|category_type','Choice','Allow user to choose what list to pick up from when adding patrons'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ExtendedPatronAttributes','0','Use extended patron IDs and attributes',NULL,'YesNo'); diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql index 0f8dd9f..2edbe10 100644 --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -213,7 +213,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:Subset','itemtype=\'BOOK\'','Restrict answer to matching raws of the biblioitems table EXPERIMENTAL',NULL,'Free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','1','Allow OPAC users to place hold on specific items. If OFF, users can only request next available copy.','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('GranularPermissions','0','Use detailed staff user permissions',NULL,'YesNo'); INSERT INTO `systempreferences` (variable, value,options,type, explanation) VALUES ('AddPatronLists','categorycode','categorycode|category_type','Choice','Allow user to choose what list to pick up from when adding patrons'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ExtendedPatronAttributes','1','Use extended patron IDs and attributes',NULL,'YesNo'); diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql index dc295d2..5d9ce1a 100644 --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql +++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql @@ -13,8 +13,6 @@ UPDATE systempreferences SET explanation='????????????-?????????????????????? ?? UPDATE systempreferences SET explanation='???????????? ?????????????????????? ???????????????? ?? ??????-????????????????????????' WHERE variable='FrameworksLoaded'; -- Frameworks loaded through webinstaller -UPDATE systempreferences SET explanation='?????????????????????????? ?????????????????????????? ???????????????????? ?????? ????????????????????' WHERE variable='GranularPermissions'; --- Use detailed staff user permissions UPDATE systempreferences SET explanation='???????? ????????????????, ???? ???????????????? ???????????????????????? ?????????? ????????????????????????. ????????????????????????, ?????????? ???????????????????? ???????????????????? ???????? ?????????????????????? ????????.' WHERE variable='IndependantBranches'; -- If ON, increases security between libraries diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql index e45ad31..130b46b 100644 --- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -239,7 +239,6 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OAI-PMH:Subset','itemtype=\'BOOK\'','Restrict answer to matching raws of the biblioitems table EXPERIMENTAL',NULL,'Free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACItemHolds','1','Allow OPAC users to place hold on specific items. If OFF, users can only request next available copy.','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('GranularPermissions','0','Use detailed staff user permissions',NULL,'YesNo'); INSERT INTO `systempreferences` (variable, value,options,type, explanation) VALUES ('AddPatronLists','categorycode','categorycode|category_type','Choice','Allow user to choose what list to pick up from when adding patrons'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ExtendedPatronAttributes','1','Use extended patron IDs and attributes',NULL,'YesNo'); diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql index 5a8bb0d..0c8c523 100644 --- a/installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql +++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql @@ -13,9 +13,6 @@ UPDATE systempreferences SET explanation='????????????-???????????????????? ???? UPDATE systempreferences SET explanation='?????????????? ???????????????????????? ???????????????? ?? ??????-??????????????????????????' WHERE variable='FrameworksLoaded'; -- Frameworks loaded through webinstaller -UPDATE systempreferences SET explanation='???????????????????????? ?????????????????????????? ?????????????????? ?????? ??????????????????????' WHERE variable='GranularPermissions'; --- Use detailed staff user permissions - UPDATE systempreferences SET explanation='???????? ??????????????????, ???? ???????????????? ?????????????? ?????? ????????????????????????. ????????????????????????????????, ???????? ???????????????????? ???????????????????????????? ???????? ???????????????????? ????????.' WHERE variable='IndependantBranches'; -- If ON, increases security between libraries diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index b65bdd1..7ea266e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3642,6 +3642,12 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { } +$DBversion = "3.01.00.138"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("DELETE FROM systempreferences WHERE variable = 'GranularPermissions'"); + print "Upgrade to $DBversion done (bug 4896: removing GranularPermissions syspref; use of granular permissions is now the default)"; + SetVersion ($DBversion); +} =item DropAllForeignKeys($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index 069ea9d..2dbd086 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -71,13 +71,6 @@ Administration: Pg: in the PostgreSQL database (not supported). tmp: as temporary files. - - - Control staff access to pages within Koha based on - - pref: GranularPermissions - default: 0 - choices: - yes: the specific page. - no: the general module (such as administration or circulation). - - - pref: IndependantBranches default: 0 choices: @@ -101,4 +94,4 @@ Administration: - of CAS when logging out of Koha. - - The CAS Authentication Server can be found at - - pref: casServerUrl \ No newline at end of file + - pref: casServerUrl diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tmpl index 6caa517..f0d744e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tmpl @@ -13,17 +13,6 @@ TIP: If a staff member is set to 'superlibrarian' they have access to all functions and do not need any other permissions checked
    • -
  • To give staff members more granular permissions, you can turn on the GranularPermissions system preference -
      -
    • Get there: More > Administration > General preferences > Admin > GranularPermissions
      • -
    • If this setting is on the permissions menu will offer more granual permissions
      • -
    • This allows staff members access to specific tools -
        -
      • - -TIP: If this preference is turned OFF after being ON, the system reverts to the original behavior, although the specific permissions are retained.  This means if a staff member has been given granular permissions they will retain those even if this is turned OFF
        • -
      • -

    • What will each permission level do?

    @@ -37,10 +26,6 @@ TIP: If this preference is turned OFF after being ON, the system reverts to the
  • circulate
    • Ability for logged in user to check books out and back in
      • -
    • With GranularPermissions on this section will be expanded to allow access to specific ciculation functions. -
        -
      • Get there: More > Administration > Global System Preferences > Admin > GranularPermissions
        • -
  • catalog
      @@ -86,10 +71,6 @@ TIP: If this preference is turned OFF after being ON, the system reverts to the
    • tools
      • Use tools (export, import, barcodes)
        • -
      • With GranularPermissions on this section will be expanded to allow access only to specific tools -
          -
        • Get there: More > Administration > Global System Preferences > Admin > GranularPermissions
          • -
    • editauthorities
        @@ -107,4 +88,4 @@ TIP: If this preference is turned OFF after being ON, the system reverts to the
        • Provides the ability to modify login / permissions for staff users
        -
      \ No newline at end of file +
    diff --git a/kohaversion.pl b/kohaversion.pl index e7972f8..8da986b 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -10,7 +10,7 @@ use strict; sub kohaversion { - our $VERSION = '3.01.00.137'; + our $VERSION = '3.01.00.138'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install diff --git a/members/member-flags.pl b/members/member-flags.pl index 749cecc..321e526 100755 --- a/members/member-flags.pl +++ b/members/member-flags.pl @@ -66,19 +66,17 @@ if ($input->param('newflags')) { $sth = $dbh->prepare("UPDATE borrowers SET flags=? WHERE borrowernumber=?"); $sth->execute($module_flags, $member); - if (C4::Context->preference('GranularPermissions')) { - # deal with subpermissions - $sth = $dbh->prepare("DELETE FROM user_permissions WHERE borrowernumber = ?"); - $sth->execute($member); - $sth = $dbh->prepare("INSERT INTO user_permissions (borrowernumber, module_bit, code) - SELECT ?, bit, ? - FROM userflags - WHERE flag = ?"); - foreach my $module (keys %sub_perms) { - next if exists $all_module_perms{$module}; - foreach my $sub_perm (@{ $sub_perms{$module} }) { - $sth->execute($member, $sub_perm, $module); - } + # deal with subpermissions + $sth = $dbh->prepare("DELETE FROM user_permissions WHERE borrowernumber = ?"); + $sth->execute($member); + $sth = $dbh->prepare("INSERT INTO user_permissions (borrowernumber, module_bit, code) + SELECT ?, bit, ? + FROM userflags + WHERE flag = ?"); + foreach my $module (keys %sub_perms) { + next if exists $all_module_perms{$module}; + foreach my $sub_perm (@{ $sub_perms{$module} }) { + $sth->execute($member, $sub_perm, $module); } } @@ -104,53 +102,51 @@ if ($input->param('newflags')) { checked => $checked, flagdesc => $flagdesc ); - if (C4::Context->preference('GranularPermissions')) { - my @sub_perm_loop = (); - my $expand_parent = 0; - if ($checked) { - if (exists $all_perms->{$flag}) { - $expand_parent = 1; - foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) { - push @sub_perm_loop, { - id => "${flag}_$sub_perm", - perm => "$flag:$sub_perm", - code => $sub_perm, - description => $all_perms->{$flag}->{$sub_perm}, - checked => 1 - }; - } + my @sub_perm_loop = (); + my $expand_parent = 0; + if ($checked) { + if (exists $all_perms->{$flag}) { + $expand_parent = 1; + foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) { + push @sub_perm_loop, { + id => "${flag}_$sub_perm", + perm => "$flag:$sub_perm", + code => $sub_perm, + description => $all_perms->{$flag}->{$sub_perm}, + checked => 1 + }; } - } else { - if (exists $user_perms->{$flag}) { - $expand_parent = 1; - # put selected ones first - foreach my $sub_perm (sort keys %{ $user_perms->{$flag} }) { - push @sub_perm_loop, { - id => "${flag}_$sub_perm", - perm => "$flag:$sub_perm", - code => $sub_perm, - description => $all_perms->{$flag}->{$sub_perm}, - checked => 1 - }; - } + } + } else { + if (exists $user_perms->{$flag}) { + $expand_parent = 1; + # put selected ones first + foreach my $sub_perm (sort keys %{ $user_perms->{$flag} }) { + push @sub_perm_loop, { + id => "${flag}_$sub_perm", + perm => "$flag:$sub_perm", + code => $sub_perm, + description => $all_perms->{$flag}->{$sub_perm}, + checked => 1 + }; } - # then ones not selected - if (exists $all_perms->{$flag}) { - foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) { - push @sub_perm_loop, { - id => "${flag}_$sub_perm", - perm => "$flag:$sub_perm", - code => $sub_perm, - description => $all_perms->{$flag}->{$sub_perm}, - checked => 0 - } unless exists $user_perms->{$flag} and exists $user_perms->{$flag}->{$sub_perm}; - } + } + # then ones not selected + if (exists $all_perms->{$flag}) { + foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) { + push @sub_perm_loop, { + id => "${flag}_$sub_perm", + perm => "$flag:$sub_perm", + code => $sub_perm, + description => $all_perms->{$flag}->{$sub_perm}, + checked => 0 + } unless exists $user_perms->{$flag} and exists $user_perms->{$flag}->{$sub_perm}; } } - $row{expand} = $expand_parent; - if ($#sub_perm_loop > -1) { + } + $row{expand} = $expand_parent; + if ($#sub_perm_loop > -1) { $row{sub_perm_loop} = \@sub_perm_loop; - } } push @loop, \%row; } diff --git a/svc/config/systempreferences b/svc/config/systempreferences index 6fe714a..8622f6a 100755 --- a/svc/config/systempreferences +++ b/svc/config/systempreferences @@ -83,9 +83,9 @@ pref_$pref1=$value1&pref_$pref2=$value2 Used to set several system preferences at once. Each preference you want to set should be sent prefixed with pref. If you wanted to turn off the -GranularPermissions syspref, for instance, you would POST the following: +virtualshelves syspref, for instance, you would POST the following: -pref_GranularPermissions=0 +pref_virtualshelves=0 =cut -- 1.7.0 From colin.campbell at ptfs-europe.com Fri Jun 25 11:46:51 2010 From: colin.campbell at ptfs-europe.com (Colin Campbell) Date: Fri, 25 Jun 2010 10:46:51 +0100 Subject: [Koha-patches] [PATCH] Bug 4911 Remove duplicated code Message-ID: <1277459211-4648-1-git-send-email-colin.campbell@ptfs-europe.com> Two duplicated subroutine definitions removed --- reports/guided_reports.pl | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index d519423..269f7a8 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -601,18 +601,6 @@ sub header_cell_loop { return \@headers; } -# pass $sth, get back an array of names for the column headers -sub header_cell_values { - my $sth = shift or return (); - return @{$sth->{NAME}}; -} - -# pass $sth, get back a TMPL_LOOP-able set of names for the column headers -sub header_cell_loop { - my @headers = map { +{ cell => $_ } } header_cell_values (shift); - return \@headers; -} - foreach (1..6) { $template->param('build' . $_) and $template->param(buildx => $_) and last; } -- 1.7.0.1 From oleonard at myacpl.org Fri Jun 25 15:48:20 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 25 Jun 2010 09:48:20 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 4909 - extra > in path on contracts pages Message-ID: <1277473700-13473-1-git-send-email-oleonard@myacpl.org> The logic for displaying a useful title did not take all cases into account. This patch adds the missing case. The patch also fixes problems with the "Cancel" link on update and delete operations. --- .../prog/en/modules/admin/aqcontract.tmpl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl index 43ffa38..20c79e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl @@ -4,6 +4,7 @@ Modify contract '' New contract +Contracts of Data recorded Confirm Deletion of Contract '' Contract Deleted @@ -167,7 +168,7 @@ function Check(ff) { " /> " /> - Cancel + &contractnumber=">Cancel
    • @@ -210,7 +211,7 @@ function Check(ff) { - ?op=add_form&contractnumber="> + ?op=add_form&booksellerid=&contractnumber="> -- 1.7.0.4 From oleonard at myacpl.org Fri Jun 25 18:26:39 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 25 Jun 2010 12:26:39 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 3372 - OPAC Reading History sorting breaks limit Message-ID: <1277483199-14347-1-git-send-email-oleonard@myacpl.org> Some other cosmetic and functional changes: - "Show all/Show 50" links had been styled as tabs at some time in the past. A CSS change somewhere broke this. Reimplementing it. - Moving sort control to a method better reflected the behavior of this re-sort. --- .../prog/en/modules/opac-readingrecord.tmpl | 38 +++++++++++++------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl index 70b27f6..250a77a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl @@ -1,12 +1,17 @@ Catalog › Account for - +
    @@ -23,26 +28,35 @@ $(document).ready(function(){ You have never borrowed anything from this library.
    -
      + +
      + +
      + + -
      +
      - + - + -- 1.7.0.4 From oleonard at myacpl.org Fri Jun 25 18:59:15 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 25 Jun 2010 12:59:15 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 3683 - 'Sort by' column in list interface is not translatable Message-ID: <1277485155-14597-1-git-send-email-oleonard@myacpl.org> --- C4/VirtualShelves/Page.pm | 7 +++++++ .../prog/en/modules/virtualshelves/shelves.tmpl | 4 ++-- .../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 6 ++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm index f76047d..73ca42d 100644 --- a/C4/VirtualShelves/Page.pm +++ b/C4/VirtualShelves/Page.pm @@ -302,6 +302,13 @@ sub shelfpage ($$$$$) { my $category = $shelflist->{$element}->{'category'}; my $owner = $shelflist->{$element}->{'owner'}; my $canmanage = ShelfPossibleAction( $loggedinuser, $element, 'manage' ); + my $sortfield = $shelflist->{$element}->{'sortfield'}; + if ( $sortfield eq 'author' ) { + $shelflist->{$element}->{"authorsort"} = 'author'; + } + if ( $sortfield eq 'year' ) { + $shelflist->{$element}->{"yearsort"} = 'year'; + } $shelflist->{$element}->{"viewcategory$category"} = 1; $shelflist->{$element}->{manageshelf} = $canmanage; if ( $owner eq $loggedinuser or $canmanage ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl index 3f7b387..62ee69a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -347,7 +347,7 @@ function placeHold () { - + - + - + - + -
      TitleTitleTitle Item Type Call No.DateDateDate
      display=privateshelves&viewshelf="> item(s)AuthorYearTitle Private Public Open @@ -398,7 +398,7 @@ function placeHold () {
      "> item(s)AuthorYearTitle Private Public Open diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl index 1063eec..bb2078a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -376,7 +376,8 @@ $(function() { &sortfield="> item(s)AuthorYearTitle + Private Public @@ -444,7 +445,8 @@ $(function() { &sortfield="> item(s)AuthorYearTitle + Private Public -- 1.7.0.4 From oleonard at myacpl.org Fri Jun 25 21:06:36 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 25 Jun 2010 15:06:36 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 4912 - After editing private list redirect to private lists Message-ID: <1277492796-15285-1-git-send-email-oleonard@myacpl.org> --- .../prog/en/modules/virtualshelves/shelves.tmpl | 6 +++++- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 5 ++++- .../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl index 62ee69a..44513c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -274,6 +274,7 @@ function placeHold () { + " /> Edit List
        @@ -306,7 +307,9 @@ function placeHold () { -
        Cancel
        +
        + CancelCancel +
        @@ -360,6 +363,7 @@ function placeHold () {
        " /> +
        diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 5142dd2..e1fcb49 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -572,7 +572,10 @@ input.deleteshelf { } -#toolbar input.editshelf:active,input.deleteshelf:active { +#toolbar input.editshelf:active, +input.editshelf:active, +#toolbar input.deleteshelf:active, +input.deleteshelf:active { border : 0; } diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl index bb2078a..931502e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -306,6 +306,7 @@ $(function() {

        Lists /../images/caret.gif" width="16" height="16" alt=">" border="0" /> "> /../images/caret.gif" width="16" height="16" alt=">" border="0" /> Editing

        + " />
          @@ -327,7 +328,7 @@ $(function() {
        -
        ">Cancel
        +
        &display=privateshelves">Cancel">Cancel
        -- 1.7.0.4 From oleonard at myacpl.org Fri Jun 25 21:47:40 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 25 Jun 2010 15:47:40 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 4913 - Budget pages should show currency name instead of symbol Message-ID: <1277495260-16342-1-git-send-email-oleonard@myacpl.org> This patch adds a new include file to handle the display of the active currency name and a warning if no currency is active. --- admin/aqbudgetperiods.pl | 4 +++- admin/aqbudgets.pl | 4 +++- admin/aqplan.pl | 5 +++-- .../prog/en/includes/budgets-active-currency.inc | 1 + .../prog/en/modules/admin/aqbudgetperiods.tmpl | 4 +++- .../prog/en/modules/admin/aqbudgets.tmpl | 6 +++--- .../prog/en/modules/admin/aqplan.tmpl | 2 +- 7 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl index 62383f1..39f3cd0 100755 --- a/admin/aqbudgetperiods.pl +++ b/admin/aqbudgetperiods.pl @@ -82,7 +82,9 @@ my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user( my $cur = GetCurrency(); -$template->param( cur => $cur->{symbol} ); +$template->param( symbol => $cur->{symbol}, + currency => $cur->{currency} + ); my $cur_format = C4::Context->preference("CurrencyFormat"); my $num; diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index 95f5f26..6142f69 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -52,7 +52,9 @@ my ($template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user( ); my $cur = GetCurrency(); -$template->param( cur => $cur->{symbol} ); +$template->param( symbol => $cur->{symbol}, + currency => $cur->{currency} + ); my $op = $input->param('op'); diff --git a/admin/aqplan.pl b/admin/aqplan.pl index da47179..6d6bd35 100755 --- a/admin/aqplan.pl +++ b/admin/aqplan.pl @@ -60,7 +60,9 @@ my $budget_period_id = $input->param('budget_period_id'); my $period = GetBudgetPeriod($budget_period_id); my $count = GetPeriodsCount(); my $cur = GetCurrency; - +$template->param( symbol => $cur->{symbol}, + currency => $cur->{currency} + ); $template->param( period_button_only => 1 ) if $count == 0; @@ -452,7 +454,6 @@ $template->param( show_actual => $show_actual, show_percent => $show_percent, show_mine => $show_mine, - cur => $cur->{symbol}, cur_format => $cur_format, CGIextChoice => $CGIextChoice, CGIsepChoice => $CGIsepChoice, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc new file mode 100644 index 0000000..a4571f9 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc @@ -0,0 +1 @@ +

        Currency =

        No active currency is defined

        Please specify an active currency.

        \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl index 204574b..e09da73 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl @@ -254,7 +254,9 @@

        Budgets administration

        -

        Currency =

        No active currency is defined

        Please specify an active currency.

        + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl index ce4d7da..1be8c73 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl @@ -157,9 +157,10 @@ -

        No active currency is defined

        Please specify an active currency.

        -

        Funds for ''

        + + +
        @@ -240,7 +241,6 @@
        -

        Currency =

        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl index 627b3f7..cae1a90 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl @@ -139,7 +139,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () { -

        Currency =

        No active currency is defined

        Please specify an active currency.

        + -- 1.7.0.4 From gcollum at gmail.com Sat Jun 26 02:08:40 2010 From: gcollum at gmail.com (Garry Collum) Date: Fri, 25 Jun 2010 20:08:40 -0400 Subject: [Koha-patches] [PATCH] Bug 2670: Removes EXPR from opac-userupdate.tmpl Message-ID: <1277510920-3160-1-git-send-email-gcollum@gmail.com> --- .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl | 8 ++++---- opac/opac-userupdate.pl | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl index bb0a473..364ac43 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl @@ -65,8 +65,8 @@
        1. " name="dateofbirth" />
        @@ -123,8 +123,8 @@
        1. Date of Birth:
        2. Sex: -Female -Male +Female +Male
        diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl index d15e740..a89fccb 100755 --- a/opac/opac-userupdate.pl +++ b/opac/opac-userupdate.pl @@ -152,6 +152,13 @@ $borr->{'dateexpiry'} = format_date( $borr->{'dateexpiry'} ); $borr->{'dateofbirth'} = format_date( $borr->{'dateofbirth'} ); $borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} ); +if($borr->{'sex'} eq 'F') { + $borr->{'sex_female'} = 'F'; +} +if($borr->{'sex'} eq 'M') { + $borr->{'sex_male'} = 'M'; +} + if (C4::Context->preference('ExtendedPatronAttributes')) { my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber, 'opac'); if (scalar(@$attributes) > 0) { -- 1.5.6.5 From oleonard at myacpl.org Mon Jun 28 16:01:47 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Mon, 28 Jun 2010 10:01:47 -0400 Subject: [Koha-patches] [PATCH] More comprehensive fixes for Bug 3850 - Budget Planning Pages Need Design Work Message-ID: <1277733707-3092-1-git-send-email-oleonard@myacpl.org> - Filter moved to left-hand sidebar consistent with other pages - Export option moved to left-hand sidebar to improve visibility - Show/hide column controls moved to their own role with clear labels - "Locked" icon added to replace indicating locked status by row color --- .../prog/en/modules/admin/aqplan.tmpl | 229 +++++++++++--------- koha-tmpl/intranet-tmpl/prog/img/locked.png | Bin 0 -> 822 bytes 2 files changed, 121 insertions(+), 108 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/img/locked.png diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl index 627b3f7..3871b0e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl @@ -1,8 +1,8 @@ -Koha › Administration › Budgets › Budget planning +Koha › Administration › Budgets › Funds › Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" --> - + - + @@ -74,8 +73,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () { Home › Administration › Budgets › - ">Funds › - ">Planning › + ">Funds › Planning for by
        @@ -86,60 +84,28 @@ YAHOO.util.Event.onAvailable("popmenu", function () { -
        +
        +

        Planning for by

        - + -"/> -
        -Planning for by -
        - - - - - - - - - - - -
        - - + + +

        Currency = . + + Each cell contain both actual and estimated values. - + Cells contain estimated values only. - -

        		- - - -
        - - +

        No active currency is defined

        Please specify an active currency.

        + +

        Each cell contain both actual and estimated values.

        - - - -
        - - - - - - -
        - - -
        - - +

        Cells contain estimated values only.

        + + - -

        Currency =

        No active currency is defined

        Please specify an active currency.

        @@ -149,38 +115,43 @@ YAHOO.util.Event.onAvailable("popmenu", function () { - - + - - - + + + + + + + + + + - - - - - + - - + + @@ -191,15 +162,15 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
        " style="text-align: center;" - class="" > + " class=""> - " style="text-align: center; - display:none;" - class="" > + " styl="display:none;" class=""> -  ', '')" > -   Fund remaining - + Fund remaining 
          "> + + [ show a column ] 
          + + class="locked" title="Fund locked">">  -
        - + - @@ -212,32 +183,32 @@ YAHOO.util.Event.onAvailable("popmenu", function () { - -
        +   - " /> + " value="" /> - " id='budget_' class='plan_entry_' onchange="calcTotalRow(this);" /> + " value="" id="budget_" class="plan_entry_" onchange="calcTotalRow(this);" />
        + - + - + - + + "> - + "> - - -   + "> + +  
      		+ ')" value="Auto-fill row"/> @@ -249,19 +220,14 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
      - - Each cell contain both actual and estimated values.
      - - Cells contain estimated values only.
      - - + - +
      -
      +
      @@ -274,26 +240,73 @@ YAHOO.util.Event.onAvailable("popmenu", function () { + +
      No funds to display for this search criteria
      + + + +
      +
      +
      + +
      +
      +

      Filter

      + +
        +
      1. + + +
        2. +
      2. + + + + + + +
        3. + +
      3. + + + + + + +
        4. + + +
      4. + + + + + + +
        5. +
      +
      +
      +
      +
      +
      -
      +

      Export

      +
        -
      1. -
        3. +
      3. -     - +
        4. +
      +
      " /> - - +
      + - -No funds to display for this search criteria - - - -
    diff --git a/koha-tmpl/intranet-tmpl/prog/img/locked.png b/koha-tmpl/intranet-tmpl/prog/img/locked.png new file mode 100644 index 0000000000000000000000000000000000000000..65eadeddf227d762c500ce1c39328c2f34db2ca5 GIT binary patch literal 822 zcmeAS at N?(olHy`uVBq!ia0vp^AT~b-Gmw0xxXuPhv7|ftIx;YR|DNig)WpGT%PfAtr%uP&B4N6T+sVqF13e?1y9pDq<`t%C{rdOs-*Wuxka>T{n{4pW3MN>(ipA*P_mD(f#rB z$G&ZqSFT?E^6}w^$5ofETzma=!;5Qn`*t>+-K=(eqs^{8J6^qhb#}Mvxve^9wgtYw zZTR5f;}=(r9$$2O^!U-moys>4vtK)vdVHhjozs?QcJQ6wDs%0q<*}nX_b!(B^=bX_ z_2w^c#h%$9{_*9i6Q_d9l+rj|6ee`4_gly|R-i2jt9w at D)VJ5 There is no visible Lists button to "attach" our warning to as there is in the OPAC, so warning message is displayed via a javascript alert. --- koha-tmpl/intranet-tmpl/prog/en/js/basket.js | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js index 8a0bd20..0ab6711 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js @@ -210,9 +210,7 @@ function showCartUpdate(msg){ function showListsUpdate(msg){ // set body of popup window - $("#listsDetails").html(msg); - showLists(); - setTimeout("hideLists()",2000); + alert(msg); } function selRecord(num, status) { -- 1.7.0.4 From oleonard at myacpl.org Mon Jun 28 17:53:08 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Mon, 28 Jun 2010 11:53:08 -0400 Subject: [Koha-patches] [PATCH] Corrected patch for Bug 4520, facets "show more" doesn't work Message-ID: <1277740388-4160-1-git-send-email-oleonard@myacpl.org> Re-doing Nahuel's fix so that it applies to master --- catalogue/search.pl | 1 + .../intranet-tmpl/prog/en/includes/facets.inc | 2 +- .../opac-tmpl/prog/en/includes/opac-facets.inc | 2 +- opac/opac-search.pl | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 920afb7..c33e4f7 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -543,6 +543,7 @@ for (my $i=0;$i<@servers;$i++) { $template->param(query_cgi => $query_cgi); $template->param(query_desc => $query_desc); $template->param(limit_desc => $limit_desc); + $template->param(offset => $offset); $template->param(DisplayMultiPlaceHold => $DisplayMultiPlaceHold); $template->param (z3950_search_params => C4::Search::z3950_search_args($query_desc)); if ($query_desc || $limit_desc) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index ff67047..c306c89 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -18,7 +18,7 @@ Libraries diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc index e272906..85719f3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc @@ -19,7 +19,7 @@ diff --git a/opac/opac-search.pl b/opac/opac-search.pl index a142cb1..556e623 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -535,6 +535,7 @@ for (my $i=0;$i<=@servers;$i++) { $template->param(query_cgi => $query_cgi); $template->param(query_desc => $query_desc); $template->param(limit_desc => $limit_desc); + $template->param(offset => $offset); $template->param(DisplayMultiPlaceHold => $DisplayMultiPlaceHold); if ($query_desc || $limit_desc) { $template->param(searchdesc => 1); -- 1.7.0.4 From tajoli at cilea.it Mon Jun 28 18:24:17 2010 From: tajoli at cilea.it (Zeno Tajoli) Date: Mon, 28 Jun 2010 18:24:17 +0200 Subject: [Koha-patches] [PATCH] [3.0.x] [bug 4914] var status in C4/Output.pm Message-ID: <1277742257-15158-1-git-send-email-tajoli@cilea.it> --- C4/Output.pm | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/C4/Output.pm b/C4/Output.pm index 0bb71b4..1fb5d41 100644 --- a/C4/Output.pm +++ b/C4/Output.pm @@ -388,7 +388,6 @@ sub output_html_with_http_headers ($$$;$$) { $content_type = "text/html" unless $content_type =~ m!/!; # very basic sanity check print $query->header( - -status => $status, -type => $content_type, -charset => 'UTF-8', -cookie => $cookie, -- 1.5.3.7 From Katrin.Fischer.83 at web.de Mon Jun 28 22:11:37 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 28 Jun 2010 22:11:37 +0200 Subject: [Koha-patches] [PATCH] Correct typo in German sample news Message-ID: <1277755897-22962-1-git-send-email-Katrin.Fischer.83@web.de> --- .../data/mysql/de-DE/optional/sample_news.sql | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/installer/data/mysql/de-DE/optional/sample_news.sql b/installer/data/mysql/de-DE/optional/sample_news.sql index c12fa3f..0d4c922 100644 --- a/installer/data/mysql/de-DE/optional/sample_news.sql +++ b/installer/data/mysql/de-DE/optional/sample_news.sql @@ -1,2 +1,2 @@ -INSERT INTO `opac_news` VALUES (1,'Willkommen bei Koha','Willkommen bei Koha. Koha ist vollst?ndiges integriertes Biblitohekssystem. Es wurde urspr?nglich in Neuseeland von Katipo Communications Ltd entwickelt und ging im Januar 2000 f?r den Horowhenua Library Trust zum ersten mal in Produktion. Koha wird heute von einem internationalen Team aus Support-Dienstleistern und Anwendern weiterentwickelt.','koha','2007-10-29 05:25:58','2099-01-10',1), +INSERT INTO `opac_news` VALUES (1,'Willkommen bei Koha','Willkommen bei Koha. Koha ist vollst?ndiges integriertes Bibliothekssystem. Es wurde urspr?nglich in Neuseeland von Katipo Communications Ltd entwickelt und ging im Januar 2000 f?r den Horowhenua Library Trust zum ersten mal in Produktion. Koha wird heute von einem internationalen Team aus Support-Dienstleistern und Anwendern weiterentwickelt.','koha','2007-10-29 05:25:58','2099-01-10',1), (2,'Was kommt jetzt?','Wie geht es weiter, nachdem Sie Koha installiert haben? Hier einige Vorschl?ge:\r\n\r\n','koha','2007-10-29 05:34:45','2099-01-10',2); \ No newline at end of file -- 1.6.3.3 From Katrin.Fischer.83 at web.de Mon Jun 28 22:49:43 2010 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 28 Jun 2010 22:49:43 +0200 Subject: [Koha-patches] [PATCH] Bug 4915: Remove renewalsallowed from sample_itemtypes.sql Message-ID: <1277758183-23411-1-git-send-email-Katrin.Fischer.83@web.de> --- .../data/mysql/de-DE/optional/sample_itemtypes.sql | 16 +++--- .../data/mysql/en/optional/sample_itemtypes.sql | 16 +++--- .../mysql/ru-RU/optional/library_item_types.sql | 16 +++--- .../mysql/uk-UA/optional/library_item_types.sql | 50 ++++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/installer/data/mysql/de-DE/optional/sample_itemtypes.sql b/installer/data/mysql/de-DE/optional/sample_itemtypes.sql index 6fbd57a..9c91d27 100644 --- a/installer/data/mysql/de-DE/optional/sample_itemtypes.sql +++ b/installer/data/mysql/de-DE/optional/sample_itemtypes.sql @@ -1,8 +1,8 @@ -INSERT INTO `itemtypes` VALUES ('BK', 'B?cher',5,0,'bridge/book.gif',NULL); -INSERT INTO `itemtypes` VALUES ('MX', 'Medienkombinationen',5,0,'bridge/kit.gif',NULL); -INSERT INTO `itemtypes` VALUES ('CF', 'Datentr?ger',5,0,'bridge/computer_file.gif',NULL); -INSERT INTO `itemtypes` VALUES ('MP', 'Karten',5,0,'bridge/map.gif',NULL); -INSERT INTO `itemtypes` VALUES ('VM', 'AV-Medien',5,0,'bridge/dvd.gif',NULL); -INSERT INTO `itemtypes` VALUES ('MU', 'Musik',5,0,'bridge/sound.gif',NULL); -INSERT INTO `itemtypes` VALUES ('CR', 'Zeitschriften',5,0,'bridge/periodical.gif',NULL); -INSERT INTO `itemtypes` VALUES ('REF', 'Nachschlagewerke',0,0,'',NULL); +INSERT INTO `itemtypes` VALUES ('BK', 'B?cher',5,0,'bridge/book.gif',''); +INSERT INTO `itemtypes` VALUES ('MX', 'Medienkombinationen',5,0,'bridge/kit.gif',''); +INSERT INTO `itemtypes` VALUES ('CF', 'Datentr?ger',5,0,'bridge/computer_file.gif',''); +INSERT INTO `itemtypes` VALUES ('MP', 'Karten',5,0,'bridge/map.gif',''); +INSERT INTO `itemtypes` VALUES ('VM', 'AV-Medien',5,1,'bridge/dvd.gif',''); +INSERT INTO `itemtypes` VALUES ('MU', 'Musik',5,0,'bridge/sound.gif',''); +INSERT INTO `itemtypes` VALUES ('CR', 'Zeitschriften',5,0,'bridge/periodical.gif',''); +INSERT INTO `itemtypes` VALUES ('REF', 'Nachschlagewerke',0,1,'',''); diff --git a/installer/data/mysql/en/optional/sample_itemtypes.sql b/installer/data/mysql/en/optional/sample_itemtypes.sql index 39e0971..76510b4 100644 --- a/installer/data/mysql/en/optional/sample_itemtypes.sql +++ b/installer/data/mysql/en/optional/sample_itemtypes.sql @@ -1,8 +1,8 @@ -INSERT INTO `itemtypes` VALUES ('BK', 'Books',5,0,0,'bridge/book.gif'); -INSERT INTO `itemtypes` VALUES ('MX', 'Mixed Materials',5,0,0,'bridge/kit.gif'); -INSERT INTO `itemtypes` VALUES ('CF', 'Computer Files',5,0,0,'bridge/computer_file.gif'); -INSERT INTO `itemtypes` VALUES ('MP', 'Maps',5,0,0,'bridge/map.gif'); -INSERT INTO `itemtypes` VALUES ('VM', 'Visual Materials',5,0,1,'bridge/dvd.gif'); -INSERT INTO `itemtypes` VALUES ('MU', 'Music',5,0,0,'bridge/sound.gif'); -INSERT INTO `itemtypes` VALUES ('CR', 'Continuing Resources',5,0,0,'bridge/periodical.gif'); -INSERT INTO `itemtypes` VALUES ('REF', 'Reference',0,0,1,''); +INSERT INTO `itemtypes` VALUES ('BK', 'Books',5,0,'bridge/book.gif',''); +INSERT INTO `itemtypes` VALUES ('MX', 'Mixed Materials',5,0,'bridge/kit.gif',''); +INSERT INTO `itemtypes` VALUES ('CF', 'Computer Files',5,0,'bridge/computer_file.gif',''); +INSERT INTO `itemtypes` VALUES ('MP', 'Maps',5,0,'bridge/map.gif',''); +INSERT INTO `itemtypes` VALUES ('VM', 'Visual Materials',5,1,'bridge/dvd.gif',''); +INSERT INTO `itemtypes` VALUES ('MU', 'Music',5,0,'bridge/sound.gif',''); +INSERT INTO `itemtypes` VALUES ('CR', 'Continuing Resources',5,0,'bridge/periodical.gif',''); +INSERT INTO `itemtypes` VALUES ('REF', 'Reference',0,1,'',''); diff --git a/installer/data/mysql/ru-RU/optional/library_item_types.sql b/installer/data/mysql/ru-RU/optional/library_item_types.sql index 8044f06..c21adc9 100644 --- a/installer/data/mysql/ru-RU/optional/library_item_types.sql +++ b/installer/data/mysql/ru-RU/optional/library_item_types.sql @@ -1,17 +1,17 @@ TRUNCATE itemtypes; -INSERT INTO `itemtypes` VALUES ('BK', ' ?????',5,0,0,'bridge/book.gif',''); +INSERT INTO `itemtypes` VALUES ('BK', ' ?????',5,0,'bridge/book.gif',''); -INSERT INTO `itemtypes` VALUES ('MX', '????????? ????????',5,0,0,'bridge/kit.gif',''); +INSERT INTO `itemtypes` VALUES ('MX', '????????? ????????',5,0,'bridge/kit.gif',''); -INSERT INTO `itemtypes` VALUES ('CF', '???????????? ?????',5,0,0,'bridge/computer_file.gif',''); +INSERT INTO `itemtypes` VALUES ('CF', '???????????? ?????',5,0,'bridge/computer_file.gif',''); -INSERT INTO `itemtypes` VALUES ('MP', '?????',5,0,0,'bridge/map.gif',''); +INSERT INTO `itemtypes` VALUES ('MP', '?????',5,0,'bridge/map.gif',''); -INSERT INTO `itemtypes` VALUES ('VM', '?????????? ?????????',5,0,1,'bridge/dvd.gif',''); +INSERT INTO `itemtypes` VALUES ('VM', '?????????? ?????????',5,1,'bridge/dvd.gif',''); -INSERT INTO `itemtypes` VALUES ('MU', '??????',5,0,0,'bridge/sound.gif',''); +INSERT INTO `itemtypes` VALUES ('MU', '??????',5,0,'bridge/sound.gif',''); -INSERT INTO `itemtypes` VALUES ('CR', '?????????????? ???????',5,0,0,'bridge/periodical.gif',''); +INSERT INTO `itemtypes` VALUES ('CR', '?????????????? ???????',5,0,'bridge/periodical.gif',''); -INSERT INTO `itemtypes` VALUES ('REF', '???????????',0,0,1,'',''); +INSERT INTO `itemtypes` VALUES ('REF', '???????????',0,1,'',''); diff --git a/installer/data/mysql/uk-UA/optional/library_item_types.sql b/installer/data/mysql/uk-UA/optional/library_item_types.sql index ff1609c..a064def 100644 --- a/installer/data/mysql/uk-UA/optional/library_item_types.sql +++ b/installer/data/mysql/uk-UA/optional/library_item_types.sql @@ -1,30 +1,30 @@ TRUNCATE itemtypes; -INSERT INTO `itemtypes` (`itemtype`, `description`, `renewalsallowed`, `rentalcharge`, `notforloan`, `imageurl`, `summary`) VALUES -('BOOK', ' ?????', 5,0,0,'bridge/book.gif',''), -('MIX', '??????? ?????????', 5,0,0,'bridge/kit.gif',''), -('FILE', '??????????? ?????', 5,0,0,'bridge/computer_file.gif',''), -('MAP', '?????', 5,0,0,'bridge/map.gif',''), -('VISUAL', '????????? ?????????', 5,0,1,'bridge/dvd.gif',''), -('MUS', '??????', 5,0,0,'bridge/sound.gif',''), -('CONT', '??????????? ???????', 5,0,0,'bridge/periodical.gif',''), -('REF', '?????????', 0,0,1,'',''), -('WEB', '????????-???????', 0,0,1,'',''), -('RARE', '???????? ?????', 0,0,1,'',''), -('DISS', '??????????', 0,0,1,'',''), -('PER', '?????????? ???????', 0,0,0,'bridge/periodical.gif',''), -('ISSUE', '??????/??????? ?????????', 0,0,0,'bridge/periodical.gif',''), -('SERIAL', '????????? ???????', 0,0,0,'',''), -('DISK', '??????????? ?????', 0,0,0,'',''), -('JOURNAL', '???????', 0,0,0,'',''), -('TECH', 'T??????? ?????????', 0,0,0,'',''), -('ARTICLE', '?????? ?????????', 0,0,0,'',''), -('METHOD', '????????? ????????', 0,0,0,'',''), -('CONF', '????????? ???????????', 0,0,0,'',''), -('PART', '???????? ??????? ?????????', 0,0,0,'',''), -('AUDIO', '?????-?????????', 0,0,0,'',''), -('VIDEO', '?????-?????????', 0,0,0,'',''), -('MANUS', '????????', 0,0,1,'','') +INSERT INTO `itemtypes` (`itemtype`, `description`, `rentalcharge`, `notforloan`, `imageurl`, `summary`) VALUES +('BOOK', ' ?????', 0,0,'bridge/book.gif',''), +('MIX', '??????? ?????????', 0,0,'bridge/kit.gif',''), +('FILE', '??????????? ?????', 0,0,'bridge/computer_file.gif',''), +('MAP', '?????', 0,0,'bridge/map.gif',''), +('VISUAL', '????????? ?????????', 0,1,'bridge/dvd.gif',''), +('MUS', '??????', 0,0,'bridge/sound.gif',''), +('CONT', '??????????? ???????', 0,0,'bridge/periodical.gif',''), +('REF', '?????????', 0,1,'',''), +('WEB', '????????-???????', 0,1,'',''), +('RARE', '???????? ?????', 0,1,'',''), +('DISS', '??????????', 0,1,'',''), +('PER', '?????????? ???????', 0,0,'bridge/periodical.gif',''), +('ISSUE', '??????/??????? ?????????', 0,0,'bridge/periodical.gif',''), +('SERIAL', '????????? ???????', 0,0,'',''), +('DISK', '??????????? ?????', 0,0,'',''), +('JOURNAL', '???????', 0,0,'',''), +('TECH', 'T??????? ?????????', 0,0,'',''), +('ARTICLE', '?????? ?????????', 0,0,'',''), +('METHOD', '????????? ????????', 0,0,'',''), +('CONF', '????????? ???????????', 0,0,'',''), +('PART', '???????? ??????? ?????????', 0,0,'',''), +('AUDIO', '?????-?????????', 0,0,'',''), +('VIDEO', '?????-?????????', 0,0,'',''), +('MANUS', '????????', 0,1,'','') ; # itemtype - ??? ????, # description - ????, -- 1.6.3.3 From nahuel.angelinetti at biblibre.com Tue Jun 29 11:24:27 2010 From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI) Date: Tue, 29 Jun 2010 11:24:27 +0200 Subject: [Koha-patches] [PATCH] (bug #4916) permit tools/cleanborrowers.pl to be used by command line Message-ID: <1277803467-2810-1-git-send-email-nahuel.angelinetti@biblibre.com> This patchs adds the possibility to run the script by command line. --- tools/cleanborrowers.pl | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl index 1a6c9bc..8cdea2b 100755 --- a/tools/cleanborrowers.pl +++ b/tools/cleanborrowers.pl @@ -40,6 +40,75 @@ use C4::Dates qw/format_date format_date_in_iso/; use C4::Members; # GetBorrowersWhoHavexxxBorrowed. use C4::Circulation; # AnonymiseIssueHistory. use Date::Calc qw/Today Add_Delta_YM/; +use Getopt::Long; + +if ( scalar @ARGV > 0 ) { + my ($untildate, $delete, $full, $anonymize, $help, $test); + my ($totalDel, $totalAno, $membersToDelete, $membersToAnonymize) = (0,0,0,0); + GetOptions( 'until=s' => \$untildate, + 'delete' => \$delete, + 'anonymize' => \$anonymize, + 'full' => \$full, + 'help|h' => \$help, + 'test|t' => \$test, + ); + + if($help or not $untildate){ + print <{'borrowernumber'} ); + } + }else{ + foreach my $member (@$membersToDelete){ + MoveMemberToDeleted( $member->{'borrowernumber'} ); + DelMember( $member->{'borrowernumber'} ); + } + } + } + + if($anonymize){ + print "Anonimyzing check-out history...\n"; + AnonymiseIssueHistory($untildate); + } + + print "Cleaning borrowers successfully finished.\n"; + exit; +} my $cgi = new CGI; -- 1.7.0.4 From tajoli at cilea.it Tue Jun 29 14:52:54 2010 From: tajoli at cilea.it (Zeno Tajoli) Date: Tue, 29 Jun 2010 14:52:54 +0200 Subject: [Koha-patches] [PATCH] [3.0.x] [bug 4917] Fixes about italian sql files. In-Reply-To: tajoli@cilea.it References: tajoli@cilea.it Message-ID: <1277815974-21883-1-git-send-email-tajoli@cilea.it> This patch fixes wrong translations in the files unimarc_framework.txt and subtag_registry.txt --- .../unimarc/necessari/unimarc_framework.txt | 4 ++-- .../data/mysql/it-IT/necessari/subtag_registry.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/it-IT/marcflavour/unimarc/necessari/unimarc_framework.txt b/installer/data/mysql/it-IT/marcflavour/unimarc/necessari/unimarc_framework.txt index 4f70bb9..ac1ef7e 100644 --- a/installer/data/mysql/it-IT/marcflavour/unimarc/necessari/unimarc_framework.txt +++ b/installer/data/mysql/it-IT/marcflavour/unimarc/necessari/unimarc_framework.txt @@ -2,13 +2,13 @@ Definizioni del framework Unimarc (dati bibliografici e campi 9xx) in italiano. Sono presenti, in questo setup di default, questi frameworks: -Defaulut, codice '', generico per ogni materiale +Default, codice '', generico per ogni materiale Monografie, codice 'MN', specifico per le monografie Risorse in continuazione, codice 'PR', specifico per seriali e periodici Le tabelle di gestione bibliografica/copie In Koha i dati bibliografi e quelli delle copie vengono messi in tre tabelle, i dati di -partenza venhono registrati in campi blog sia in XML che in IS0 2709 +partenza vengono registrati in campi blog sia in XML che in IS0 2709 Le tre tabelle sono: -- biblio -- biblioitems diff --git a/installer/data/mysql/it-IT/necessari/subtag_registry.txt b/installer/data/mysql/it-IT/necessari/subtag_registry.txt index eac5e58..5dc9d53 100644 --- a/installer/data/mysql/it-IT/necessari/subtag_registry.txt +++ b/installer/data/mysql/it-IT/necessari/subtag_registry.txt @@ -1,5 +1,5 @@ Supporto I18N di Koha Gestione lingue scritte da destra (Arabo ed Ebraico). -Configurazione di default between alfabeto e codici di lingua -Estensioni di lingua +Collegamenti predefinti tra alfabeti e codici di lingua ISO +Estensioni delle lingue -- 1.5.3.7 From nengard at bywatersolutions.com Tue Jun 29 12:22:29 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Tue, 29 Jun 2010 06:22:29 -0400 Subject: [Koha-patches] [PATCH] bug 2434 followup patch to remove EVENT from message_transports Message-ID: <1277806949-2416-1-git-send-email-nengard@bywatersolutions.com> --- .../optional/sample_notices_message_transports.sql | 2 -- .../optional/sample_notices_message_transports.sql | 2 -- .../sample_notices_message_transports.sql | 2 -- .../optional/sample_notices_message_transports.sql | 2 -- .../optional/sample_notices_message_transports.sql | 2 -- .../optional/sample_notices_message_transports.sql | 2 -- installer/data/mysql/updatedatabase.pl | 7 +++++++ 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/installer/data/mysql/de-DE/optional/sample_notices_message_transports.sql b/installer/data/mysql/de-DE/optional/sample_notices_message_transports.sql index 65d08d9..ae68378 100644 --- a/installer/data/mysql/de-DE/optional/sample_notices_message_transports.sql +++ b/installer/data/mysql/de-DE/optional/sample_notices_message_transports.sql @@ -5,13 +5,11 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (4, 'email', 0, 'reserves', 'HOLD'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/en/optional/sample_notices_message_transports.sql b/installer/data/mysql/en/optional/sample_notices_message_transports.sql index 65d08d9..ae68378 100644 --- a/installer/data/mysql/en/optional/sample_notices_message_transports.sql +++ b/installer/data/mysql/en/optional/sample_notices_message_transports.sql @@ -5,13 +5,11 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (4, 'email', 0, 'reserves', 'HOLD'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.sql index 65d08d9..ae68378 100644 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.sql +++ b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.sql @@ -5,13 +5,11 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (4, 'email', 0, 'reserves', 'HOLD'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/pl-PL/optional/sample_notices_message_transports.sql b/installer/data/mysql/pl-PL/optional/sample_notices_message_transports.sql index 65d08d9..ae68378 100644 --- a/installer/data/mysql/pl-PL/optional/sample_notices_message_transports.sql +++ b/installer/data/mysql/pl-PL/optional/sample_notices_message_transports.sql @@ -5,13 +5,11 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (4, 'email', 0, 'reserves', 'HOLD'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/ru-RU/optional/sample_notices_message_transports.sql b/installer/data/mysql/ru-RU/optional/sample_notices_message_transports.sql index 8ed8c1e..ade4d03 100644 --- a/installer/data/mysql/ru-RU/optional/sample_notices_message_transports.sql +++ b/installer/data/mysql/ru-RU/optional/sample_notices_message_transports.sql @@ -7,12 +7,10 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/uk-UA/optional/sample_notices_message_transports.sql b/installer/data/mysql/uk-UA/optional/sample_notices_message_transports.sql index 8ed8c1e..ade4d03 100644 --- a/installer/data/mysql/uk-UA/optional/sample_notices_message_transports.sql +++ b/installer/data/mysql/uk-UA/optional/sample_notices_message_transports.sql @@ -7,12 +7,10 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 0569d6d..3297227 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3670,6 +3670,13 @@ if (C4::Context->preference('Version') < TransformToNum($DBversion)){ SetVersion ($DBversion); } +$DBversion = 'XXX'; +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ + $dbh->do(qq{DELETE FROM message_transports WHERE message_attribute_id=3;}); + print "Upgrade to $DBversion done Remove upcoming events messaging option part 2 (bug 2434)"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) -- 1.5.6.5 From dpavlin at rot13.org Wed Jun 30 13:53:08 2010 From: dpavlin at rot13.org (Dobrica Pavlinusic) Date: Wed, 30 Jun 2010 13:53:08 +0200 Subject: [Koha-patches] [PATCH] Bug 4920 - neworderempty.tmpl shouldn't call calcNeworderTotal() onload Message-ID: <1277898788-8505-1-git-send-email-dpavlin@rot13.org> Currently, modifying existing orders will recalculate values if exchange rate has changed, which destroys previous data (our use case is just to modify Planning value fields). Since fileds also have onChange event which also triggers caclNeworderTotal, onload event seems redundant. --- .../prog/en/modules/acqui/neworderempty.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl index 603d517..3b6dae7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -52,7 +52,7 @@ ff.submit(); //]]> - + -- 1.5.6.5 From nahuel.angelinetti at biblibre.com Wed Jun 30 13:59:28 2010 From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI) Date: Wed, 30 Jun 2010 13:59:28 +0200 Subject: [Koha-patches] [PATCH] [followup](MT3160) fix address request Message-ID: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com> If any part of concat is null, all the address field is null. Now we use IFNULL() from mysql. --- C4/Overdues.pm | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/C4/Overdues.pm b/C4/Overdues.pm index d9bd420..2a226ac 100644 --- a/C4/Overdues.pm +++ b/C4/Overdues.pm @@ -199,7 +199,11 @@ sub GetOverduesByBorrowers{ surname, firstname, title, - CONCAT(borrowers.streetnumber, ' ', borrowers.address, '\n', borrowers.address2) as address, + CONCAT( + IFNULL(borrowers.streetnumber,''), ' ', + IFNULL(borrowers.streettype,'') , ' ' , + IFNULL(borrowers.address,''), '\n', IFNULL(borrowers.address2,'') + ) as address, city, zipcode, email, -- 1.7.0.4 From nengard at bywatersolutions.com Wed Jun 30 00:05:00 2010 From: nengard at bywatersolutions.com (Nicole Engard) Date: Tue, 29 Jun 2010 18:05:00 -0400 Subject: [Koha-patches] [PATCH] bug 4921 moved language prefs to i18n-l10n tab Message-ID: <1277849100-4336-1-git-send-email-nengard@bywatersolutions.com> opaclanguagesdisplay appeared in multiple tabs, now only on 1. other language prefs were also moved to internationalization tab. --- .../en/modules/admin/preferences/i18n-l10n.pref | 42 ++++++++++++------- .../prog/en/modules/admin/preferences/opac.pref | 10 ----- .../en/modules/admin/preferences/staff-client.pref | 4 -- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref index f36a264..a319137 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref @@ -1,17 +1,27 @@ I18N/L10N: - - - - Format dates like - - pref: dateformat - default: us - choices: - us: mm/dd/yyyy - metric: dd/mm/yyyy - iso: yyyy/mm/dd - - . - - - - pref: opaclanguagesdisplay - default: 0 - choices: - yes: Allow - no: "Don't allow" - - patrons to change the language they see on the OPAC. + General: + - + - Format dates like + - pref: dateformat + default: us + choices: + us: mm/dd/yyyy + metric: dd/mm/yyyy + iso: yyyy/mm/dd + - . + OPAC: + - + - pref: opaclanguagesdisplay + choices: + yes: Allow + no: "Don't allow" + - patrons to select their language on the OPAC. + - + - "Enable the following languages on the OPAC:" + - pref: opaclanguages + type: opac-languages + Staff Client: + - + - "Enable the following languages on the staff interface:" + - pref: language + type: staff-languages \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index e919dd1..c5d919c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -9,16 +9,6 @@ OPAC: choices: opac-templates - theme on the OPAC. - - - "Enable the following languages on the OPAC:" - - pref: opaclanguages - type: opac-languages - - - - pref: opaclanguagesdisplay - choices: - yes: Allow - no: "Don't allow" - - patrons to select their language on the OPAC. - - - "The OPAC is located at http://" - pref: OPACBaseURL class: url diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref index 7d7135e..9f26ff1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref @@ -8,10 +8,6 @@ Staff Client: choices: staff-templates - theme on the staff interface. - - - "Enable the following languages on the staff interface:" - - pref: language - type: staff-languages - - - "The staff client is located at http://" - pref: staffClientBaseURL class: url -- 1.5.6.5 From mdhafen at tech.washk12.org Wed Jun 30 17:03:51 2010 From: mdhafen at tech.washk12.org (Michael Hafen) Date: Wed, 30 Jun 2010 09:03:51 -0600 Subject: [Koha-patches] [PATCH] [followup](MT3160) fix address request In-Reply-To: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com> References: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com> Message-ID: <1277910231.2361.2.camel@koha-dev> I have found in Mysql that CONCAT_WS handles NULL values well. Have you looked into that? The syntax is a little different from CONCAT. On Wed, 2010-06-30 at 13:59 +0200, Nahuel ANGELINETTI wrote: > If any part of concat is null, all the address field is null. > Now we use IFNULL() from mysql. > --- > C4/Overdues.pm | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/C4/Overdues.pm b/C4/Overdues.pm > index d9bd420..2a226ac 100644 > --- a/C4/Overdues.pm > +++ b/C4/Overdues.pm > @@ -199,7 +199,11 @@ sub GetOverduesByBorrowers{ > surname, > firstname, > title, > - CONCAT(borrowers.streetnumber, ' ', borrowers.address, '\n', borrowers.address2) as address, > + CONCAT( > + IFNULL(borrowers.streetnumber,''), ' ', > + IFNULL(borrowers.streettype,'') , ' ' , > + IFNULL(borrowers.address,''), '\n', IFNULL(borrowers.address2,'') > + ) as address, > city, > zipcode, > email, -- Michael Hafen Systems Analyst and Programmer Washington County School District Utah, USA for Koha checkout http://development.washk12.org/gitweb/ or git://development.washk12.org/koha From oleonard at myacpl.org Wed Jun 30 17:45:10 2010 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 30 Jun 2010 11:45:10 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 3459, topissues doesn't take care of ccode Message-ID: <1277912710-9194-1-git-send-email-oleonard@myacpl.org> - Change conditional to display filter in sidebar without EXPR - Enhance switch between ccode default and itemtype default searches - Enable preselect of submitted collection code in filter form, stealing code from opac-search.pl --- .../opac-tmpl/prog/en/includes/opac-topissues.inc | 4 +- .../opac-tmpl/prog/en/modules/opac-topissues.tmpl | 40 ++++++--- opac/opac-topissues.pl | 95 ++++++++++++++------ 3 files changed, 98 insertions(+), 41 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc index 20eba49..b96b8d3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc @@ -25,9 +25,9 @@
  • - - - - - - - + + +
  • @@ -126,11 +136,19 @@ function Dopop(link) {
    • - + + +
    + + +
    + +
    -
    + + diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl index 1d88850..1c24a2f 100755 --- a/opac/opac-topissues.pl +++ b/opac/opac-topissues.pl @@ -57,27 +57,52 @@ my $limit = $input->param('limit') || 10; my $branch = $input->param('branch') || ''; my $itemtype = $input->param('itemtype') || ''; my $timeLimit = $input->param('timeLimit') || 3; +my $advanced_search_types = C4::Context->preference('AdvancedSearchTypes'); + my $whereclause = ''; -$whereclause .= 'items.homebranch='.$dbh->quote($branch)." AND " if ($branch); -$whereclause .= 'biblioitems.itemtype='.$dbh->quote($itemtype)." AND " if $itemtype; -$whereclause .= ' TO_DAYS(NOW()) - TO_DAYS(biblio.datecreated) <= '.($timeLimit*30).' AND ' if $timeLimit < 999; +$whereclause .= ' AND items.homebranch='.$dbh->quote($branch) if ($branch); +$whereclause .= ' AND TO_DAYS(NOW()) - TO_DAYS(biblio.datecreated) <= '.($timeLimit*30) if $timeLimit < 999; $whereclause =~ s/ AND $// if $whereclause; -$whereclause = " WHERE ".$whereclause if $whereclause; - -my $query = "SELECT datecreated, biblio.biblionumber, title, - author, sum( items.issues ) AS tot, biblioitems.itemtype, - biblioitems.publishercode,biblioitems.publicationyear, - itemtypes.description - FROM biblio - LEFT JOIN items USING (biblionumber) - LEFT JOIN biblioitems USING (biblionumber) - LEFT JOIN itemtypes ON itemtypes.itemtype = biblioitems.itemtype - $whereclause - GROUP BY biblio.biblionumber - HAVING tot >0 - ORDER BY tot DESC - LIMIT $limit - "; +my $query; + +if($advanced_search_types eq 'ccode'){ + $whereclause .= ' AND authorised_values.authorised_value='.$dbh->quote($itemtype) if $itemtype; + $query = "SELECT datecreated, biblio.biblionumber, title, + author, sum( items.issues ) AS tot, biblioitems.itemtype, + biblioitems.publishercode,biblioitems.publicationyear, + authorised_values.lib as description + FROM biblio + LEFT JOIN items USING (biblionumber) + LEFT JOIN biblioitems USING (biblionumber) + LEFT JOIN authorised_values ON items.ccode = authorised_values.authorised_value + WHERE 1 + $whereclause + AND authorised_values.category = 'ccode' + GROUP BY biblio.biblionumber + HAVING tot >0 + ORDER BY tot DESC + LIMIT $limit + "; + $template->param(ccodesearch => 1); +}else{ + $whereclause .= ' AND biblioitems.itemtype='.$dbh->quote($itemtype) if $itemtype; + $query = "SELECT datecreated, biblio.biblionumber, title, + author, sum( items.issues ) AS tot, biblioitems.itemtype, + biblioitems.publishercode,biblioitems.publicationyear, + itemtypes.description + FROM biblio + LEFT JOIN items USING (biblionumber) + LEFT JOIN biblioitems USING (biblionumber) + LEFT JOIN itemtypes ON itemtypes.itemtype = biblioitems.itemtype + WHERE 1 + $whereclause + GROUP BY biblio.biblionumber + HAVING tot >0 + ORDER BY tot DESC + LIMIT $limit + "; + $template->param(itemtypesearch => 1); +} my $sth = $dbh->prepare($query); $sth->execute(); @@ -100,20 +125,34 @@ $template->param(do_it => 1, $template->param( branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'})); -#doctype +# the index parameter is different for item-level itemtypes +my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype'; $itemtypes = GetItemTypes; -my @itemtypeloop; -foreach my $thisitemtype (sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'}} keys %$itemtypes) { +my @itemtypesloop; +my $selected=1; +if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { + foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) { my $selected = 1 if $thisitemtype eq $itemtype; - my %row =(value => $thisitemtype, - description => $itemtypes->{$thisitemtype}->{'description'}, - selected => $selected, - ); - push @itemtypeloop, \%row; + my %row =( value => $thisitemtype, + description => $itemtypes->{$thisitemtype}->{'description'}, + selected => $selected, + ); + push @itemtypesloop, \%row; + } +} else { + my $advsearchtypes = GetAuthorisedValues($advanced_search_types, '', 'opac'); + for my $thisitemtype (@$advsearchtypes) { + my $selected = 1 if $thisitemtype->{authorised_value} eq $itemtype; + my %row =( value => $thisitemtype->{authorised_value}, + selected => $selected, + description => $thisitemtype->{'lib'}, + ); + push @itemtypesloop, \%row; + } } $template->param( - itemtypeloop =>\@itemtypeloop, + itemtypeloop =>\@itemtypesloop, dateformat => C4::Context->preference("dateformat"), ); output_html_with_http_headers $input, $cookie, $template->output; -- 1.7.0.4