[Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.33,1.34

[Paul POULAIN]

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

Modified Files:
        SearchMarc.pm 
Log Message:
* fixing "start by" operator
* in biblio search, - and other signs where not properly managed. 
Leroy-Beaulieu could not be found

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** SearchMarc.pm       24 Nov 2004 15:58:44 -0000      1.33
--- SearchMarc.pm       8 Dec 2004 10:21:46 -0000       1.34
***************
*** 202,205 ****
--- 202,206 ----
                # remove % at the beginning
                @$value[$i] =~ s/^%//g;
+           @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
                if(@$excluding[$i])     # NOT statements
                {
***************
*** 406,410 ****
                                if (@$operator[$i] eq "start") {
                                        $sql_tables .= "marc_subfield_table as 
m$nb_table,";
!                                       $sql_where1 .= "(m1.subfieldvalue like 
".$dbh->quote("@$value[$i]");
                                        if (@$tags[$i]) {
                                                $sql_where1 .=" and 
concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
--- 407,411 ----
                                if (@$operator[$i] eq "start") {
                                        $sql_tables .= "marc_subfield_table as 
m$nb_table,";
!                                       $sql_where1 .= "(m1.subfieldvalue like 
".$dbh->quote("@$value[$i]%");
                                        if (@$tags[$i]) {
                                                $sql_where1 .=" and 
concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
***************
*** 430,434 ****
                                        $nb_table++;
                                        $sql_tables .= "marc_subfield_table as 
m$nb_table,";
!                                       $sql_where1 .= "@$and_or[$i] 
(m$nb_table.subfieldvalue like ".$dbh->quote("@$value[$i]");
                                        if (@$tags[$i]) {
                                                $sql_where1 .=" and 
concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
--- 431,435 ----
                                        $nb_table++;
                                        $sql_tables .= "marc_subfield_table as 
m$nb_table,";
!                                       $sql_where1 .= "@$and_or[$i] 
(m$nb_table.subfieldvalue like ".$dbh->quote("@$value[$i]%");
                                        if (@$tags[$i]) {
                                                $sql_where1 .=" and 
concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";