[Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.18,1.19

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11772/C4

Modified Files:
        SearchMarc.pm 
Log Message:
merging tag & subfield in marc_word for better perfs

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** SearchMarc.pm       11 Jun 2004 14:01:28 -0000      1.18
--- SearchMarc.pm       17 Jun 2004 08:17:01 -0000      1.19
***************
*** 275,290 ****
  # add the last line, that is not reached byt the loop / if 
($oldbiblionumber...)
        my %newline;
!       %newline = %$oldline;
!       $newline{totitem} = $totalitems;
!       $newline{biblionumber} = $oldbiblionumber;
!       my @CNresults2= @CNresults;
!       $newline{CN} = address@hidden;
!       $newline{'even'} = 1 if $counter % 2 == 0;
!       $newline{'odd'} = 1 if $counter % 2 == 1;
!       @CNresults = ();
!       my @CNresults2= @CNresults;
!       $newline{CN} = address@hidden;
!       @CNresults = ();
!       push @finalresult, \%newline;
        my $nbresults = $#result + 1;
        return (address@hidden, $nbresults);
--- 275,292 ----
  # add the last line, that is not reached byt the loop / if 
($oldbiblionumber...)
        my %newline;
!       if ($oldline) {
!               %newline = %$oldline;
!               $newline{totitem} = $totalitems;
!               $newline{biblionumber} = $oldbiblionumber;
!               my @CNresults2= @CNresults;
!               $newline{CN} = address@hidden;
!               $newline{'even'} = 1 if $counter % 2 == 0;
!               $newline{'odd'} = 1 if $counter % 2 == 1;
!               @CNresults = ();
!               my @CNresults2= @CNresults;
!               $newline{CN} = address@hidden;
!               @CNresults = ();
!               push @finalresult, \%newline;
!       }
        my $nbresults = $#result + 1;
        return (address@hidden, $nbresults);
***************
*** 317,321 ****
                                        $sql_where1 .= "(m1.word  like 
".$dbh->quote("@$value[$i]%");
                                        if (@$tags[$i]) {
!                                                $sql_where1 .=" and 
m1.tag+m1.subfieldid in (@$tags[$i])";
                                        }
                                        $sql_where1.=")";
--- 319,323 ----
                                        $sql_where1 .= "(m1.word  like 
".$dbh->quote("@$value[$i]%");
                                        if (@$tags[$i]) {
!                                                $sql_where1 .=" and 
m1.tagsubfield in (@$tags[$i])";
                                        }
                                        $sql_where1.=")";
***************
*** 344,348 ****
                                                $sql_where1 .= "@$and_or[$i] 
(m$nb_table.word like ".$dbh->quote("@$value[$i]%");
                                                if (@$tags[$i]) {
!                                                       $sql_where1 .=" and 
m$nb_table.tag+m$nb_table.subfieldid in(@$tags[$i])";
                                                }
                                                $sql_where1.=")";
--- 346,350 ----
                                                $sql_where1 .= "@$and_or[$i] 
(m$nb_table.word like ".$dbh->quote("@$value[$i]%");
                                                if (@$tags[$i]) {
!                                                       $sql_where1 .=" and 
m$nb_table.tagsubfield in(@$tags[$i])";
                                                }
                                                $sql_where1.=")";
***************
*** 351,355 ****
                                                $sql_where1 .= "@$and_or[$i] 
(m$nb_table.word like ".$dbh->quote("@$value[$i]%");
                                                if (@$tags[$i]) {
!                                                       $sql_where1 .="  and 
m$nb_table.tag+m$nb_table.subfieldid in (@$tags[$i])";
                                                }
                                                $sql_where1.=")";
--- 353,357 ----
                                                $sql_where1 .= "@$and_or[$i] 
(m$nb_table.word like ".$dbh->quote("@$value[$i]%");
                                                if (@$tags[$i]) {
!                                                       $sql_where1 .="  and 
m$nb_table.tagsubfield in (@$tags[$i])";
                                                }
                                                $sql_where1.=")";