From: Henri-Damien LAURENT <henridamien@koha-fr.org>
Date: Thu, 20 Mar 2008 16:31:11 +0000 (+0100)
Subject: bug fix : 1804 : Now empty authorities and empty search return results.
X-Git-Tag: v3.00.00-beta~16
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=097e8f1c52095d75d173ddfca1d4e0683ce7147a;hp=6fc80555d146c2e82457b5bab7b69f3bb4860904;p=koha.git

bug fix : 1804 : Now empty authorities and empty search return results.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index 7693dae58c..04210cc472 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -252,8 +252,14 @@ sub SearchAuthorities {
         }         
         ## Adding order
         #$query=' @or  @attr 7=2 @attr 1=Heading 0 @or  @attr 7=1 @attr 1=Heading 1'.$query if ($sortby eq "HeadingDsc");
-	$query=' @or  @attr 7=1 @attr 1=Heading 0'.$query if ($sortby eq "HeadingAsc");
-	$query=' @or  @attr 7=2 @attr 1=Heading 0'.$query if ($sortby eq "HeadingDsc");
+        my $orderstring= ($sortby eq "HeadingAsc"?
+                           '@attr 7=1 @attr 1=Heading 0'
+                         :
+                           $sortby eq "HeadingDsc"?      
+                            '@attr 7=2 @attr 1=Heading 0'
+                           :''
+                        );            
+        $query=($query?"\@or $orderstring $query":"\@or \@attr 1=_ALLRECORDS \@attr 2=103 '' $orderstring ");
         
         $offset=0 unless $offset;
         my $counter = $offset;