f71f1ba6e2
While testing bug 10937, there were noisy warnings, which
distracted from testing the functionality of it.
Here is a snippet of the after the patch warnings:
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 384.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 161.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 161.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 177.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 177.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 202.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 202.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 240.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 240.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 256.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 256.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 356.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 356.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 369.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 369.
Tweaking the [% IF %] statements eliminated the warnings.
TEST PLAN
---------
1) Apply patch
2) Run koha qa test tools.
-- there will be noisy warnings in the before processing, but
there will be no such messages in the after processing.
3) git diff origin/master
-- there should be no visible typos.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
- Applied the patch from bug 10937
- Ran "koha-qa.pl -c 1" and observed the warnings described in the
commit message
- Applied the patch from this bug
- Ran "koha-qa.pl -c 1" again and saw no warnings
- Ran "koha-qa.pl -c 2" and saw no warnings
I have not tested the functionality of 10937 with this patch, just verified
that the changes look sensible.
This patch feels more like a followup for 10937, than a separate patch,
especially since 10937 is just "signed off" at this time. But as long as it
works...
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
406 lines
26 KiB
Text
406 lines
26 KiB
Text
[% USE Koha %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %]
|
|
catalog › Advanced search
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='advsearch' bodyclass='scrollto' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
<form action="/cgi-bin/koha/opac-search.pl" method="get">
|
|
<div class="main">
|
|
<ul class="breadcrumb">
|
|
<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li>
|
|
<li><a href="#">Advanced search</a></li>
|
|
</ul>
|
|
|
|
<div class="container-fluid">
|
|
<div class="row-fluid">
|
|
<div class="span12">
|
|
<!-- BOOLEAN SEARCH OPTIONS -->
|
|
<div id="booleansearch" class="maincontent">
|
|
<fieldset>
|
|
<legend>Search for:</legend>
|
|
[% FOREACH search_box IN search_boxes_loop %]
|
|
<p>
|
|
[% IF ( expanded_options ) %]
|
|
[% IF ( search_box.boolean ) %]
|
|
<select name="op">
|
|
<option value="and" selected="selected">and</option>
|
|
<option value="or">or</option>
|
|
<option value="not">not</option>
|
|
</select>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<label for="search-field_[% loop.index %]">
|
|
[% IF loop.index == 0 %]
|
|
|
|
[% ELSE %]
|
|
and
|
|
[% END %]
|
|
</label>
|
|
[% END %]
|
|
[% IF ( expanded_options ) %][% left_content %][% END %]
|
|
<select name="idx" id="search-field_[% loop.index %]">
|
|
<option value="kw">Keyword</option>
|
|
<option value="su,wrdl">Subject</option>
|
|
[% IF ( expanded_options ) %]
|
|
<option value="su,phr"> Subject phrase</option>
|
|
<option value="su-br"> Subject and broader terms</option>
|
|
<option value="su-na"> Subject and narrower terms</option>
|
|
<option value="su-rl"> Subject and related terms</option>
|
|
[% END %]
|
|
<option value="ti">Title</option>
|
|
[% IF ( expanded_options ) %]
|
|
<option value="ti,phr"> Title phrase</option>
|
|
<option value="se,wrdl">Series title</option>
|
|
[% IF ( numbersphr) %]
|
|
<option value="callnum,phr">Call number</option>
|
|
[% ELSE %]
|
|
<option value="callnum">Call number</option>
|
|
[% END %]
|
|
<option value="location">Shelving location</option>
|
|
[% END %]
|
|
<option value="au,wrdl">Author</option>
|
|
[% IF ( expanded_options ) %]
|
|
<option value="au,phr"> Author phrase</option>
|
|
<option value="cpn,wrdl"> Corporate name</option>
|
|
<option value="cfn,wrdl"> Conference name</option>
|
|
<option value="cfn,phr"> Conference name phrase</option>
|
|
<option value="pn,wrdl"> Personal name</option>
|
|
<option value="pn,phr"> Personal name phrase</option>
|
|
[% END %]
|
|
[% IF ( expanded_options ) %]
|
|
<option value="nt">Notes/Comments</option>
|
|
[% IF (marcflavour != 'UNIMARC') %]
|
|
<option value="curriculum">Curriculum</option>
|
|
[% END %]
|
|
[% END %]
|
|
<option value="pb,wrdl">Publisher</option>
|
|
<option value="pl,wrdl">Publisher location</option>
|
|
[% IF ( expanded_options ) %]
|
|
[% IF ( numbersphr) %]
|
|
<option value="sn,phr">Standard number</option>
|
|
[% ELSE %]
|
|
<option value="sn">Standard number</option>
|
|
[% END %]
|
|
<option value="nb"> ISBN</option>
|
|
<option value="ns"> ISSN</option>
|
|
[% ELSE %]
|
|
<option value="nb">ISBN</option>
|
|
[% END %]
|
|
<option value="bc">Barcode</option>
|
|
</select>
|
|
<input type="text" size="30" name="q" title="Enter search terms" value="" />
|
|
[% IF ( expanded_options ) %]
|
|
[% IF ( !loop.first ) %]
|
|
<a class="ButtonPlus" name="ButtonPlus" title="Add another field" href="#">[+]</a>
|
|
<a class="ButtonLess" title="Remove field" href="#">[-]</a>
|
|
[% END %]
|
|
[% END %]
|
|
</p>
|
|
[% END # FOREACH search_box %]
|
|
</fieldset>
|
|
</div> <!-- /BOOLEAN SEARCH OPTIONS -->
|
|
</div> <!-- / .span12 -->
|
|
</div> <!-- / .row-fluid -->
|
|
<div class="text-center">
|
|
<!-- SEARCH BUTTONS -->
|
|
[% PROCESS searchbuttons %]
|
|
<!-- /SEARCH BUTTONS -->
|
|
</div>
|
|
|
|
<div class="row-fluid">
|
|
[% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype').size > 0 and not expanded_options ) or
|
|
( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) %]
|
|
<div class="span12">
|
|
<div id="advsearches" class="toptabs">
|
|
<ul>
|
|
[% FOREACH advsearchloo IN advancedsearchesloop %]
|
|
<li id="advsearch-tab-[% advsearchloo.advanced_search_type %]">
|
|
<a href="#advsearch-[% advsearchloo.advanced_search_type %]">
|
|
[% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type
|
|
[% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection
|
|
[% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location
|
|
[% ELSE %]Something else
|
|
[% END %]
|
|
</a></li>
|
|
[% END %]
|
|
</ul>
|
|
|
|
[% FOREACH advsearchloo IN advancedsearchesloop %]
|
|
<div id="advsearch-[% advsearchloo.advanced_search_type %]" class="advsearch">
|
|
<fieldset>
|
|
<legend>Limit to any of the following:</legend>
|
|
<div class="row-fluid">
|
|
[% FOREACH itemtypeloo IN advsearchloo.code_loop %]
|
|
<div class="span3"><input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %] [% END %]
|
|
[% itemtypeloo.description %]</label></div>
|
|
[% IF ( loop.last ) %]</div>[% ELSE %][% UNLESS ( loop.count % 4 ) %]</div><div class="row-fluid">[% END %][% END %]
|
|
[% END %]
|
|
</fieldset>
|
|
</div> <!-- / #advsearch-[% advsearchloo.advanced_search_type %] -->
|
|
[% END # / FOREACH advancedsearchesloop %]
|
|
</div> <!-- / #advsearches -->
|
|
</div> <!-- / .span12 -->
|
|
[% END %]
|
|
|
|
<div class="row-fluid">
|
|
[% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('pubdate').size > 0 and not expanded_options ) or
|
|
( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('pubdate').size > 0 and expanded_options ) ) %]
|
|
<div class="span3">
|
|
<div id="pubrange">
|
|
<!-- PUB RANGE OPTION -->
|
|
<fieldset>
|
|
<legend>Publication date range</legend>
|
|
<label for="limit-yr">Date range:</label>
|
|
<input type="text" size="30" id="limit-yr" name="limit-yr" title="Enter search terms" value="" />
|
|
<p>For example: 1999-2001. You could also use "-1987" for everything published in and before 1987 or "2008-" for everything published in 2008 and after.</p>
|
|
</fieldset>
|
|
<!-- /PUB RANGE OPTION -->
|
|
</div>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('language').size > 0 and not expanded_options ) or
|
|
( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('language').size > 0 and expanded_options ) ) %]
|
|
<div class="span3">
|
|
<div id="langfilter">
|
|
<fieldset>
|
|
<legend>Language</legend>
|
|
<!-- LANGUAGE LIMIT -->
|
|
<p>
|
|
<label for="language-limit">Language: </label>
|
|
<select id="language-limit" name="limit">
|
|
<option value="">No limit</option>
|
|
[% FOREACH search_languages_loo IN search_languages_loop %]
|
|
[% IF ( search_languages_loo.selected ) %]
|
|
<option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]" selected="selected">[% search_languages_loo.language_description %]</option>
|
|
[% ELSE %]
|
|
<option value="ln,rtrn:[% search_languages_loo.iso639_2_code %]">[% search_languages_loo.language_description %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</p>
|
|
<!-- /LANGUAGE LIMIT -->
|
|
</fieldset>
|
|
</div> <!-- / #langfilter -->
|
|
</div> <!-- / .span3 -->
|
|
[% END %]
|
|
|
|
[% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('location').size > 0 and not expanded_options ) or
|
|
( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('location').size > 0 and expanded_options ) ) %]
|
|
[% UNLESS ( singleBranchMode ) %]
|
|
<div class="span3">
|
|
<!-- AVAILABILITY LIMITS -->
|
|
<div id="location">
|
|
<fieldset>
|
|
<legend>Location and availability: </legend>
|
|
<label for="branchloop">Library:</label>
|
|
<select name="limit" id="branchloop">
|
|
<option value="">All libraries</option>
|
|
[% FOREACH BranchesLoo IN BranchesLoop %]
|
|
[% IF ( BranchesLoo.selected ) %]
|
|
<option value="branch:[% BranchesLoo.value %]" selected="selected">[% BranchesLoo.branchname %]</option>
|
|
[% ELSE %]
|
|
<option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
[% IF ( searchdomainloop ) %]
|
|
<p>OR</p>
|
|
<label for="categoryloop">Groups of libraries</label>
|
|
<select name="multibranchlimit" id="categoryloop">
|
|
<option value=""> -- none -- </option>
|
|
[% FOREACH searchdomainloo IN searchdomainloop %]
|
|
<option value="[% searchdomainloo.categorycode %]">[% searchdomainloo.categoryname %]</option>
|
|
[% END %]
|
|
</select>
|
|
[% END %]
|
|
<div style="margin-top:.4em">
|
|
<label for="available-items"><input type="checkbox" id="available-items" name="limit" value="available" /> Only items currently available for loan or reference</label>
|
|
</div>
|
|
</fieldset>
|
|
</div> <!-- / #location -->
|
|
<!-- /AVAILABILITY LIMITS -->
|
|
</div> <!-- / .span3 -->
|
|
[% END # / UNLESS singleBranchMode %]
|
|
[% END %]
|
|
|
|
[% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('sorting').size > 0 and not expanded_options ) or
|
|
( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('sorting').size > 0 and expanded_options ) ) %]
|
|
<div class="span3">
|
|
<!-- RANK LIMITS -->
|
|
<div id="sortby">
|
|
<fieldset>
|
|
<legend>Sorting: </legend>
|
|
<label for="sort_by">Sort by:</label>
|
|
<select id="sort_by" name="sort_by">
|
|
[% INCLUDE 'resort_form.inc' %]
|
|
</select>
|
|
</fieldset>
|
|
</div>
|
|
<!-- RANK LIMITS -->
|
|
</div> <!-- / .span3 -->
|
|
[% END %]
|
|
</div> <!-- / .row-fluid -->
|
|
|
|
[% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('subtype').size > 0 and not expanded_options ) or
|
|
( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.grep('subtype').size > 0 and expanded_options ) ) %]
|
|
<div class="row-fluid">
|
|
[% IF ( usmarc ) %]
|
|
<!-- SUBTYPE LIMITS -->
|
|
<div id="subtypes">
|
|
<div class="span3">
|
|
<fieldset>
|
|
<legend>Audience</legend>
|
|
<select name="limit" class="subtype">
|
|
<option value="" selected="selected" class="menuheader">Any audience</option>
|
|
<option value="aud:a">Preschool</option>
|
|
<option value="aud:b">Primary</option>
|
|
<option value="aud:c">Pre-adolescent</option>
|
|
<option value="aud:d">Adolescent</option>
|
|
<option value="aud:e">Adult</option>
|
|
<option value="aud:f">Specialized</option>
|
|
<option value="aud:g">General</option>
|
|
<option value="aud:j">Juvenile</option>
|
|
</select>
|
|
</fieldset>
|
|
</div> <!-- / .span3 -->
|
|
|
|
<div class="span3">
|
|
<fieldset>
|
|
<legend>Content</legend>
|
|
<select name="limit" class="subtype">
|
|
<option value="" selected="selected" class="menuheader">Any content</option>
|
|
<option value="fic:1">Fiction</option>
|
|
<option value="fic:0">Non fiction</option>
|
|
<option value="bio:b">Biography</option>
|
|
<option value="mus:j">Musical recording</option>
|
|
<option value="mus:i">Non-musical recording</option>
|
|
</select>
|
|
</fieldset>
|
|
</div>
|
|
|
|
<div class="span3">
|
|
<fieldset>
|
|
<legend>Format</legend>
|
|
<select name="limit" class="subtype">
|
|
<option value="" selected="selected" class="menuheader">Any format</option>
|
|
<option value="l-format:ta">Regular print</option>
|
|
<option value="l-format:tb">Large print</option>
|
|
<option value="l-format:fk">Braille</option>
|
|
<option value="">-----------</option>
|
|
<option value="l-format:sd">CD audio</option>
|
|
<option value="l-format:ss">Cassette recording</option>
|
|
<option value="l-format:vf">VHS tape / Videocassette</option>
|
|
<option value="l-format:vd">DVD video / Videodisc</option>
|
|
<option value="l-format:co">CD software</option>
|
|
<option value="l-format:cr">Website</option>
|
|
</select>
|
|
</fieldset>
|
|
</div> <!-- / .span3 -->
|
|
|
|
<div class="span3">
|
|
<fieldset>
|
|
<legend>Additional content types for books/printed materials</legend>
|
|
<select name="limit" class="subtype">
|
|
<option value="">Any</option>
|
|
<option value="ctype:a">Abstracts/summaries</option>
|
|
<option value="ctype:b">Bibliographies</option>
|
|
<option value="ctype:c">Catalogs</option>
|
|
<option value="ctype:d">Dictionaries</option>
|
|
<option value="ctype:e">Encyclopedias </option>
|
|
<option value="ctype:f">Handbooks</option>
|
|
<option value="ctype:g">Legal articles</option>
|
|
<option value="ctype:i">Indexes</option>
|
|
<option value="ctype:j">Patent document</option>
|
|
<option value="ctype:k">Discographies</option>
|
|
<option value="ctype:l">Legislation</option>
|
|
<option value="ctype:m">Theses</option>
|
|
<option value="ctype:n">Surveys</option>
|
|
<option value="ctype:o">Reviews</option>
|
|
<option value="ctype:p">Programmed texts</option>
|
|
<option value="ctype:q">Filmographies</option>
|
|
<option value="ctype:r">Directories</option>
|
|
<option value="ctype:s">Statistics</option>
|
|
<option value="ctype:t">Technical reports</option>
|
|
<option value="ctype:v">Legal cases and case notes</option>
|
|
<option value="ctype:w">Law reports and digests</option>
|
|
<option value="ctype:z">Treaties </option>
|
|
</select>
|
|
</fieldset>
|
|
</div> <!-- / .span3 -->
|
|
</div> <!-- / #subtypes -->
|
|
<!-- SUBTYPE LIMITS -->
|
|
[% END # / IF usmarc %]
|
|
|
|
[% IF ( UNIMARC ) %]
|
|
<div id="subtypes_unimarc">
|
|
<!-- SUBTYPE LIMITS -->
|
|
[% INCLUDE 'subtypes_unimarc.inc' %]
|
|
</div>
|
|
[% END %]
|
|
|
|
</div> <!-- / .row-fluid -->
|
|
[% END # / IF expanded_options %]
|
|
</div> <!-- / .row-fluid -->
|
|
|
|
[% IF ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.size > 0 and expanded_options ) or
|
|
( OpacAdvSearchOptions and OpacAdvSearchOptions.size > 0 and not expanded_options ) %]
|
|
<div class="row-fluid">
|
|
<div class="span12">
|
|
<div class="text-center">
|
|
<!-- SEARCH BUTTONS -->
|
|
[% PROCESS searchbuttons %]
|
|
<!-- /SEARCH BUTTONS -->
|
|
</div>
|
|
</div> <!-- / .span12 -->
|
|
</div> <!-- / .row-fluid -->
|
|
[% END %]
|
|
</div> <!-- / .main -->
|
|
</form>
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK searchbuttons %]
|
|
<p>
|
|
<input class="btn btn-success" type="submit" accesskey="s" name="do" title="Search" value="Search" />
|
|
|
|
[% IF ( OpacAdvSearchMoreOptions and OpacAdvSearchMoreOptions.size > 0 ) %]
|
|
[% IF expanded_options %]
|
|
<a href="/cgi-bin/koha/opac-search.pl?expanded_options=0" class="btn btn-default more-less-options">Fewer options</a>
|
|
[% ELSIF not expanded_options %]
|
|
<a href="/cgi-bin/koha/opac-search.pl?expanded_options=1" class="btn btn-default more-less-options">More options</a>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
<a href="/cgi-bin/koha/opac-search.pl?do=Clear" class="btn btn-default new-search">New search</a>
|
|
</p>
|
|
[% END %]
|
|
|
|
[% BLOCK jsinclude %]
|
|
<script type="text/javascript">//<![CDATA[
|
|
$(document).ready(function() {
|
|
$('#advsearches').tabs();
|
|
});
|
|
/* This function allows to display a new field to search.
|
|
*/
|
|
$(document).on("click", '.ButtonPlus', function(e) {
|
|
e.preventDefault();
|
|
$('.ButtonLess').show();
|
|
var thisLine = $(this).parent();
|
|
var newLine = thisLine.clone();
|
|
newLine.find('input').val('');
|
|
thisLine.after(newLine);
|
|
});
|
|
|
|
$(document).on("click", '.ButtonLess', function(e) {
|
|
e.preventDefault();
|
|
if($(this).parent().siblings().length <= 3 ) {
|
|
$('.ButtonLess').hide();
|
|
}
|
|
$(this).parent().remove();
|
|
});
|
|
//]]>
|
|
</script>
|
|
[% END %]
|