From d3af19dcb2e7e6014d21203309df665be4d7114b Mon Sep 17 00:00:00 2001 From: tonnesen Date: Thu, 20 Jun 2002 18:04:45 +0000 Subject: [PATCH] Are we getting sick of merging yet? Not me! --- C4/Groups.pm | 37 +------------------------------------ C4/Scan.pm | 37 +------------------------------------ modbibitem.pl | 2 +- testKoha.pl | 26 +++++++++++++++++++++++++- 4 files changed, 28 insertions(+), 74 deletions(-) diff --git a/C4/Groups.pm b/C4/Groups.pm index 5a6d9c5e53..3f54ab7620 100755 --- a/C4/Groups.pm +++ b/C4/Groups.pm @@ -18,48 +18,13 @@ use C4::Stats; #use C4::Search; #use C4::Print; -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); +use vars qw($VERSION @ISA @EXPORT); # set the version for version checking $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT = qw(&getgroups &groupmembers); -%EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], - -# your exported package globals go here, -# as well as any optionally exported functions - -@EXPORT_OK = qw($Var1 %Hashit); - - -# non-exported package globals go here -#use vars qw(@more $stuff); - -# initalize package globals, first exported ones - -my $Var1 = ''; -my %Hashit = (); - -# then the others (which are still accessible as $Some::Module::stuff) -my $stuff = ''; -my @more = (); - -# all file-scoped lexicals must be created before -# the functions below that use them. - -# file-private lexicals go here -my $priv_var = ''; -my %secret_hash = (); - -# here's a file-private function as a closure, -# callable as &$priv_func; it cannot be prototyped. -my $priv_func = sub { - # stuff goes here. -}; - -# make all your functions, whether exported or not; - sub getgroups { my ($env) = @_; diff --git a/C4/Scan.pm b/C4/Scan.pm index 8cff8a4c09..4c1be54358 100644 --- a/C4/Scan.pm +++ b/C4/Scan.pm @@ -1,4 +1,4 @@ -package C4::Scan; #asummes C4/Scan.pm +package C4::Scan; #assumes C4/Scan.pm use strict; require Exporter; @@ -10,41 +10,6 @@ $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT = qw(&getbarcode); -%EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], - -# your exported package globals go here, -# as well as any optionally exported functions - -@EXPORT_OK = qw($Var1 %Hashit); - - -# non-exported package globals go here -use vars qw(@more $stuff); - -# initalize package globals, first exported ones - -my $Var1 = ''; -my %Hashit = (); - - -# then the others (which are still accessible as $Some::Module::stuff) -my $stuff = ''; -my @more = (); - -# all file-scoped lexicals must be created before -# the functions below that use them. - -# file-private lexicals go here -my $priv_var = ''; -my %secret_hash = (); - -# here's a file-private function as a closure, -# callable as &$priv_func; it cannot be prototyped. -my $priv_func = sub { - # stuff goes here. - }; - -# make all your functions, whether exported or not; sub Getbarcode { } diff --git a/modbibitem.pl b/modbibitem.pl index e0ca8e238f..3d555c923c 100755 --- a/modbibitem.pl +++ b/modbibitem.pl @@ -72,7 +72,7 @@ print < {'biblionumber'}&type=intra>$data->{'title'} ($data->{'author'})
Modify Group - $data->{'description'}

-
+ diff --git a/testKoha.pl b/testKoha.pl index bc60e9ac0e..186eb5f083 100644 --- a/testKoha.pl +++ b/testKoha.pl @@ -1,7 +1,31 @@ #!/usr/bin/perl -w +# $Id$ + use strict; use Test::Harness; +# please add many tests here +# Please make the test name the same as the module name where possible + +my @tests=( + 't/format.t', + 't/Input.t', + 't/koha.t', + 't/output.t', + 't/require.t', + 't/Catalogue.t', +); + + +runtests (@tests); + +exit; -runtests ('t/koha.t', 't/Catalogue.t'); +# $Log$ +# Revision 1.5 2002/06/20 18:04:46 tonnesen +# Are we getting sick of merging yet? Not me! +# +# Revision 1.1.2.7 2002/06/20 15:19:33 amillar +# Test valid ISBN numbers in Input.pm +# -- 2.39.5