merging 1.2 and main branches
This commit is contained in:
parent
057fd6af5c
commit
bd04fceca8
1 changed files with 9 additions and 4 deletions
|
@ -76,12 +76,17 @@ printend
|
||||||
;
|
;
|
||||||
|
|
||||||
print center();
|
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 ";
|
print "You searched on ";
|
||||||
while ( my ($key, $value) = each %search) {
|
while ( my ($key, $value) = each %search) {
|
||||||
|
|
Loading…
Reference in a new issue