@@ -, +, @@ --- acqui/neworderbiblio.pl | 3 +++ authorities/auth_finder.pl | 1 + authorities/authorities-home.pl | 1 + catalogue/search.pl | 2 ++ cataloguing/addbooks.pl | 3 +++ .../Bug_24103_add_DumpSearchQueryTemplate_syspref.perl | 9 +++++++++ installer/data/mysql/sysprefs.sql | 1 + .../intranet-tmpl/prog/en/modules/admin/preferences/logs.pref | 6 ++++++ opac/opac-search.pl | 2 ++ 9 files changed, 28 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/Bug_24103_add_DumpSearchQueryTemplate_syspref.perl --- a/acqui/neworderbiblio.pl +++ a/acqui/neworderbiblio.pl @@ -113,6 +113,9 @@ if ($QParser) { ( undef, $builtquery, undef, undef, undef, undef, undef, undef, undef, undef ) = $builder->build_query_compat( undef, \@operands, undef, undef, undef, 0, $lang ); } + +$template->param( search_query => $builtquery ) if C4::Context->preference('DumpSearchQueryTemplate'); + my ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($builtquery, $results_per_page * ($page - 1), $results_per_page); if (defined $error) { --- a/authorities/auth_finder.pl +++ a/authorities/auth_finder.pl @@ -77,6 +77,7 @@ if ( $op eq "do_search" ) { \@marclist, \@and_or, \@excluding, \@operator, \@value, $authtypecode, $orderby ); + $template->param( search_query => $search_query ) if C4::Context->preference('DumpSearchQueryTemplate'); my $offset = $startfrom * $resultsperpage; my ( $results, $total ) = $searcher->search_auth_compat( $search_query, $offset, --- a/authorities/authorities-home.pl +++ a/authorities/authorities-home.pl @@ -111,6 +111,7 @@ if ( $op eq "do_search" ) { } ); + $template->param( search_query => $search_query ) if C4::Context->preference('DumpSearchQueryTemplate'); $template->param( csrf_token => Koha::Token->new->generate_csrf({ session_id => scalar $query->cookie('CGISESSID'), --- a/catalogue/search.pl +++ a/catalogue/search.pl @@ -485,6 +485,8 @@ my $searcher = Koha::SearchEngine::Search->new( = $builder->build_query_compat( \@operators, \@operands, \@indexes, \@limits, \@sort_by, $scan, $lang, { weighted_fields => !$cgi->param('advsearch'), whole_record => $whole_record }); +$template->param( search_query => $query ) if C4::Context->preference('DumpSearchQueryTemplate'); + ## parse the query_cgi string and put it into a form suitable for s my @query_inputs; my $scan_index_to_use; --- a/cataloguing/addbooks.pl +++ a/cataloguing/addbooks.pl @@ -80,6 +80,9 @@ if ($query) { ( undef, $builtquery, undef, undef, undef, undef, undef, undef, undef, undef ) = $builder->build_query_compat( undef, \@operands, undef, undef, undef, 0, $lang ); } + + $template->param( search_query => $builtquery ) if C4::Context->preference('DumpSearchQueryTemplate'); + # find results my ( $error, $marcresults, $total_hits ) = $searcher->simple_search_compat($builtquery, $results_per_page * ($page - 1), $results_per_page); --- a/installer/data/mysql/atomicupdate/Bug_24103_add_DumpSearchQueryTemplate_syspref.perl +++ a/installer/data/mysql/atomicupdate/Bug_24103_add_DumpSearchQueryTemplate_syspref.perl @@ -0,0 +1,9 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO `systempreferences` (variable,value,options,explanation,type) + VALUES ('DumpSearchQueryTemplate',0,'','Add the search query being passed to the search engine into the template for debugging','YesNo') + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug XXXXX - add DumpSearchQueryTemplate syspref)\n"; +} --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -160,6 +160,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('DisplayLibraryFacets', 'holding', 'home|holding|both', 'Defines which library facets to display.', 'Choice'), ('DisplayMultiPlaceHold','1','','Display the ability to place multiple holds or not','YesNo'), ('DisplayOPACiconsXSLT','1','','If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages in the OPAC.','YesNo'), +('DumpSearchQueryTemplate',0,'','Add the search query being passed to the search engine into the template for debugging','YesNo'), ('DumpTemplateVarsIntranet', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the staff intranet.', 'YesNo'), ('DumpTemplateVarsOpac', '0', NULL , 'If enabled, dump all Template Toolkit variable to a comment in the html source for the opac.', 'YesNo'), ('EasyAnalyticalRecords','0','','If on, display in the catalogue screens tools to easily setup analytical record relationships','YesNo'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref @@ -91,3 +91,9 @@ Logging: on: Do off: "Don't" - dump all Template Toolkit variable to a comment in the html source for the OPAC. + - + - pref: DumpSearchQueryTemplate + choices: + on: Do + off: "Don't" + - dump search query as a template parameter, requires DumpTemplateVars[interface] to be visible. --- a/opac/opac-search.pl +++ a/opac/opac-search.pl @@ -571,6 +571,8 @@ if (C4::Context->preference('OpacSuppression')) { } ); +$template->param( search_query => $query ) if C4::Context->preference('DumpSearchQueryTemplate'); + sub _input_cgi_parse { my @elements; my $query_cgi = shift or return @elements; --