View | Details | Raw Unified | Return to bug 5615
Collapse All | Expand All

(-)a/C4/AuthoritiesMarc.pm (-4 / +8 lines)
Lines 245-257 sub SearchAuthorities { Link Here
245
                    $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
246
                }
246
                }
247
                $attr =$attr."\"".@$value[$i]."\"";
247
                $attr =$attr."\"".@$value[$i]."\"";
248
                $q2 = $and.$q2 if $q2; #Add @and if we already have existing queries
248
                $q2 .=$attr;
249
                $q2 .=$attr;
249
            $dosearch=1;
250
            $dosearch=1;
250
            }#if value
251
            }#if value
251
        }
252
        }
252
        ##Add how many queries generated
253
        ##Add how many queries generated
253
        if ($query=~/\S+/){    
254
        if ($query=~/\S+/){
254
          $query= $and.$query.$q2 
255
          if($q2=~/\S+/){
256
            $query= $and.$query.$q2;
257
          }
255
        } else {
258
        } else {
256
          $query=$q2;    
259
          $query=$q2;    
257
        }         
260
        }         
Lines 264-271 sub SearchAuthorities { Link Here
264
                            '@attr 7=2 @attr 1=Heading 0'
267
                            '@attr 7=2 @attr 1=Heading 0'
265
                           :''
268
                           :''
266
                        );            
269
                        );            
267
        $query=($query?"\@or $orderstring $query":"\@or \@attr 1=_ALLRECORDS \@attr 2=103 '' $orderstring ");
270
        $query=($query?$query:"\@attr 1=_ALLRECORDS \@attr 2=103 ''");
268
        
271
        $query="\@or $orderstring $query" if $orderstring;
272
269
        $offset=0 unless $offset;
273
        $offset=0 unless $offset;
270
        my $counter = $offset;
274
        my $counter = $offset;
271
        $length=10 unless $length;
275
        $length=10 unless $length;

Return to bug 5615