[Koha-cvs] CVS: koha/C4 Input.pm,1.1.1.1.2.5,1.1.1.1.2.6

[Chris Cormack]

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

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



Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -C2 -r1.1.1.1.2.5 -r1.1.1.1.2.6
*** Input.pm	14 Aug 2002 18:30:50 -0000	1.1.1.1.2.5
--- Input.pm	2 Jul 2003 22:17:41 -0000	1.1.1.1.2.6
***************
*** 21,24 ****
--- 21,25 ----
  use strict;
  require Exporter;
+ use C4::Context;
  
  use vars qw($VERSION @ISA @EXPORT);
***************
*** 27,80 ****
  $VERSION = 0.01;
  
  @ISA = qw(Exporter);
  @EXPORT = qw(
! 	&checkflds &checkdigit &checkvalidisbn
  );
-  
- sub checkflds {
-   my ($env,$reqflds,$data) = @_;
-   my $numrflds = @$reqflds;
-   my @probarr;
-   my $i = 0;
-   while ($i < $numrflds) {
-     if ($data->{@$reqflds[$i]} eq "") {
-       push(@probarr, @$reqflds[$i]);
-     }  
-     $i++
-   }
-   return (\@probarr);
- }
  
  sub checkdigit {
!   my ($env,$infl) =  @_;
!   $infl = uc $infl;
!   my @weightings = (8,4,6,3,5,2,1);
!   my $sum;
!   my $i = 1;
!   my $valid = 0;
!   #  print $infl."<br>";
!   while ($i <8) {
!     my $temp1 = $weightings[$i-1];
!     my $temp2 = substr($infl,$i,1);
!     $sum = $sum + ($temp1*$temp2);
! #    print "$sum $temp1 $temp2<br>";
!     $i++;
!   }
!   my $rem = ($sum%11);
!   if ($rem == 10) {
!     $rem = "X";
!   }  
!   #print $rem."<br>";
!   if ($rem eq substr($infl,8,1)) {
!     $valid = 1;
!   }
!   return $valid;
  } # sub checkdigit
  
  #--------------------------------------
  # Determine if a number is a valid ISBN number, according to length
  #   of 10 digits and valid checksum
  sub checkvalidisbn {
!         use strict; 
          my ($q)=@_ ;	# Input: ISBN number
  
--- 28,146 ----
  $VERSION = 0.01;
  
+ =head1 NAME
+ 
+ C4::Input - Miscellaneous sanity checks
+ 
+ =head1 SYNOPSIS
+ 
+   use C4::Input;
+ 
+ =head1 DESCRIPTION
+ 
+ This module provides functions to see whether a given library card
+ number or ISBN is valid.
+ 
+ =head1 FUNCTIONS
+ 
+ =over 2
+ 
+ =cut
+ 
  @ISA = qw(Exporter);
  @EXPORT = qw(
! 	&checkdigit &checkvalidisbn
  );
  
+ # FIXME - This is never used.
+ #sub checkflds {
+ #  my ($env,$reqflds,$data) = @_;
+ #  my $numrflds = @$reqflds;
+ #  my @probarr;
+ #  my $i = 0;
+ #  while ($i < $numrflds) {
+ #    if ($data->{@$reqflds[$i]} eq "") {
+ #      push(@probarr, @$reqflds[$i]);
+ #    }
+ #    $i++
+ #  }
+ #  return (\@probarr);
+ #}
+ 
+ =item checkdigit
+ 
+   $valid = &checkdigit($env, $cardnumber);
+ 
+ Takes a card number, computes its check digit, and compares it to the
+ checkdigit at the end of C<$cardnumber>. Returns a true value iff
+ C<$cardnumber> has a valid check digit.
+ 
+ C<$env> is ignored.
+ 
+ =cut
+ #'
  sub checkdigit {
! 
! 	my ($env,$infl, $nounique) =  @_;
! 	$infl = uc $infl;
! 
! 
! 	#Check to make sure the cardnumber is unique
! 
! 	#FIXME: We should make the error for a nonunique cardnumber
! 	#different from the one where the checkdigit on the number is
! 	#not correct
! 
! 	unless ( $nounique ) 
! 	{
! 		my $dbh=C4::Context->dbh;
! 		my $query=qq{SELECT * FROM borrowers WHERE cardnumber="$infl"};
! 		my $sth=$dbh->prepare($query);
! 		$sth->execute;
! 		my %results = $sth->fetchrow_hashref();
! 		if ( $sth->rows != 0 )
! 		{
! 			return 0;
! 		}
! 	}
! 
! 	if (C4::Context->preference("checkdigit") eq "none") {
! 		return 1;
! 	} else {
! 		my @weightings = (8,4,6,3,5,2,1);
! 		my $sum;
! 		my $i = 1;
! 		my $valid = 0;
! 
! 		foreach $i (1..7) {
! 			my $temp1 = $weightings[$i-1];
! 			my $temp2 = substr($infl,$i,1);
! 			$sum += $temp1 * $temp2;
! 		}
! 		my $rem = ($sum%11);
! 		if ($rem == 10) {
! 		$rem = "X";
! 		}
! 		if ($rem eq substr($infl,8,1)) {
! 			$valid = 1;
! 		}
! 		return $valid;
! 	}
  } # sub checkdigit
  
+ =item checkvalidisbn
+ 
+   $valid = &checkvalidisbn($isbn);
+ 
+ Returns a true value iff C<$isbn> is a valid ISBN: it must be ten
+ digits long (counting "X" as a digit), and must have a valid check
+ digit at the end.
+ 
+ =cut
+ #'
  #--------------------------------------
  # Determine if a number is a valid ISBN number, according to length
  #   of 10 digits and valid checksum
  sub checkvalidisbn {
!         use strict;
          my ($q)=@_ ;	# Input: ISBN number
  
***************
*** 84,106 ****
          $q=~s/[^X\d]//g;
          $q=~s/X.//g;
!         if (length($q)==10) {
!             my $checksum=substr($q,9,1);
!             my $isbn=substr($q,0,9);
!             my $i;  
!             my $c=0;
!             for ($i=0; $i<9; $i++) { 
!                 my $digit=substr($q,$i,1);
!                 $c+=$digit*($i+1);
!             }
! 	    $c=$c%11;  # % is the modulus function
!             ($c==10) && ($c='X');
!             if ($c eq $checksum) {
!                 $isbngood=1;
!             } else {
!                 $isbngood=0;
!             }
!         } else {
!             $isbngood=0;
!         } # if length good
  
          return $isbngood;
--- 150,171 ----
          $q=~s/[^X\d]//g;
          $q=~s/X.//g;
!         
! 	#return 0 if $q is not ten digits long
! 	if (length($q)!=10) {
! 		return 0;
! 	}
! 	
! 	#If we get to here, length($q) must be 10
!         my $checksum=substr($q,9,1);
!         my $isbn=substr($q,0,9);
!         my $i;
!         my $c=0;
!         for ($i=0; $i<9; $i++) {
!             my $digit=substr($q,$i,1);
!             $c+=$digit*(10-$i);
!         }
! 	$c %= 11;
!         ($c==10) && ($c='X');
!         $isbngood = $c eq $checksum;
  
          return $isbngood;
***************
*** 108,111 ****
  } # sub checkvalidisbn
  
-  
  END { }       # module clean-up code here (global destructor)
--- 173,186 ----
  } # sub checkvalidisbn
  
  END { }       # module clean-up code here (global destructor)
+ 
+ 1;
+ __END__
+ 
+ =back
+ 
+ =head1 AUTHOR
+ 
+ Koha Developement team <info at koha.org>
+ 
+ =cut