[Koha-cvs] CVS: koha/C4 Context.pm,1.13,1.14 Search.pm,1.66,1.67

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv19413/C4

Modified Files:
	Context.pm Search.pm 
Log Message:
removing searchborrower from circ2.pm.
Already exists in Search.pm
this fixes bug #439 and improve consistency.


Index: Context.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Context.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Context.pm	10 Feb 2003 06:37:00 -0000	1.13
--- Context.pm	5 Jun 2003 17:03:32 -0000	1.14
***************
*** 366,370 ****
  	my $db_user   = $context->{"config"}{"user"};
  	my $db_passwd = $context->{"config"}{"pass"};
- 
  	return DBI->connect("DBI:$db_driver:$db_name:$db_host",
  			    $db_user, $db_passwd);
--- 366,369 ----

Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -r1.66 -r1.67
*** Search.pm	19 May 2003 14:55:32 -0000	1.66
--- Search.pm	5 Jun 2003 17:03:32 -0000	1.67
***************
*** 1738,1772 ****
  #called by member.pl
  sub BornameSearch  {
!   my ($env,$searchstring,$type)=@_;
!   my $dbh = C4::Context->dbh;
!   $searchstring=~ s/\'/\\\'/g;
!   my @data=split(' ',$searchstring);
!   my $count=@data;
!   my $query="Select * from borrowers
!   where ((surname like \"$data[0]%\" or surname like \"% $data[0]%\"
!   or firstname  like \"$data[0]%\" or firstname like \"% $data[0]%\"
!   or othernames like \"$data[0]%\" or othernames like \"% $data[0]%\")
!   ";
!   for (my $i=1;$i<$count;$i++){
!     $query=$query." and (surname like \"$data[$i]%\" or surname like \"% $data[$i]%\"
!     or firstname  like \"$data[$i]%\" or firstname like \"% $data[$i]%\"
!     or othernames like \"$data[$i]%\" or othernames like \"% $data[$i]%\")";
! 			# FIXME - .= <<EOT;
!   }
!   $query=$query.") or cardnumber = \"$searchstring\"
!   order by surname,firstname";
! 			# FIXME - .= <<EOT;
! #  print $query,"\n";
!   my $sth=$dbh->prepare($query);
!   $sth->execute;
!   my @results;
!   my $cnt=0;
!   while (my $data=$sth->fetchrow_hashref){
!     push(@results,$data);
!     $cnt ++;
!   }
! #  $sth->execute;
!   $sth->finish;
!   return ($cnt,\@results);
  }
  
--- 1738,1773 ----
  #called by member.pl
  sub BornameSearch  {
! 	my ($env,$searchstring,$type)=@_;
! 	my $dbh = C4::Context->dbh;
! 	$searchstring=~ s/\,//g;
! 	$searchstring=~ s/\'/\\\'/g;
! 	my @data=split(' ',$searchstring);
! 	my $count=@data;
! 	my $query="Select * from borrowers
! 	where ((surname like \"$data[0]%\" or surname like \"% $data[0]%\"
! 	or firstname  like \"$data[0]%\" or firstname like \"% $data[0]%\"
! 	or othernames like \"$data[0]%\" or othernames like \"% $data[0]%\")
! 	";
! 	for (my $i=1;$i<$count;$i++){
! 	$query=$query." and (surname like \"$data[$i]%\" or surname like \"% $data[$i]%\"
! 	or firstname  like \"$data[$i]%\" or firstname like \"% $data[$i]%\"
! 	or othernames like \"$data[$i]%\" or othernames like \"% $data[$i]%\")";
! 				# FIXME - .= <<EOT;
! 	}
! 	$query=$query.") or cardnumber = \"$searchstring\"
! 	order by surname,firstname";
! 				# FIXME - .= <<EOT;
! 	#  print $query,"\n";
! 	my $sth=$dbh->prepare($query);
! 	$sth->execute;
! 	my @results;
! 	my $cnt=0;
! 	while (my $data=$sth->fetchrow_hashref){
! 	push(@results,$data);
! 	$cnt ++;
! 	}
! 	#  $sth->execute;
! 	$sth->finish;
! 	return ($cnt,\@results);
  }