warn "QUERY BEFORE LIMITS: >$query<" if $DEBUG;
# add limits
- my $group_OR_limits;
+ my %group_OR_limits;
my $availability_limit;
foreach my $this_limit (@limits) {
if ( $this_limit =~ /available/ ) {
# group_OR_limits, prefixed by mc-
# OR every member of the group
elsif ( $this_limit =~ /mc/ ) {
-
- if ( $this_limit =~ /mc-ccode:/ ) {
+ my ($k,$v) = split(/:/, $this_limit,2);
+ if ( $k !~ /mc-i(tem)?type/ ) {
# in case the mc-ccode value has complicating chars like ()'s inside it we wrap in quotes
$this_limit =~ tr/"//d;
- my ($k,$v) = split(/:/, $this_limit,2);
$this_limit = $k.":\"".$v."\"";
}
- $group_OR_limits .= " or " if $group_OR_limits;
- $limit_desc .= " or " if $group_OR_limits;
- $group_OR_limits .= "$this_limit";
+ $group_OR_limits{$k} .= " or " if $group_OR_limits{$k};
+ $limit_desc .= " or " if $group_OR_limits{$k};
+ $group_OR_limits{$k} .= "$this_limit";
$limit_cgi .= "&limit=$this_limit";
$limit_desc .= " $this_limit";
}
}
}
}
- if ($group_OR_limits) {
+ foreach my $k (keys (%group_OR_limits)) {
$limit .= " and " if ( $query || $limit );
- $limit .= "($group_OR_limits)";
+ $limit .= "($group_OR_limits{$k})";
}
if ($availability_limit) {
$limit .= " and " if ( $query || $limit );
$template->param(branchloop => \@branch_loop, searchdomainloop => $categories);
# load the Type stuff
-# load the Type stuff
my $itemtypes = GetItemTypes;
# the index parameter is different for item-level itemtypes
my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
-my @itemtypesloop;
-my $selected=1;
+my @advancedsearchesloop;
my $cnt;
-my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
-
-if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
- my %row =( number=>$cnt++,
- ccl => qq($itype_or_itemtype,phr),
+my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes") || "itemtypes";
+my @advanced_search_types = split(/\|/, $advanced_search_types);
+
+foreach my $advanced_srch_type (@advanced_search_types) {
+ if ($advanced_srch_type eq 'itemtypes') {
+ # itemtype is a special case, since it's not defined in authorized values
+ my @itypesloop;
+ foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
+ my %row =( number=>$cnt++,
+ ccl => "$itype_or_itemtype,phr",
code => $thisitemtype,
- selected => $selected,
description => $itemtypes->{$thisitemtype}->{'description'},
- count5 => $cnt % 4,
imageurl=> getitemtypeimagelocation( 'intranet', $itemtypes->{$thisitemtype}->{'imageurl'} ),
);
- $selected = 0 if ($selected) ;
- push @itemtypesloop, \%row;
- }
- $template->param(itemtypeloop => \@itemtypesloop);
-} else {
- my $advsearchtypes = GetAuthorisedValues($advanced_search_types);
- for my $thisitemtype (sort {$a->{'lib'} cmp $b->{'lib'}} @$advsearchtypes) {
- my %row =(
- number=>$cnt++,
- ccl => $advanced_search_types,
+ push @itypesloop, \%row;
+ }
+ my %search_code = ( advanced_search_type => $advanced_srch_type,
+ code_loop => \@itypesloop );
+ push @advancedsearchesloop, \%search_code;
+ } else {
+ # covers all the other cases: non-itemtype authorized values
+ my $advsearchtypes = GetAuthorisedValues($advanced_srch_type);
+ my @authvalueloop;
+ for my $thisitemtype (@$advsearchtypes) {
+ my %row =(
+ number=>$cnt++,
+ ccl => $advanced_srch_type,
code => $thisitemtype->{authorised_value},
- selected => $selected,
description => $thisitemtype->{'lib'},
- count5 => $cnt % 4,
- imageurl=> getitemtypeimagelocation( 'intranet', $thisitemtype->{'imageurl'} ),
- );
- push @itemtypesloop, \%row;
+ imageurl => getitemtypeimagelocation( 'intranet', $thisitemtype->{'imageurl'} ),
+ );
+ push @authvalueloop, \%row;
+ }
+ my %search_code = ( advanced_search_type => $advanced_srch_type,
+ code_loop => \@authvalueloop );
+ push @advancedsearchesloop, \%search_code;
}
- $template->param(itemtypeloop => \@itemtypesloop);
}
+$template->param(advancedsearchesloop => \@advancedsearchesloop);
# The following should only be loaded if we're bringing up the advanced search template
if ( $template_type eq 'advsearch' ) {
padding-left:20px
}
-#advanced-search fieldset {
- border : 1px solid #EEE;
- -moz-border-radius : 3px;
- border-radius : 3px;
+.advsearch {
+ margin: 0;
}
-#advanced-search fieldset.action {
- border : 0;
+.advsearch fieldset {
+ border : 1px solid #EEE;
+ -moz-border-radius : 3px;
+ border-radius : 3px;
}
-#advanced-search fieldset fieldset {
- border : 1px solid #EEE;
- margin : 0;
- padding : .3em .5em;
- -moz-border-radius : 0;
- border-radius : 0;
+.advsearch fieldset.action {
+ border : 0;
}
-#advanced-search fieldset fieldset+fieldset {
- border-top : 0;
+
+.advsearch fieldset fieldset {
+ border : 1px solid #EEE;
+ margin : 0;
+ padding : .3em .5em;
+ -moz-border-radius : 0;
+ border-radius : 0;
}
-#advanced-search table {
- border-spacing : 5px;
- border-collapse : separate;
- border-width : 0;
+.advsearch fieldset fieldset+fieldset {
+ border-top : 0;
}
-#advanced-search td {
- border : 1px solid #EEE;
- padding : 0.3em 0.4em;
+.advsearch table {
+ border-spacing : 5px;
+ border-collapse : separate;
+ border-width : 0;
+}
+.advsearch td {
+ border : 1px solid #EEE;
+ padding : 0.3em 0.4em;
}
#circ_circulation_issue {
position: relative;
- subdivisions for searches generated by clicking on subject tracings.
Search Form:
-
- - Show checkboxes to search by
+ - Show tabs in OPAC and staff-side advanced search for limiting searches on the
- pref: AdvancedSearchTypes
- choices:
- itemtypes: itemtype
- ccode: collection code
- - on the OPAC and staff advanced search pages.
+ class: long
+ - "fields (separate values with |). Tabs appear in the order listed.<br/>"
+ - "<em>Currently supported values</em>: Item types (<strong>itemtypes</strong>), Collection Codes (<strong>ccode</strong>) and Shelving Location (<strong>loc</strong>)."
-
- By default,
- pref: expandedSearchOption
}
$(document).ready(function() {
$("input[name=q]:eq(0)").focus();
+ $('#advsearches > ul').tabs();
});
</script>
</head>
<a href="/cgi-bin/koha/catalogue/search.pl?do=Clear">[New search]</a>
</fieldset>
<!-- /SEARCH BUTTONS -->
-
-<!-- ITEMTYPE LIMITS -->
- <fieldset id="itemtypelist">
- <legend>Limit to any of the following</legend>
+</div>
+<!-- MC-TYPE LIMITS -->
+ <div class="yui-g">
+ <div id="advsearches" class="toptabs">
+ <ul>
+ [% FOREACH advsearchloo IN advancedsearchesloop %]
+ <li id="advsearch-tab-[% advsearchloo.advanced_search_type %]">
+ <a href="/cgi-bin/koha/opac-search.pl#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">
+ <h4>Limit to any of the following:</h4>
<table>
<tr>
- [% FOREACH itemtypeloo IN itemtypeloop %]
- <td>
- [% UNLESS ( noItemTypeImages ) %]
- [% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]
- [% END %]
- <input type="checkbox" id="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]" />
- <label for="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]">[% itemtypeloo.description %]</label></td>
- [% UNLESS ( itemtypeloo.count5 ) %]</tr><tr>[% END %]
- [% END %]
- <!-- FIXME: for validation, avoid generating empty row -->
- </tr>
+ [% FOREACH itemtypeloo IN advsearchloo.code_loop %]
+ <td><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 border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %] [% END %]
+ [% itemtypeloo.description %]</label></td>
+ [% IF ( loop.last ) %]</tr>[% ELSE %][% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %][% END %]
+ [% END %]
</table>
- </fieldset>
-<!-- /ITEMTYPE LIMITS -->
-
+ </div>
+ [% END %]
+<!-- /MC-TYPE LIMIT -->
[% IF ( expanded_options ) %]
<!-- BASIC LIMITS -->
<fieldset id="basiclimits">
</fieldset>
<!-- /SEARCH BUTTONS -->
</div>
+</div>
</form>
</div>
}
/* the itemtype list in advanced search */
-#advsearch-itemtype table {
+.advsearch table {
border-collapse : separate;
border-spacing : 3px;
border : 0px;
border : 0px solid #D8DEB8;
}
-#advsearch-itemtype table tr td {
+.advsearch table tr td {
background-color : #F8F8EB;
border : 0px;
margin : 0px;
width : 700px;
}
-#advsearch-itemtype td {
+.advsearch td {
font-size : 0.8em;
background-color : #F8F8EB;
}
margin : 0 .5em;
padding : .3em;
}
+
p.patronimage {
border:1px solid #EEE;
border-bottom-color:#000;
p.patronimage.edit {
border-color:#E8E8E8;
margin: 1em 1em 1em 0;
-}
\ No newline at end of file
+}
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %]
Catalog › Advanced Search
[% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript" language="javascript">//<![CDATA[
+ $(document).ready(function() {
+ $('#advsearches > ul').tabs();
+});
+ //]]>
+</script>
</head>
<body id="advsearch"><div id="doc3" class="yui-t7">
<div id="bd">
</div>
</div>
<div class="yui-g">
+ <div id="advsearches" class="toptabs">
+ <ul>
+ [% FOREACH advsearchloo IN advancedsearchesloop %]
+ <li id="advsearch-tab-[% advsearchloo.advanced_search_type %]">
+ <a href="/cgi-bin/koha/opac-search.pl#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>
<!-- /BOOLEAN SEARCH OPTIONS -->
- <div id="advsearch-itemtype" class="container">
+ [% FOREACH advsearchloo IN advancedsearchesloop %]
+ <div id="advsearch-[% advsearchloo.advanced_search_type %]" class="container advsearch">
<fieldset>
<legend>Limit to any of the following:</legend>
<table>
<tr>
- [% FOREACH itemtypeloo IN itemtypeloop %]
- <td><input type="checkbox" id="[% itemtypeloo.ccl
%]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %] [% END %]
+ [% FOREACH itemtypeloo IN advsearchloo.code_loop %]
+ <td><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 border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %] [% END %]
[% itemtypeloo.description %]</label></td>
- [% UNLESS ( itemtypeloo.count5 ) %][% UNLESS ( loop.last ) %]</tr><tr>[% END %][% END %]
+ [% IF ( loop.last ) %]</tr>[% ELSE %][% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %][% END %]
[% END %]
- </tr>
</table>
</fieldset>
</div>
+ [% END %]
+ </div>
<div id="langfilter">
<fieldset><legend>Language</legend>
<!-- LANGUAGE LIMIT -->
<p><label for="language-limit">Language: </label>
- <select name="limit">
+ <select id="language-limit" name="limit">
<option value="">No Limit</option>
[% FOREACH search_languages_loo IN search_languages_loop %]
[% IF ( search_languages_loo.selected ) %]
my $itemtypes = GetItemTypes;
# the index parameter is different for item-level itemtypes
my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
-my @itemtypesloop;
-my $selected=1;
+my @advancedsearchesloop;
my $cnt;
-my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes");
-
-if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') {
- foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
- my %row =( number=>$cnt++,
- ccl => "$itype_or_itemtype,phr",
+my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes") || "itemtypes";
+my @advanced_search_types = split(/\|/, $advanced_search_types);
+
+foreach my $advanced_srch_type (@advanced_search_types) {
+ if ($advanced_srch_type eq 'itemtypes') {
+ # itemtype is a special case, since it's not defined in authorized values
+ my @itypesloop;
+ foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) {
+ my %row =( number=>$cnt++,
+ ccl => "$itype_or_itemtype,phr",
code => $thisitemtype,
- selected => $selected,
description => $itemtypes->{$thisitemtype}->{'description'},
- count5 => $cnt % 4,
imageurl=> getitemtypeimagelocation( 'opac', $itemtypes->{$thisitemtype}->{'imageurl'} ),
);
- $selected = 0; # set to zero after first pass through
- push @itemtypesloop, \%row;
- }
-} else {
- my $advsearchtypes = GetAuthorisedValues($advanced_search_types, '', 'opac');
- for my $thisitemtype (@$advsearchtypes) {
- my %row =(
- number=>$cnt++,
- ccl => $advanced_search_types,
+ push @itypesloop, \%row;
+ }
+ my %search_code = ( advanced_search_type => $advanced_srch_type,
+ code_loop => \@itypesloop );
+ push @advancedsearchesloop, \%search_code;
+ } else {
+ # covers all the other cases: non-itemtype authorized values
+ my $advsearchtypes = GetAuthorisedValues($advanced_srch_type, '', 'opac');
+ my @authvalueloop;
+ for my $thisitemtype (@$advsearchtypes) {
+ my %row =(
+ number=>$cnt++,
+ ccl => $advanced_srch_type,
code => $thisitemtype->{authorised_value},
- selected => $selected,
- description => $thisitemtype->{'lib'},
- count5 => $cnt % 4,
- imageurl=> getitemtypeimagelocation( 'opac', $thisitemtype->{'imageurl'} ),
- );
- push @itemtypesloop, \%row;
+ description => $thisitemtype->{'lib_opac'} || $thisitemtype->{'lib'},
+ imageurl => getitemtypeimagelocation( 'opac', $thisitemtype->{'imageurl'} ),
+ );
+ push @authvalueloop, \%row;
+ }
+ my %search_code = ( advanced_search_type => $advanced_srch_type,
+ code_loop => \@authvalueloop );
+ push @advancedsearchesloop, \%search_code;
}
}
-$template->param(itemtypeloop => \@itemtypesloop);
+$template->param(advancedsearchesloop => \@advancedsearchesloop);
# # load the itypes (Called item types in the template -- just authorized values for searching)
# my ($itypecount,@itype_loop) = GetCcodes();
projects / koha_gimpoz / commitdiff