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>
113 lines
3.6 KiB
Perl
Executable file
113 lines
3.6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This is a completely new Z3950 clients search using async ZOOM -TG 02/11/06
|
|
# 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 qw( -utf8 );
|
|
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Context;
|
|
use C4::Breeding;
|
|
use C4::Koha;
|
|
|
|
my $input = new CGI;
|
|
my $dbh = C4::Context->dbh;
|
|
my $error = $input->param('error');
|
|
my $biblionumber = $input->param('biblionumber') || 0;
|
|
my $frameworkcode = $input->param('frameworkcode');
|
|
my $title = $input->param('title');
|
|
my $author = $input->param('author');
|
|
my $isbn = $input->param('isbn');
|
|
my $issn = $input->param('issn');
|
|
my $lccn = $input->param('lccn');
|
|
my $lccall = $input->param('lccall');
|
|
my $subject = $input->param('subject');
|
|
my $dewey = $input->param('dewey');
|
|
my $controlnumber = $input->param('controlnumber');
|
|
my $stdid = $input->param('stdid');
|
|
my $srchany = $input->param('srchany');
|
|
my $op = $input->param('op')||'';
|
|
|
|
my $page = $input->param('current_page') || 1;
|
|
$page = $input->param('goto_page') if $input->param('changepage_goto');
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
|
|
template_name => "cataloguing/z3950_search.tmpl",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 1,
|
|
flagsrequired => { catalogue => 1 },
|
|
});
|
|
|
|
$template->param(
|
|
frameworkcode => $frameworkcode,
|
|
isbn => $isbn,
|
|
issn => $issn,
|
|
lccn => $lccn,
|
|
lccall => $lccall,
|
|
title => $title,
|
|
author => $author,
|
|
controlnumber=> $controlnumber,
|
|
stdid => $stdid,
|
|
srchany => $srchany,
|
|
biblionumber => $biblionumber,
|
|
dewey => $dewey,
|
|
subject => $subject,
|
|
);
|
|
|
|
if ( $op ne "do_search" ) {
|
|
my $sth = $dbh->prepare("SELECT id,host,name,checked FROM z3950servers ORDER BY rank, name");
|
|
$sth->execute();
|
|
my $serverloop = $sth->fetchall_arrayref( {} );
|
|
$template->param(
|
|
serverloop => $serverloop,
|
|
opsearch => "search",
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
exit;
|
|
}
|
|
|
|
my @id = $input->param('id');
|
|
if ( @id==0 ) {
|
|
# empty server list -> report and exit
|
|
$template->param( emptyserverlist => 1 );
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
exit;
|
|
}
|
|
|
|
my $pars= {
|
|
random => $input->param('random') || rand(1000000000),
|
|
biblionumber => $biblionumber,
|
|
page => $page,
|
|
id => \@id,
|
|
isbn => $isbn,
|
|
issn => $issn,
|
|
title => $title,
|
|
author => $author,
|
|
dewey => $dewey,
|
|
subject => $subject,
|
|
lccall => $lccall,
|
|
controlnumber => $controlnumber,
|
|
stdid => 0,
|
|
srchany => 0,
|
|
};
|
|
Z3950Search($pars, $template);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|