d542740ab8
In current implementation (mostly commented out in this patch) uses heuristic to guess which strings need decoding from utf-8 to binary representation and doesn't support utf-8 characters in templates and has problems with utf-8 data from database. With this changes, Koha perl code always uses utf-8 encoding correctly. All incomming data from database is allready correctly marked as utf-8, and decoding of utf8 is required only from Zebra and XSLT transfers which don't set utf-8 flag correctly. For output, standard perl :encoding(utf8) handler is used so it also removes various "wide character" warnings as side-effect. Test scenario: 1. make sure that you have utf-8 characters in your biblio records, patrons, categories etc. 2. try to search records on intranet and opac which contain utf-8 characters 3. install language which has utf-8 characters, e.g. uk-UA dpavlin@koha-dev:/srv/koha/misc/translator(bug_6554) $ PERL5LIB=/srv/koha/ perl translate install uk-UA 4. switch language to uk-UA and verify that templates display correctly 5. test search and Z39.50 search and verify that caracters are correct Signed-off-by: Owen Leonard <oleonard@myacpl.org> I followed the test plan, adding utf-8 characters to library names, patron categories, titles, and authorized values. I tried the uk-UA translation and everything looked good. When performing Z39.50 searches for titles containing utf-8 characters I got results which were still occasionally contaminated with dummy characters [?] but I assume this is Z39.50's fault not the patch's. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Already signed, add mine. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
190 lines
5.5 KiB
Perl
Executable file
190 lines
5.5 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# 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.
|
|
#
|
|
# 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.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI;
|
|
use URI::Escape;
|
|
use C4::Auth;
|
|
|
|
use C4::Context;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::AuthoritiesMarc;
|
|
use C4::Acquisition;
|
|
use C4::Koha; # XXX subfield_is_koha_internal_p
|
|
use C4::Biblio;
|
|
|
|
my $query = new CGI;
|
|
my $dbh = C4::Context->dbh;
|
|
my $op = $query->param('op') || '';
|
|
my $authtypecode = $query->param('authtypecode') || '';
|
|
my $authid = $query->param('authid') || '';
|
|
|
|
my ( $template, $loggedinuser, $cookie );
|
|
|
|
my $authtypes = getauthtypes;
|
|
my @authtypesloop;
|
|
foreach my $thisauthtype (
|
|
sort {
|
|
$authtypes->{$a}{'authtypetext'} cmp $authtypes->{$b}{'authtypetext'}
|
|
}
|
|
keys %$authtypes
|
|
)
|
|
{
|
|
my %row = (
|
|
value => $thisauthtype,
|
|
selected => $thisauthtype eq $authtypecode,
|
|
authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
|
|
);
|
|
push @authtypesloop, \%row;
|
|
}
|
|
|
|
if ( $op eq "delete" ) {
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "authorities/authorities-home.tmpl",
|
|
query => $query,
|
|
type => 'intranet',
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
&DelAuthority( $authid, 1 );
|
|
|
|
if ( $query->param('operator') ) {
|
|
# query contains search params so perform search
|
|
$op = "do_search";
|
|
}
|
|
else {
|
|
$op = '';
|
|
}
|
|
}
|
|
if ( $op eq "do_search" ) {
|
|
my $marclist = $query->param('marclist') || '';
|
|
my $and_or = $query->param('and_or') || '';
|
|
my $excluding = $query->param('excluding') || '';
|
|
my $operator = $query->param('operator') || '';
|
|
my $orderby = $query->param('orderby') || '';
|
|
my $value = $query->param('value') || '';
|
|
|
|
my $startfrom = $query->param('startfrom') || 1;
|
|
my $resultsperpage = $query->param('resultsperpage') || 20;
|
|
|
|
my ( $results, $total ) = SearchAuthorities(
|
|
[$marclist], [$and_or],
|
|
[$excluding], [$operator],
|
|
[$value], ( $startfrom - 1 ) * $resultsperpage,
|
|
$resultsperpage, $authtypecode,
|
|
$orderby
|
|
);
|
|
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "authorities/searchresultlist.tmpl",
|
|
query => $query,
|
|
type => 'intranet',
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
$template->param(
|
|
marclist => $marclist,
|
|
and_or => $and_or,
|
|
excluding => $excluding,
|
|
operator => $operator,
|
|
orderby => $orderby,
|
|
value => $value,
|
|
authtypecode => $authtypecode,
|
|
startfrom => $startfrom,
|
|
resultsperpage => $resultsperpage,
|
|
);
|
|
|
|
# we must get parameters once again. Because if there is a mainentry, it
|
|
# has been replaced by something else during the search, thus the links
|
|
# next/previous would not work anymore
|
|
|
|
# construction of the url of each page
|
|
my $value_url = uri_escape_utf8($value);
|
|
my $base_url = "authorities-home.pl?"
|
|
."marclist=$marclist"
|
|
."&and_or=$and_or"
|
|
."&excluding=$excluding"
|
|
."&operator=$operator"
|
|
."&value=$value_url"
|
|
."&resultsperpage=$resultsperpage"
|
|
."&type=intranet"
|
|
."&op=do_search"
|
|
."&authtypecode=$authtypecode"
|
|
."&orderby=$orderby";
|
|
|
|
my $from = ( $startfrom - 1 ) * $resultsperpage + 1;
|
|
my $to;
|
|
if ( !defined $total ) {
|
|
$total = 0;
|
|
}
|
|
|
|
if ( $total < $startfrom * $resultsperpage ) {
|
|
$to = $total;
|
|
}
|
|
else {
|
|
$to = $startfrom * $resultsperpage;
|
|
}
|
|
|
|
$template->param( result => $results ) if $results;
|
|
|
|
$template->param(
|
|
pagination_bar => pagination_bar(
|
|
$base_url, int( $total / $resultsperpage ) + 1,
|
|
$startfrom, 'startfrom'
|
|
),
|
|
total => $total,
|
|
from => $from,
|
|
to => $to,
|
|
isEDITORS => $authtypecode eq 'EDITORS',
|
|
);
|
|
|
|
}
|
|
if ( $op eq '' ) {
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "authorities/authorities-home.tmpl",
|
|
query => $query,
|
|
type => 'intranet',
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
}
|
|
|
|
$template->param(
|
|
authtypesloop => \@authtypesloop,
|
|
op => $op,
|
|
);
|
|
|
|
$template->{VARS}->{marcflavour} = C4::Context->preference("marcflavour");
|
|
|
|
# Print the page
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|