Lines 218-226
sub SearchAuthorities {
Link Here
|
218 |
|
218 |
|
219 |
my $dosearch; |
219 |
my $dosearch; |
220 |
my $and=" \@and " ; |
220 |
my $and=" \@and " ; |
221 |
my $q2; |
221 |
my @q2; |
222 |
for(my $i = 0 ; $i <= $#{$value} ; $i++) |
222 |
for(my $i = 0 ; $i <= $#{$value} ; $i++) |
223 |
{ |
223 |
{ |
|
|
224 |
my $querypart; |
224 |
if (@$value[$i]){ |
225 |
if (@$value[$i]){ |
225 |
##If mainentry search $a tag |
226 |
##If mainentry search $a tag |
226 |
if (@$tags[$i] eq "mainmainentry") { |
227 |
if (@$tags[$i] eq "mainmainentry") { |
Lines 244-259
sub SearchAuthorities {
Link Here
|
244 |
$attr .=" \@attr 5=1 \@attr 4=6 ";## Word list, right truncated, anywhere |
245 |
$attr .=" \@attr 5=1 \@attr 4=6 ";## Word list, right truncated, anywhere |
245 |
} |
246 |
} |
246 |
$attr =$attr."\"".@$value[$i]."\""; |
247 |
$attr =$attr."\"".@$value[$i]."\""; |
247 |
$q2 .=$attr; |
248 |
$querypart .=$attr; |
248 |
$dosearch=1; |
249 |
$dosearch=1; |
249 |
}#if value |
250 |
}#if value |
|
|
251 |
push @q2, $querypart; |
250 |
} |
252 |
} |
251 |
##Add how many queries generated |
253 |
##Add how many queries generated |
252 |
if ($query=~/\S+/){ |
254 |
my $count=0; |
253 |
$query= $and.$query.$q2 |
255 |
for my $querypart (@q2){ |
254 |
} else { |
256 |
if ($query=~/\S+/){ |
255 |
$query=$q2; |
257 |
$query= (($count<scalar(@q2)-1)?$and:"").$query.$querypart; |
256 |
} |
258 |
} |
|
|
259 |
else { |
260 |
$query= $querypart; |
261 |
} |
262 |
$count++; |
263 |
} |
264 |
|
257 |
## Adding order |
265 |
## Adding order |
258 |
#$query=' @or @attr 7=2 @attr 1=Heading 0 @or @attr 7=1 @attr 1=Heading 1'.$query if ($sortby eq "HeadingDsc"); |
266 |
#$query=' @or @attr 7=2 @attr 1=Heading 0 @or @attr 7=1 @attr 1=Heading 1'.$query if ($sortby eq "HeadingDsc"); |
259 |
my $orderstring= ($sortby eq "HeadingAsc"? |
267 |
my $orderstring= ($sortby eq "HeadingAsc"? |
260 |
- |
|
|