X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FInput.pm;h=2ee07f3f61bebb6f204e8cdb7a9e164dc2f0aa58;hb=refs%2Fheads%2Fffzg-1059-zebra_spine_label;hp=5c1e609fa2a83f07055807ee6f0eee1c28ef04a0;hpb=95e2b3d1e6f2da577673da4e0c6fb86c6e52bb36;p=koha.git
diff --git a/C4/Input.pm b/C4/Input.pm
index 5c1e609fa2..2ee07f3f61 100644
--- a/C4/Input.pm
+++ b/C4/Input.pm
@@ -14,12 +14,16 @@ 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);
@@ -47,114 +51,101 @@ number or ISBN is valid.
@ISA = qw(Exporter);
@EXPORT = qw(
- &checkflds &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 {
- 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."
";
- # FIXME - for ($i = 1; $i < 8; $i++)
- # or foreach $i (1..7)
- while ($i <8) {
- my $temp1 = $weightings[$i-1];
- my $temp2 = substr($infl,$i,1);
- $sum += $temp1 * $temp2;
-# print "$sum $temp1 $temp2
";
- $i++;
- }
- my $rem = ($sum%11);
- if ($rem == 10) {
- $rem = "X";
- }
- #print $rem."
";
- if ($rem eq substr($infl,8,1)) {
- $valid = 1;
- }
- return $valid;
+sub checkdigit ($;$) {
+
+ my ($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 $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;
+ }
+
+ 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)) {
+ 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;
- 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*(10-$i);
- }
- $c=$c%11; # % is the modulus function
- ($c==10) && ($c='X');
- # FIXME - $isbngood = $c eq $checksum;
- if ($c eq $checksum) {
- $isbngood=1;
- } else {
- $isbngood=0;
- }
- } else {
- # FIXME - Put "return 0 if $length($q) != 10" near the
- # top, so we don't have to indent the rest of the function
- # as much.
- $isbngood=0;
- } # if length good
-
- return $isbngood;
-
-} # sub checkvalidisbn
+sub buildCGIsort {
+ my ($name,$input_name,$data) = @_;
+ my $dbh=C4::Context->dbh;
+ my $query=qq{SELECT * FROM authorised_values WHERE category=? order by lib};
+ my $sth=$dbh->prepare($query);
+ $sth->execute($name);
+ 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)
1;
@@ -164,6 +155,6 @@ __END__
=head1 AUTHOR
-Koha Developement team
+Koha Development Team
=cut