[Koha-cvs] CVS: koha newmember.pl,1.1.1.1.2.3,1.1.1.1.2.4 memberentry.pl,1.6.2.8,1.6.2.9

[Chris Cormack]

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

Modified Files:
      Tag: rel-1-2
	newmember.pl memberentry.pl 
Log Message:
Fix for the duplicate member problem.
Thanks to mhansen



Index: newmember.pl
===================================================================
RCS file: /cvsroot/koha/koha/newmember.pl,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -C2 -r1.1.1.1.2.3 -r1.1.1.1.2.4
*** newmember.pl	13 Jan 2003 22:50:14 -0000	1.1.1.1.2.3
--- newmember.pl	2 Jul 2003 22:17:42 -0000	1.1.1.1.2.4
***************
*** 49,53 ****
    } else {
       #check cardnumber is valid
!      my $valid=checkdigit(\%env,$data{'cardnumber'});
       if ($valid != 1){
         $ok=1;
--- 49,62 ----
    } else {
       #check cardnumber is valid
!     my $nounique;
!     if ( $data{'newmember'} != 1 )
!     {
!         $nounique = 1;
!     }
!     else
!     {
!         $nounique = 0;
!     }
!     my $valid=checkdigit(\%env,$data{'cardnumber'}, $nounique);
       if ($valid != 1){
         $ok=1;
***************
*** 81,84 ****
--- 90,94 ----
    #we are printing confirmation page
    print mkheadr(1,'Confirm Record');
+   print mkheadr(1,"Type: $data{'type'}");
    if ($ok ==0){
     print mktablehdr;

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -C2 -r1.6.2.8 -r1.6.2.9
*** memberentry.pl	2 Apr 2003 17:51:12 -0000	1.6.2.8
--- memberentry.pl	2 Jul 2003 22:17:42 -0000	1.6.2.9
***************
*** 58,61 ****
--- 58,62 ----
  if ($type eq 'Add'){
    print "<input type=hidden name=updtype value=I>";
+   print "<input type=hidden name=newmember value=1>";
  } else {
    print "<input type=hidden name=updtype value=M>";
***************
*** 94,98 ****
      my $temp1 = $weightings[$i];	# read weightings, left to right, 1 char at a time
      my $temp2 = substr($cardnumber,$i,1);	# sequence left to right, 1 char at a time
! #print "$temp2<br>";
      $sum = $sum + ($temp1*$temp2);	# mult each char 1-7 by its corresponding weighting
      $i++;				# increment counter
--- 95,99 ----
      my $temp1 = $weightings[$i];	# read weightings, left to right, 1 char at a time
      my $temp2 = substr($cardnumber,$i,1);	# sequence left to right, 1 char at a time
! # print "$temp2<br>";
      $sum = $sum + ($temp1*$temp2);	# mult each char 1-7 by its corresponding weighting
      $i++;				# increment counter
***************
*** 102,106 ****
      $rem = "X";
    }  
!   $cardnumber="V$cardnumber$rem";
  } else {
    $cardnumber=$data->{'cardnumber'};
--- 103,107 ----
      $rem = "X";
    }  
!   $cardnumber="$cardnumber";
  } else {
    $cardnumber=$data->{'cardnumber'};
***************
*** 253,277 ****
  ;
  
!   print "
! <OPTION value=I";
!   if ($data->{'area'} eq 'I'){
!       print " Selected";
!   }
!   print ">I - In Area
  <OPTION value=O";
!   if ($data->{'area'} eq 'O'){
!       print " Selected";
!   }
!   print ">O - Out of Area
  <OPTION value=X";
!   if ($data->{'area'} eq 'X'){
!       print " Selected";
!   }
!   print ">X - Temporary Visitor
  <OPTION value=Z";
!   if ($data->{'area'} eq 'Z'){
!       print " Selected";
!   }
!   print ">Z - Interloan Libraries";
  print <<printend
  </SELECT></td></tr>
--- 254,303 ----
  ;
  
! print "
! <OPTION value=L";
! if ($data->{'area'} eq 'L'){
!   print " Selected";
! }
! print ">L - Levin
! <OPTION value=F";
! if ($data->{'area'} eq 'F'){
!   print " Selected";
! }
! print ">F - Foxton
! <OPTION value=S";
! if ($data->{'area'} eq 'S'){
!   print " Selected";
! }
! print ">S - Shannon
! <OPTION value=H";
! if ($data->{'area'} eq 'H'){
!   print " Selected";
! }
! print ">H - Horowhenua
! <OPTION value=K";
! if ($data->{'area'} eq 'K'){
!   print " Selected";
! }
! print ">K - Kapiti
  <OPTION value=O";
! if ($data->{'area'} eq 'O'){
!   print " Selected";
! }
! print ">O - Out of District
  <OPTION value=X";
! if ($data->{'area'} eq 'X'){
!   print " Selected";
! }
! print ">X - Temporary Visitor
  <OPTION value=Z";
! if ($data->{'area'} eq 'Z'){
!   print " Selected";
! }
! print ">Z - Interloan Libraries
! <OPTION value=V";
! if ($data->{'area'} eq 'V'){
!   print " Selected";
! }
! print ">V - Villlage";
  print <<printend
  </SELECT></td></tr>
***************
*** 403,406 ****
--- 429,434 ----
        <input type=hidden name=altrelationship value="$data->{'altrelationship'}">
        <input type=hidden name=altnotes value="$data->{'altnotes'}">
+      
+ 
  
  printend