From f95f38182fdca5552268936d3aff527b1d94fb45 Mon Sep 17 00:00:00 2001 From: kohamaster Date: Tue, 25 Oct 2016 13:37:47 +0200 Subject: [PATCH] Bug_17484 Search with date range limit (lower and upper) does not work If the period is entered without spaces wrapping the hyphen You can't get any result --- catalogue/search.pl | 7 +------ opac/opac-search.pl | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 5855bf1..e4e5e66 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -416,12 +416,7 @@ $template->param(available => $available); my $limit_yr; my $limit_yr_value; if ($params->{'limit-yr'}) { - if ($params->{'limit-yr'} =~ /\d{4}-\d{4}/) { - my ($yr1,$yr2) = split(/-/, $params->{'limit-yr'}); - $limit_yr = "yr,st-numeric,ge=$yr1 and yr,st-numeric,le=$yr2"; - $limit_yr_value = "$yr1-$yr2"; - } - elsif ($params->{'limit-yr'} =~ /\d{4}/) { + if ($params->{'limit-yr'} =~ /\d{4}/) { $limit_yr = "yr,st-numeric=$params->{'limit-yr'}"; $limit_yr_value = $params->{'limit-yr'}; } diff --git a/opac/opac-search.pl b/opac/opac-search.pl index ccbc025..3c07b88 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -506,11 +506,7 @@ $template->param(available => $available); # append year limits if they exist if ($params->{'limit-yr'}) { - if ($params->{'limit-yr'} =~ /\d{4}-\d{4}/) { - my ($yr1,$yr2) = split(/-/, $params->{'limit-yr'}); - push @limits, "yr,st-numeric,ge=$yr1 and yr,st-numeric,le=$yr2"; - } - elsif ($params->{'limit-yr'} =~ /\d{4}/) { + if ($params->{'limit-yr'} =~ /\d{4}/) { push @limits, "yr,st-numeric=$params->{'limit-yr'}"; } else { -- 2.1.4