X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2Fdb_dependent%2FSearch.t;h=b96cc19e824e258e4c42c8cd63aee34d42b574ae;hb=89a3ef5c5a1658bead838789f8b4c2857583217f;hp=88d965c539dc60fcc3fc9397a885126252e376b7;hpb=73d4ac9bab051a7c12677d427f669c092469f4df;p=koha.git diff --git a/t/db_dependent/Search.t b/t/db_dependent/Search.t index 88d965c539..b96cc19e82 100644 --- a/t/db_dependent/Search.t +++ b/t/db_dependent/Search.t @@ -1,10 +1,22 @@ #!/usr/bin/perl + +# 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 3 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. # -# This Koha test module is a stub! -# Add more tests here!!! +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; -use strict; -use warnings; use utf8; use YAML; @@ -12,7 +24,10 @@ use YAML; use C4::Debug; require C4::Context; -use Test::More tests => 204; +# work around spurious wide character warnings +use open ':std', ':encoding(utf8)'; + +use Test::More tests => 4; use Test::MockModule; use MARC::Record; use File::Spec; @@ -23,10 +38,6 @@ use File::Temp qw/ tempdir /; use File::Path; use DBI; -# work around spurious wide character warnings -binmode Test::More->builder->output, ":utf8"; -binmode Test::More->builder->failure_output, ":utf8"; - our $child; our $datadir; @@ -41,6 +52,12 @@ sub index_sample_records_and_launch_zebra { system("zebraidx -c $datadir/etc/koha/zebradb/$zebra_bib_cfg -v none,fatal,warn -g iso2709 -d biblios update $sourcedir/${marc_type}/zebraexport/biblio"); system("zebraidx -c $datadir/etc/koha/zebradb/$zebra_bib_cfg -v none,fatal,warn -g iso2709 -d biblios commit"); } + # ... and add large bib records, if present + if (-f "$sourcedir/${marc_type}/zebraexport/large_biblio_${indexing_mode}/exported_records.xml") { + my $zebra_bib_cfg = ($indexing_mode eq 'dom') ? 'zebra-biblios-dom.cfg' : 'zebra-biblios.cfg'; + system("zebraidx -c $datadir/etc/koha/zebradb/$zebra_bib_cfg -v none,fatal,warn -g marcxml -d biblios update $sourcedir/${marc_type}/zebraexport/large_biblio_${indexing_mode}"); + system("zebraidx -c $datadir/etc/koha/zebradb/$zebra_bib_cfg -v none,fatal,warn -g marcxml -d biblios commit"); + } if (-f "$sourcedir/${marc_type}/zebraexport/authority/exported_records") { my $zebra_auth_cfg = ($indexing_mode eq 'dom') ? 'zebra-authorities-dom.cfg' : 'zebra-authorities.cfg'; system("zebraidx -c $datadir/etc/koha/zebradb/$zebra_auth_cfg -v none,fatal,warn -g iso2709 -d authorities init"); @@ -104,11 +121,17 @@ $contextmodule->mock('preference', sub { return 20; } elsif ($pref eq 'FacetLabelTruncationLength') { return 20; + } elsif ($pref eq 'FacetMaxCount') { + return 20; } elsif ($pref eq 'OpacHiddenItems') { return ''; } elsif ($pref eq 'AlternateHoldingsField') { return '490av'; - } elsif ($pref eq 'authoritysep') { + } elsif ($pref eq 'AuthoritySeparator') { + return '--'; + } elsif ($pref eq 'DisplayLibraryFacets') { + return 'holding'; + } elsif ($pref eq 'UNIMARCAuthorsFacetsSeparator') { return '--'; } else { warn "The syspref $pref was requested but I don't know what to say; this indicates that the test requires updating" @@ -178,6 +201,11 @@ sub run_marc21_search_tests { my $context = new C4::Context("$datadir/etc/koha-conf.xml"); $context->set_context(); + is($context->config('zebra_bib_index_mode'),$indexing_mode, + "zebra_bib_index_mode is properly set to '$indexing_mode' in the created koha-conf.xml file (BZ11499)"); + is($context->config('zebra_auth_index_mode'),$indexing_mode, + "zebra_auth_index_mode is properly set to '$indexing_mode' in the created koha-conf.xml file (BZ11499)"); + use_ok('C4::Search'); # set search syspreferences to a known starting point @@ -222,7 +250,11 @@ sub run_marc21_search_tests { '020' => { 'sfs' => { 'a' => [ [ 'biblioitems', 'isbn' ] ] }, 'list' => [ [ 'a', 'biblioitems', 'isbn' ] ] - } + }, + '500' => { + 'sfs' => { 'a' => [ [ 'biblioitems', 'notes' ] ] }, + 'list' => [ [ 'a', 'biblioitems', 'notes' ] ] + }, } ); return \%hash; @@ -344,6 +376,43 @@ sub run_marc21_search_tests { getRecords('au:Lessig', 'au:Lessig', [], [ 'biblioserver' ], '20', 0, undef, \%branches, \%itemtypes, 'ccl', undef); is($results_hashref->{biblioserver}->{hits}, 4, "getRecords title search for 'Australia' matched right number of records"); +if ( $indexing_mode eq 'dom' ) { + ( undef, $results_hashref, $facets_loop ) = + getRecords('salud', 'salud', [], [ 'biblioserver' ], '19', 0, undef, \%branches, \%itemtypes, 'ccl', undef); + ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() =~ m/^Efectos del ambiente/ && + MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[7],'UTF-8')->title_proper() eq 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies' && + MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/ + , "Simple relevance sorting in getRecords matches old behavior"); + + ( undef, $results_hashref, $facets_loop ) = + getRecords('salud', 'salud', [ 'author_az' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef); + ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() =~ m/la enfermedad laboral\^ies$/ && + MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[6],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/ && + MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() eq 'World health statistics 2009^ien' + , "Simple ascending author sorting in getRecords matches old behavior"); + + ( undef, $results_hashref, $facets_loop ) = + getRecords('salud', 'salud', [ 'author_za' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef); + ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() eq 'World health statistics 2009^ien' && + MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[12],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/ && + MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() =~ m/la enfermedad laboral\^ies$/ + , "Simple descending author sorting in getRecords matches old behavior"); + + ( undef, $results_hashref, $facets_loop ) = + getRecords('salud', 'salud', [ 'pubdate_asc' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef); + ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() eq 'Manual de higiene industrial^ies' && + MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[7],'UTF-8')->title_proper() =~ m/seguridad e higiene del trabajo\^ies$/ && + MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() =~ m/^Indicadores de resultados identificados/ + , "Simple ascending publication date sorting in getRecords matches old behavior"); + + ( undef, $results_hashref, $facets_loop ) = + getRecords('salud', 'salud', [ 'pubdate_dsc' ], [ 'biblioserver' ], '38', 0, undef, \%branches, \%itemtypes, 'ccl', undef); + ok(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper() =~ m/^Estado de salud/ && + MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[7],'UTF-8')->title_proper() eq 'World health statistics 2009^ien' && + MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[18],'UTF-8')->title_proper() eq 'Manual de higiene industrial^ies' + , "Simple descending publication date sorting in getRecords matches old behavior"); + +} elsif ( $indexing_mode eq 'grs1' ){ ( undef, $results_hashref, $facets_loop ) = getRecords('salud', 'salud', [], [ 'biblioserver' ], '19', 0, undef, \%branches, \%itemtypes, 'ccl', undef); ok(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper() =~ m/^Efectos del ambiente/ && @@ -378,13 +447,13 @@ sub run_marc21_search_tests { MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[7])->title_proper() eq 'World health statistics 2009^ien' && MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[18])->title_proper() eq 'Manual de higiene industrial^ies' , "Simple descending publication date sorting in getRecords matches old behavior"); +} ( undef, $results_hashref, $facets_loop ) = getRecords('books', 'books', [ 'relevance' ], [ 'biblioserver' ], '20', 0, undef, \%branches, \%itemtypes, undef, 1); $record = MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0]); - is($record->title_proper(), 'books', "Scan returned requested item"); + is($record->title_proper(), 'Books', "Scan returned requested item"); is($record->subfield('100', 'a'), 2, "Scan returned correct number of records matching term"); - # Time to test buildQuery and searchResults too. my ( $query, $simple_query, $query_cgi, @@ -494,7 +563,7 @@ sub run_marc21_search_tests { $stopwords_removed, $query_type ) = buildQuery([], [ 'pqf=@attr 1=_ALLRECORDS @attr 2=103 ""' ], [], [], [], 0, 'en'); ($error, $results_hashref, $facets_loop) = getRecords($query,$simple_query,[ ], [ 'biblioserver' ],20,0,undef,\%branches,\%itemtypes,$query_type,0); - is($results_hashref->{biblioserver}->{hits}, 179, "getRecords on _ALLRECORDS PQF returned all records"); + is($results_hashref->{biblioserver}->{hits}, 180, "getRecords on _ALLRECORDS PQF returned all records"); ( $error, $query, $simple_query, $query_cgi, $query_desc, $limit, $limit_cgi, $limit_desc, @@ -529,7 +598,7 @@ sub run_marc21_search_tests { is(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper(), 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies', "Weighted query returns best match first"); } else { local $TODO = "Query weighting does not behave exactly the same in DOM vs. GRS"; - is(MARC::Record::new_from_usmarc($results_hashref->{biblioserver}->{RECORDS}->[0])->title_proper(), 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies', "Weighted query returns best match first"); + is(MARC::Record::new_from_xml($results_hashref->{biblioserver}->{RECORDS}->[0],'UTF-8')->title_proper(), 'Salud y seguridad de los trabajadores del sector salud: manual para gerentes y administradores^ies', "Weighted query returns best match first"); } $QueryStemming = $QueryWeightFields = $QueryFuzzy = $QueryRemoveStopwords = 0; @@ -548,6 +617,20 @@ sub run_marc21_search_tests { ($error, $results_hashref, $facets_loop) = getRecords($query,$simple_query,[ ], [ 'biblioserver' ],20,0,undef,\%branches,\%itemtypes,$query_type,0); is($results_hashref->{biblioserver}->{hits}, 5, "Search for 'medic*' returns matches with automatic truncation on"); + $QueryStemming = $QueryFuzzy = $QueryRemoveStopwords = $QueryAutoTruncate = 0; + $QueryWeightFields = 1; + ( $error, $query, $simple_query, $query_cgi, + $query_desc, $limit, $limit_cgi, $limit_desc, + $stopwords_removed, $query_type ) = buildQuery([], [ 'web application' ], [ 'kw' ], [], [], 0, 'en'); + ($error, $results_hashref, $facets_loop) = getRecords($query,$simple_query,[ ], [ 'biblioserver' ],20,0,undef,\%branches,\%itemtypes,$query_type,0); + is($results_hashref->{biblioserver}->{hits}, 1, "Search for 'web application' returns one hit with QueryWeightFields on"); + + ( $error, $query, $simple_query, $query_cgi, + $query_desc, $limit, $limit_cgi, $limit_desc, + $stopwords_removed, $query_type ) = buildQuery([], [ 'web "application' ], [ 'kw' ], [], [], 0, 'en'); + ($error, $results_hashref, $facets_loop) = getRecords($query,$simple_query,[ ], [ 'biblioserver' ],20,0,undef,\%branches,\%itemtypes,$query_type,0); + is($results_hashref->{biblioserver}->{hits}, 1, "Search for 'web \"application' returns one hit with QueryWeightFields on (bug 7518)"); + $QueryStemming = $QueryWeightFields = $QueryFuzzy = $QueryRemoveStopwords = $QueryAutoTruncate = 0; ( $error, $query, $simple_query, $query_cgi, $query_desc, $limit, $limit_cgi, $limit_desc, @@ -608,7 +691,7 @@ sub run_marc21_search_tests { # make one of the test items appear to be in transit my $circ_module = new Test::MockModule('C4::Circulation'); $circ_module->mock('GetTransfers', sub { - my $itemnumber = shift; + my $itemnumber = shift // -1; if ($itemnumber == 11) { return ('2013-07-19', 'MPL', 'CPL'); } else { @@ -717,12 +800,115 @@ sub run_marc21_search_tests { ['shakespeare'], 0, 10, '', '', 1 ); is($count, 1, 'MARC21 authorities: one hit on mainentry starts with "shakespeare"'); + ($auths, $count) = SearchAuthorities( + ['mainentry'], ['and'], [''], ['starts'], + ['shakespeare'], 0, 10, '', 'HeadingAsc', 1 + ); + is($count, 1, 'MARC21 authorities: one hit on mainentry starts with "shakespeare" sorted by heading ascending'); + ($auths, $count) = SearchAuthorities( + ['mainentry'], ['and'], [''], ['starts'], + ['shakespeare'], 0, 10, '', 'HeadingDsc', 1 + ); + is($count, 1, 'MARC21 authorities: one hit on mainentry starts with "shakespeare" sorted by heading descending'); ($auths, $count) = SearchAuthorities( ['match'], ['and'], [''], ['contains'], ['沙士北亞威廉姆'], 0, 10, '', '', 1 ); is($count, 1, 'MARC21 authorities: one hit on match contains "沙士北亞威廉姆"'); + $UseQueryParser = 1; + + ($auths, $count) = SearchAuthorities( + ['mainentry'], ['and'], [''], ['starts'], + ['shakespeare'], 0, 10, '', '', 1 + ); + is($count, 1, 'MARC21 authorities: one hit on mainentry starts with "shakespeare" (QP)'); + ($auths, $count) = SearchAuthorities( + ['mainentry'], ['and'], [''], ['starts'], + ['shakespeare'], 0, 10, '', 'HeadingAsc', 1 + ); + is($count, 1, 'MARC21 authorities: one hit on mainentry starts with "shakespeare" sorted by heading ascending (QP)'); + ($auths, $count) = SearchAuthorities( + ['mainentry'], ['and'], [''], ['starts'], + ['shakespeare'], 0, 10, '', 'HeadingDsc', 1 + ); + is($count, 1, 'MARC21 authorities: one hit on mainentry starts with "shakespeare" sorted by heading descending (QP)'); + ($auths, $count) = SearchAuthorities( + ['match'], ['and'], [''], ['contains'], + ['沙士北亞威廉姆'], 0, 10, '', '', 1 + ); + is($count, 1, 'MARC21 authorities: one hit on match contains "沙士北亞威廉姆" (QP)'); + + # retrieve records that are larger than the MARC limit of 99,999 octets + ( undef, $results_hashref, $facets_loop ) = + getRecords('ti:marc the large record', '', [], [ 'biblioserver' ], '20', 0, undef, \%branches, \%itemtypes, 'ccl', undef); + is($results_hashref->{biblioserver}->{hits}, 1, "Can do a search that retrieves an over-large bib record (bug 11096)"); + @newresults = searchResults('opac', $query_desc, $results_hashref->{'biblioserver'}->{'hits'}, 10, 0, 0, + $results_hashref->{'biblioserver'}->{"RECORDS"}); + is($newresults[0]->{title}, 'Marc the Large Record', 'Able to render the title for over-large bib record (bug 11096)'); + is($newresults[0]->{biblionumber}, '300', 'Over-large bib record has the correct biblionumber (bug 11096)'); + like($newresults[0]->{notes}, qr/This is large note #550/, 'Able to render the notes field for over-large bib record (bug 11096)'); + + # notforloancount should be returned as part of searchResults output + ok( defined $newresults[0]->{notforloancount}, + '\'notforloancount\' defined in searchResults output (Bug 12419)'); + is( $newresults[0]->{notforloancount}, 2, + '\'notforloancount\' == 2 (Bug 12419)'); + + # verify that we don't attempt to sort if no results were returned + # because of a query error + warning_like {( undef, $results_hashref, $facets_loop ) = + getRecords('ccl=( AND )', '', ['title_az'], [ 'biblioserver' ], '20', 0, undef, \%branches, \%itemtypes, 'ccl', undef) + } qr/WARNING: query problem with/, 'got warning instead of crash when attempting to run invalid query (bug 9578)'; + + # Test facet calculation + my $facets_counter = {}; + my $facets = C4::Koha::getFacets(); + # Create a record with a 100$z field + my $marc_record = MARC::Record->new; + $marc_record->add_fields( + [ '001', '1234' ], + [ '100', ' ', ' ', a => 'Cohen Arazi, Tomas' ], + [ '100', 'z', ' ', a => 'Tomasito' ], + [ '245', ' ', ' ', a => 'First try' ] + ); + C4::Search::_get_facets_data_from_record( $marc_record, $facets, $facets_counter ); + is_deeply( { au => { 'Cohen Arazi, Tomas' => 1 } }, $facets_counter, + "_get_facets_data_from_record doesn't count 100\$z (Bug 12788)"); + $marc_record = MARC::Record->new; + $marc_record->add_fields( + [ '001', '1234' ], + [ '100', ' ', ' ', a => 'Cohen Arazi, Tomas' ], + [ '100', 'z', ' ', a => 'Tomasito' ], + [ '245', ' ', ' ', a => 'Second try' ] + ); + C4::Search::_get_facets_data_from_record( $marc_record, $facets, $facets_counter ); + is_deeply( { au => { 'Cohen Arazi, Tomas' => 2 } }, $facets_counter, + "_get_facets_data_from_record correctly counts author facet twice"); + + # Test _get_facets_info + my $facets_info = C4::Search::_get_facets_info( $facets ); + my $expected_facets_info_marc21 = { + 'au' => { 'expanded' => undef, + 'label_value' => "Authors" }, + 'holdingbranch' => { 'expanded' => undef, + 'label_value' => "HoldingLibrary" }, + 'itype' => { 'expanded' => undef, + 'label_value' => "ItemTypes" }, + 'location' => { 'expanded' => undef, + 'label_value' => "Location" }, + 'se' => { 'expanded' => undef, + 'label_value' => "Series" }, + 'su-geo' => { 'expanded' => undef, + 'label_value' => "Places" }, + 'su-to' => { 'expanded' => undef, + 'label_value' => "Topics" }, + 'su-ut' => { 'expanded' => undef, + 'label_value' => "Titles" } + }; + is_deeply( $facets_info, $expected_facets_info_marc21, + "_get_facets_info returns the correct data"); + cleanup(); } @@ -794,13 +980,49 @@ sub run_unimarc_search_tests { ); is($count, 24, 'UNIMARC authorities: hits on any starts with "jean"'); + # Test _get_facets_info + my $facets = C4::Koha::getFacets(); + my $facets_info = C4::Search::_get_facets_info( $facets ); + my $expected_facets_info_unimarc = { + 'au' => { 'expanded' => undef, + 'label_value' => "Authors" }, + 'holdingbranch' => { 'expanded' => undef, + 'label_value' => "HoldingLibrary" }, + 'location' => { 'expanded' => undef, + 'label_value' => "Location" }, + 'se' => { 'expanded' => undef, + 'label_value' => "Series" }, + 'su-geo' => { 'expanded' => undef, + 'label_value' => "Places" }, + 'su-to' => { 'expanded' => undef, + 'label_value' => "Topics" }, + 'su-ut' => { 'expanded' => undef, + 'label_value' => "Titles" } + }; + is_deeply( $facets_info, $expected_facets_info_unimarc, + "_get_facets_info returns the correct data"); + cleanup(); } -run_marc21_search_tests('grs1'); -run_marc21_search_tests('dom'); - -run_unimarc_search_tests('grs1'); -run_unimarc_search_tests('dom'); +subtest 'MARC21 + GRS-1' => sub { + plan tests => 109; + run_marc21_search_tests('grs1'); +}; + +subtest 'MARC21 + DOM' => sub { + plan tests => 109; + run_marc21_search_tests('dom'); +}; + +subtest 'UNIMARC + GRS-1' => sub { + plan tests => 14; + run_unimarc_search_tests('grs1'); +}; + +subtest 'UNIMARC + DOM' => sub { + plan tests => 14; + run_unimarc_search_tests('dom'); +}; 1;