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

(-)a/catalogue/search.pl (-5 / +5 lines)
Lines 193-198 if($cgi->cookie("holdfor")){ Link Here
193
    );
193
    );
194
}
194
}
195
195
196
# Default sort field and order
197
my $default_sort_field = C4::Context->preference('defaultSortField') || 'relevance'; # relevance field by default
198
my $default_sort_order = C4::Context->preference('defaultSortOrder') || 'dsc'; # decreasing order by default
199
my $default_sort_by = $default_sort_field.'_'.$default_sort_order;
200
196
## URI Re-Writing
201
## URI Re-Writing
197
# Deprecated, but preserved because it's interesting :-)
202
# Deprecated, but preserved because it's interesting :-)
198
# The same thing can be accomplished with mod_rewrite in
203
# The same thing can be accomplished with mod_rewrite in
Lines 289-296 if ( $template_type eq 'advsearch' ) { Link Here
289
    $template->param(outer_sup_servers_loop => $secondary_servers_loop,);
294
    $template->param(outer_sup_servers_loop => $secondary_servers_loop,);
290
295
291
    # set the default sorting
296
    # set the default sorting
292
    my $default_sort_by = C4::Context->preference('defaultSortField')."_".C4::Context->preference('defaultSortOrder')
293
        if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
294
    $template->param($default_sort_by => 1);
297
    $template->param($default_sort_by => 1);
295
298
296
    # determine what to display next to the search boxes (ie, boolean option
299
    # determine what to display next to the search boxes (ie, boolean option
Lines 354-362 my $params = $cgi->Vars; Link Here
354
# sort by is used to sort the query
357
# sort by is used to sort the query
355
# in theory can have more than one but generally there's just one
358
# in theory can have more than one but generally there's just one
356
my @sort_by;
359
my @sort_by;
357
my $default_sort_by = C4::Context->preference('defaultSortField')."_".C4::Context->preference('defaultSortOrder') 
358
    if (C4::Context->preference('defaultSortField') && C4::Context->preference('defaultSortOrder'));
359
360
@sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
360
@sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
361
$sort_by[0] = $default_sort_by unless $sort_by[0];
361
$sort_by[0] = $default_sort_by unless $sort_by[0];
362
foreach my $sort (@sort_by) {
362
foreach my $sort (@sort_by) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (+2 lines)
Lines 100-105 Searching: Link Here
100
                  author: author
100
                  author: author
101
            - ','
101
            - ','
102
            - pref: defaultSortOrder
102
            - pref: defaultSortOrder
103
              default: dsc
103
              choices:
104
              choices:
104
                  asc: ascending.
105
                  asc: ascending.
105
                  dsc: descending.
106
                  dsc: descending.
Lines 132-137 Searching: Link Here
132
                  author: author
133
                  author: author
133
            - ","
134
            - ","
134
            - pref: OPACdefaultSortOrder
135
            - pref: OPACdefaultSortOrder
136
              default: dsc
135
              choices:
137
              choices:
136
                  asc: ascending.
138
                  asc: ascending.
137
                  dsc: descending.
139
                  dsc: descending.
(-)a/opac/opac-search.pl (-6 / +5 lines)
Lines 118-123 if (C4::Context->preference('TagsEnabled')) { Link Here
118
	}
118
	}
119
}
119
}
120
120
121
# Default sort field and order
122
my $default_sort_field = C4::Context->preference('OPACdefaultSortField') || 'relevance'; # relevance field by default
123
my $default_sort_order = C4::Context->preference('OPACdefaultSortOrder') || 'dsc'; # decreasing order by default
124
my $default_sort_by = $default_sort_field.'_'.$default_sort_order;
125
121
## URI Re-Writing
126
## URI Re-Writing
122
# Deprecated, but preserved because it's interesting :-)
127
# Deprecated, but preserved because it's interesting :-)
123
# The same thing can be accomplished with mod_rewrite in
128
# The same thing can be accomplished with mod_rewrite in
Lines 207-214 if ( $template_type && $template_type eq 'advsearch' ) { Link Here
207
    $template->param(outer_sup_servers_loop => $secondary_servers_loop,);
212
    $template->param(outer_sup_servers_loop => $secondary_servers_loop,);
208
213
209
    # set the default sorting
214
    # set the default sorting
210
    my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') 
211
        if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
212
    $template->param($default_sort_by => 1);
215
    $template->param($default_sort_by => 1);
213
216
214
    # determine what to display next to the search boxes (ie, boolean option
217
    # determine what to display next to the search boxes (ie, boolean option
Lines 273-281 $tag = $params->{tag} if $params->{tag}; Link Here
273
# sort by is used to sort the query
276
# sort by is used to sort the query
274
# in theory can have more than one but generally there's just one
277
# in theory can have more than one but generally there's just one
275
my @sort_by;
278
my @sort_by;
276
my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') 
277
    if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
278
279
@sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
279
@sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
280
$sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by);
280
$sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by);
281
foreach my $sort (@sort_by) {
281
foreach my $sort (@sort_by) {
282
- 

Return to bug 6092