Attachment #79346 for bug #21318

View | Details | Raw Unified | Return to bug 21318
Collapse All | Expand All

Lines 230-235 sub Z3950Search { Link Here

(-)a/C4/Breeding.pm (+2 lines)
230	sub _auth_build_query {	230	sub _auth_build_query {
231	my ( $pars ) = @_;	231	my ( $pars ) = @_;
232		232
		233	#FIXME These variables are not used
233	my $nameany= $pars->{nameany};	234	my $nameany= $pars->{nameany};
234	my $authorany= $pars->{authorany};	235	my $authorany= $pars->{authorany};
235	my $authorpersonal= $pars->{authorpersonal};	236	my $authorpersonal= $pars->{authorpersonal};
Lines 253-258 sub _auth_build_query { Link Here
253	title => '@attr 1=4 "#term" ',	254	title => '@attr 1=4 "#term" ',
254	uniformtitle => '@attr 1=6 "#term" ',	255	uniformtitle => '@attr 1=6 "#term" ',
255	srchany => '@attr 1=1016 "#term" ',	256	srchany => '@attr 1=1016 "#term" ',
		257	controlnumber => '@attr 1=12 "#term" ',
256	};	258	};
257		259
258	my $zquery='';	260	my $zquery='';




my $op            = $input->param('op')||'';
my $page            = $input->param('current_page') || 1;
$page = $input->param('goto_page') if $input->param('changepage_goto');
my $controlnumber    = $input->param('controlnumber');

my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
        template_name   => "cataloguing/z3950_auth_search.tt",

    subjectsubdiv   => $subjectsubdiv,
    srchany      => $srchany,
    authid => $authid,
    controlnumber => $controlnumber,
);

if ( $op ne "do_search" ) {

        subjectsubdiv => $subjectsubdiv,
        srchany => $srchany,
        authid => $authid,
        controlnumber => $controlnumber,
};
Z3950SearchAuth($pars, $template);
output_html_with_http_headers $input, $cookie, $template->output;

Lines 26-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt (-1 / +1 lines)
26	<fieldset class="rows">	26	<fieldset class="rows">
27	<ol>	27	<ol>
28	<li><label for="srchany">Keyword (any): </label> <input type="text" id="srchany" name="srchany" value="" /></li>	28	<li><label for="srchany">Keyword (any): </label> <input type="text" id="srchany" name="srchany" value="" /></li>
		29	<li><label for="controlnumber">Control number: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li>
29	<li><label for="nameany">Name (any): </label> <input type="text" id="nameany" name="nameany" value="" /></li>	30	<li><label for="nameany">Name (any): </label> <input type="text" id="nameany" name="nameany" value="" /></li>
30	<li><label for="authorany">Author (any): </label> <input type="text" id="authorany" name="authorany" value="" /></li>	31	<li><label for="authorany">Author (any): </label> <input type="text" id="authorany" name="authorany" value="" /></li>
31	<li><label for="authorpersonal">Author (personal): </label> <input type="text" id="authorpersonal" name="authorpersonal" value="[% authorpersonal \| html %]" /></li>	32	<li><label for="authorpersonal">Author (personal): </label> <input type="text" id="authorpersonal" name="authorpersonal" value="[% authorpersonal \| html %]" /></li>
32	-

Return to bug 21318

Lines 43-48 my $srchany = $input->param('srchany'); Link Here

(-)a/cataloguing/z3950_auth_search.pl (+3 lines)
43	my $op = $input->param('op')\|\|'';	43	my $op = $input->param('op')\|\|'';
44	my $page = $input->param('current_page') \|\| 1;	44	my $page = $input->param('current_page') \|\| 1;
45	$page = $input->param('goto_page') if $input->param('changepage_goto');	45	$page = $input->param('goto_page') if $input->param('changepage_goto');
		46	my $controlnumber = $input->param('controlnumber');
46		47
47	my ( $template, $loggedinuser, $cookie ) = get_template_and_user({	48	my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
48	template_name => "cataloguing/z3950_auth_search.tt",	49	template_name => "cataloguing/z3950_auth_search.tt",
Lines 63-68 $template->param( Link Here
63	subjectsubdiv => $subjectsubdiv,	64	subjectsubdiv => $subjectsubdiv,
64	srchany => $srchany,	65	srchany => $srchany,
65	authid => $authid,	66	authid => $authid,
		67	controlnumber => $controlnumber,
66	);	68	);
67		69
68	if ( $op ne "do_search" ) {	70	if ( $op ne "do_search" ) {
Lines 100-105 my $pars= { Link Here
100	subjectsubdiv => $subjectsubdiv,	102	subjectsubdiv => $subjectsubdiv,
101	srchany => $srchany,	103	srchany => $srchany,
102	authid => $authid,	104	authid => $authid,
		105	controlnumber => $controlnumber,
103	};	106	};
104	Z3950SearchAuth($pars, $template);	107	Z3950SearchAuth($pars, $template);
105	output_html_with_http_headers $input, $cookie, $template->output;	108	output_html_with_http_headers $input, $cookie, $template->output;