[Koha-cvs] CVS: koha/members member.pl,1.3,1.4 memberentry.pl,1.6,1.7 moremember.pl,1.8,1.9

[Paul POULAIN]

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

Modified Files:
        member.pl memberentry.pl moremember.pl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits 
done here

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** member.pl   13 Jan 2005 21:48:49 -0000      1.3
--- member.pl   1 Mar 2005 13:41:26 -0000       1.4
***************
*** 64,69 ****
  
  my $member=$input->param('member');
  $member =~ s/,//g;   #remove any commas from search string
! 
  my $env;
  
--- 64,71 ----
  
  my $member=$input->param('member');
+ my $orderby=$input->param('orderby');
+ $orderby = "surname,firstname" unless $orderby;
  $member =~ s/,//g;   #remove any commas from search string
! $member =~ s/\*/%/g;
  my $env;
  
***************
*** 72,80 ****
  if(length($member) == 1)
  {
!       ($count,$results)=BornameSearch($env,$member,"simple");
  }
  else
  {
!       ($count,$results)=BornameSearch($env,$member,"advanced");
  }
  
--- 74,82 ----
  if(length($member) == 1)
  {
!       ($count,$results)=BornameSearch($env,$member,$orderby,"simple");
  }
  else
  {
!       ($count,$results)=BornameSearch($env,$member,$orderby,"advanced");
  }
  

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** memberentry.pl      16 Feb 2005 20:23:58 -0000      1.6
--- memberentry.pl      1 Mar 2005 13:41:26 -0000       1.7
***************
*** 78,82 ****
                #check cardnumber is valid
                my $nounique;
!               if ( $data{'actionType'} eq "Add" )    {
                        $nounique = 0;
                } else {
--- 78,82 ----
                #check cardnumber is valid
                my $nounique;
!               if ( $op eq "add" )    {
                        $nounique = 0;
                } else {