From bd04fceca8e559964b993c59cf5b057746fdd97c Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 4 Jul 2002 10:42:31 +0000
Subject: [PATCH] merging 1.2 and main branches

---
 acqui/newbasket2.pl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/acqui/newbasket2.pl b/acqui/newbasket2.pl
index d777523513..4d79d9642d 100755
--- a/acqui/newbasket2.pl
+++ b/acqui/newbasket2.pl
@@ -76,12 +76,17 @@ printend
 ;
 
 print center();
-my $count;
-my @results;
-
 
-      ($count,@results)=&CatSearch(\$blah,'loose',\%search,$num,$offset);
 
+    if ($keyword ne ''){
+#      print "hey";
+      ($count,@results)=KeywordSearch(undef,'intra',\%search,$num,$offset);
+    } elsif ($search{'front'} ne '') {
+    ($count,@results)=FrontSearch(undef,'intra',\%search,$num,$offset);
+    }else {
+      ($count,@results)=CatSearch(undef,'loose',\%search,$num,$offset);
+#            print "hey";
+    }
 
 print "You searched on ";
 while ( my ($key, $value) = each %search) {                                 
-- 
2.39.5