X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FInput.pm;h=ba304607a716cefcd1eecb9ebdfd645394880029;hb=0f6882896d6a806fb474b1fd172e3e93919d960c;hp=4815091c0a03a2746eb6cab211bc964a6e3f4e17;hpb=2ee3977b0e5096671fb3ce4519eeec66a076af07;p=koha.git diff --git a/C4/Input.pm b/C4/Input.pm index 4815091c0a..ba304607a7 100644 --- a/C4/Input.pm +++ b/C4/Input.pm @@ -14,18 +14,21 @@ package C4::Input; #assumes C4/Input # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; +use warnings; + require Exporter; use C4::Context; +use CGI; use vars qw($VERSION @ISA @EXPORT); # set the version for version checking -$VERSION = 0.01; +$VERSION = 3.07.00.049; =head1 NAME @@ -48,129 +51,115 @@ number or ISBN is valid. @ISA = qw(Exporter); @EXPORT = qw( - &checkdigit &checkvalidisbn + &checkdigit + &buildCGIsort ); -# 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); + $valid = &checkdigit($cardnumber $nounique); 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 { +sub checkdigit ($;$) { - my ($env,$infl, $nounique) = @_; + my ($infl, $nounique) = @_; $infl = uc $infl; - - #Check to make sure the cardnumber is unique + # 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 ) + unless ( $nounique ) { - my $dbh=C4::Context->dbh; - my $query=qq{SELECT * FROM borrowers WHERE cardnumber="$infl"}; - my $sth=$dbh->prepare($query); - $sth->execute; + my $query=qq{SELECT * FROM borrowers WHERE cardnumber=?}; + my $sth=C4::Context->prepare($query); + $sth->execute($infl); 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) { + } + + my @weightings = (8,4,6,3,5,2,1); + my $sum; + foreach my $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; } + if ($rem eq substr($infl,8,1)) { + return 1; + } + return 0; } # sub checkdigit -=item checkvalidisbn +=item buildCGISort - $valid = &checkvalidisbn($isbn); + $CGIScrollingList = &buildCGISort($name string, $input_name string); -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. +Returns the scrolling list with name $input_name, built on authorised Values named $name. +Returns NULL if no authorised values found =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 - - my $isbngood = 0; # Return: true or false - - $q=~s/x$/X/g; # upshift lower case X - $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; - -} # sub checkvalidisbn +sub buildCGIsort { + my ( $name, $input_name, $data ) = @_; + my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : ""; + + my $dbh=C4::Context->dbh; + my $query = qq{ + SELECT * + FROM authorised_values + }; + $query .= qq{ + LEFT JOIN authorised_values_branches ON ( id = av_id ) + } if $branch_limit; + $query .= qq{ + WHERE category = ? + }; + $query .= qq{ AND ( branchcode = ? OR branchcode IS NULL )} if $branch_limit; + $query .= qq{ GROUP BY lib ORDER BY lib}; + + my $sth=$dbh->prepare($query); + $sth->execute( $name, $branch_limit ? $branch_limit : () ); + my $CGISort; + if ($sth->rows>0){ + my @values; + my %labels; + + for (my $i =0;$i<$sth->rows;$i++){ + my $results = $sth->fetchrow_hashref; + push @values, $results->{authorised_value}; + $labels{$results->{authorised_value}}=$results->{lib}; + } + $CGISort= CGI::scrolling_list( + -name => $input_name, + -id => $input_name, + -values => \@values, + -labels => \%labels, + -default=> $data, + -size => 1, + -multiple => 0); + } + $sth->finish; + return $CGISort; +} END { } # module clean-up code here (global destructor) @@ -181,6 +170,6 @@ __END__ =head1 AUTHOR -Koha Developement team +Koha Development Team =cut