Bug 12495 - Include streetnumber in hold alert address

[koha_fer] / cataloguing / addbooks.pl

diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index f643599..0cfd7e8 100755 (executable)
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -73,13 +73,16 @@ if ($query) {
 
     my $QParser;
     $QParser = C4::Context->queryparser if (C4::Context->preference('UseQueryParser'));
-    unless ($QParser) {
-        my ( $builterror,$builtquery,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(undef,\@operands);
-        $query = $builtquery;
+    my $builtquery;
+    if ($QParser) {
+        $builtquery = $query;
+    } else {
+        my ( $builterror,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type);
+        ( $builterror,$builtquery,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(undef,\@operands);
     }
 
     # find results
-    my ( $error, $marcresults, $total_hits ) = SimpleSearch($query, $results_per_page * ($page - 1), $results_per_page);
+    my ( $error, $marcresults, $total_hits ) = SimpleSearch($builtquery, $results_per_page * ($page - 1), $results_per_page);
 
     if ( defined $error ) {
         $template->param( error => $error );
@@ -113,7 +116,9 @@ if ($query) {
 #check is on isbn legnth 13 for new isbn and 10 for old isbn
     my ( $title, $isbn );
     if ($query=~/\d/) {
-        my $querylength = length $query;
+        my $clean_query = $query;
+        $clean_query =~ s/-//g; # remove hyphens
+        my $querylength = length $clean_query;
         if ( $querylength == 13 || $querylength == 10 ) {
             $isbn = $query;
         }