Attachment #27117 for bug #12071

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





This function returns an array reference that contains the search parameters to be
passed to the Z39.50 search script (z3950_search.pl). The array elements
are hash refs whose keys are name and value, and whose values are the
name of a search parameter, the value of that search parameter and the URL encoded
value of that parameter.



If $matchpoints is a scalar, it is assumed to be an unnamed query descriptor, e.g.
a general purpose search argument. In this case, the returned array contains only
entry: the key is 'title' and the value is derived from $matchpoints.

If a search parameter value is undefined or empty, it is not included in the returned
array.

    my $array = [];
    for my $field (qw/ lccn isbn issn title author dewey subject /)
    {
        push @$array, { name => $field, value => $bibrec->{$field} }
          if defined $bibrec->{$field};
    }
    return $array;
}

Lines 18-24 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc (-1 / +1 lines)
18	function GetZ3950Terms(){	18	function GetZ3950Terms(){
19	var strQuery="&frameworkcode=";	19	var strQuery="&frameworkcode=";
20	[% FOREACH z3950_search_param IN z3950_search_params %]	20	[% FOREACH z3950_search_param IN z3950_search_params %]
21	strQuery += "&" + "[% z3950_search_param.name \|html %]" + "=" + "[% z3950_search_param.encvalue \|html %]";	21	strQuery += "&" + "[% z3950_search_param.name \|uri %]" + "=" + "[% z3950_search_param.value \|uri %]";
22	[% END %]	22	[% END %]
23	return strQuery;	23	return strQuery;
24	}	24	}

Lines 232-238 function PopupZ3950() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-1 / +1 lines)
232	function GetZ3950Terms(){	232	function GetZ3950Terms(){
233	var strQuery="&frameworkcode=";	233	var strQuery="&frameworkcode=";
234	[% FOREACH z3950_search_param IN z3950_search_params %]	234	[% FOREACH z3950_search_param IN z3950_search_params %]
235	strQuery += "&" + "[% z3950_search_param.name %]" + "=" + "[% z3950_search_param.encvalue %]";	235	strQuery += "&" + "[% z3950_search_param.name \|uri %]" + "=" + "[% z3950_search_param.value \|uri %]";
236	[% END %]	236	[% END %]
237	return strQuery;	237	return strQuery;
238	}	238	}

Lines 28-34 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (-2 / +1 lines)
28	function GetZ3950Terms(fw){	28	function GetZ3950Terms(fw){
29	var strQuery="&frameworkcode=" + fw;	29	var strQuery="&frameworkcode=" + fw;
30	[% FOREACH z3950_search_param IN z3950_search_params %]	30	[% FOREACH z3950_search_param IN z3950_search_params %]
31	strQuery += "&" + "[% z3950_search_param.name %]" + "=" + "[% z3950_search_param.encvalue %]";	31	strQuery += "&" + "[% z3950_search_param.name \|uri %]" + "=" + "[% z3950_search_param.encvalue \|uri %]";
32	[% END %]	32	[% END %]
33	return strQuery;	33	return strQuery;
34	}	34	}
35	-

Return to bug 12071

Lines 2251-2257 $arrayref = z3950_search_args($matchpoints) Link Here

(-)a/C4/Search.pm (-4 / +4 lines)
2251		2251
2252	This function returns an array reference that contains the search parameters to be	2252	This function returns an array reference that contains the search parameters to be
2253	passed to the Z39.50 search script (z3950_search.pl). The array elements	2253	passed to the Z39.50 search script (z3950_search.pl). The array elements
2254	are hash refs whose keys are name, value and encvalue, and whose values are the	2254	are hash refs whose keys are name and value, and whose values are the
2255	name of a search parameter, the value of that search parameter and the URL encoded	2255	name of a search parameter, the value of that search parameter and the URL encoded
2256	value of that parameter.	2256	value of that parameter.
2257		2257
Lines 2262-2268 data is in a hash reference in $matchpoints, as returned by Biblio::GetBiblioDat Link Here
2262		2262
2263	If $matchpoints is a scalar, it is assumed to be an unnamed query descriptor, e.g.	2263	If $matchpoints is a scalar, it is assumed to be an unnamed query descriptor, e.g.
2264	a general purpose search argument. In this case, the returned array contains only	2264	a general purpose search argument. In this case, the returned array contains only
2265	entry: the key is 'title' and the value and encvalue are derived from $matchpoints.	2265	entry: the key is 'title' and the value is derived from $matchpoints.
2266		2266
2267	If a search parameter value is undefined or empty, it is not included in the returned	2267	If a search parameter value is undefined or empty, it is not included in the returned
2268	array.	2268	array.
Lines 2309-2316 sub z3950_search_args { Link Here
2309	my $array = [];	2309	my $array = [];
2310	for my $field (qw/ lccn isbn issn title author dewey subject /)	2310	for my $field (qw/ lccn isbn issn title author dewey subject /)
2311	{	2311	{
2312	my $encvalue = URI::Escape::uri_escape_utf8($bibrec->{$field});	2312	push @$array, { name => $field, value => $bibrec->{$field} }
2313	push @$array, { name=>$field, value=>$bibrec->{$field}, encvalue=>$encvalue } if defined $bibrec->{$field};	2313	if defined $bibrec->{$field};
2314	}	2314	}
2315	return $array;	2315	return $array;
2316	}	2316	}