[Koha-cvs] CVS: koha/C4 Groups.pm,1.1,1.2 Scan.pm,1.1.1.1,1.2

[Steve Tonnesen]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv23699/C4

Modified Files:
	Groups.pm Scan.pm 
Log Message:
Are we getting sick of merging yet?  Not me!


Index: Groups.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Groups.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Groups.pm	2 May 2001 23:06:44 -0000	1.1
--- Groups.pm	20 Jun 2002 18:04:47 -0000	1.2
***************
*** 19,23 ****
  #use C4::Print;
  
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
    
  # set the version for version checking
--- 19,23 ----
  #use C4::Print;
  
! use vars qw($VERSION @ISA @EXPORT);
    
  # set the version for version checking
***************
*** 26,64 ****
  @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 {
--- 26,29 ----

Index: Scan.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Scan.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Scan.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Scan.pm	20 Jun 2002 18:04:48 -0000	1.2
***************
*** 1,3 ****
! package C4::Scan; #asummes C4/Scan.pm
  
  use strict;
--- 1,3 ----
! package C4::Scan; #assumes C4/Scan.pm
  
  use strict;
***************
*** 11,49 ****
  @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 {
--- 11,14 ----