[Koha-cvs] CVS: koha/C4 Accounts.pm,1.1.1.1,1.2 Accounts2.pm,1.9,1.10 Circmain.pm,1.1.1.1,1.2 Circulation.pm,1.1.1.1,1.2 Format.pm,1.1.1.1,1.2 InterfaceCDK.pm,1.1.1.1,1.2 Koha.pm,1.4,1.5 Maintainance.pm,1.4,1.5 Print.pm,1.4,1.5 Security.pm,1.1.1.1,1.2 Stats.pm,1.3,1.4 Stock.pm,1.1.1.1,1.2

Steve Tonnesen tonnesen at users.sourceforge.net
Thu Jun 20 20:56:55 CEST 2002


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

Modified Files:
	Accounts.pm Accounts2.pm Circmain.pm Circulation.pm Format.pm 
	InterfaceCDK.pm Koha.pm Maintainance.pm Print.pm Security.pm 
	Stats.pm Stock.pm 
Log Message:
Most of these merges are just removing unused parts of the perl modules.


Index: Accounts.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Accounts.pm	19 Dec 2000 23:45:53 -0000	1.1.1.1
--- Accounts.pm	20 Jun 2002 18:56:52 -0000	1.2
***************
*** 1,6 ****
! package C4::Accounts; #asummes C4/Accounts
! 
! #requires DBI.pm to be installed
! #uses DBD:Pg
  
  use strict;
--- 1,3 ----
! package C4::Accounts; #assumes C4/Accounts
  
  use strict;
***************
*** 13,17 ****
  use C4::InterfaceCDK;
  use C4::Interface::AccountsCDK;
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
    
  # set the version for version checking
--- 10,14 ----
  use C4::InterfaceCDK;
  use C4::Interface::AccountsCDK;
! use vars qw($VERSION @ISA @EXPORT);
    
  # set the version for version checking
***************
*** 20,58 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(&checkaccount &reconcileaccount &getnextacctno);
- %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 displayaccounts{
    my ($env)=@_;
--- 17,20 ----

Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Accounts2.pm	11 Mar 2002 03:36:41 -0000	1.9
--- Accounts2.pm	20 Jun 2002 18:56:52 -0000	1.10
***************
*** 1,8 ****
! package C4::Accounts2; #asummes C4/Accounts2
! 
! #requires DBI.pm to be installed
! #uses DBD:Pg
  
  use strict;
  require Exporter;
  use DBI;
--- 1,6 ----
! package C4::Accounts2; #assumes C4/Accounts2
  
  use strict;
+ use warnings;
  require Exporter;
  use DBI;
***************
*** 11,15 ****
  use C4::Search;
  use C4::Circulation::Circ2;
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
    
  # set the version for version checking
--- 9,13 ----
  use C4::Search;
  use C4::Circulation::Circ2;
! use vars qw($VERSION @ISA @EXPORT);
    
  # set the version for version checking
***************
*** 19,56 ****
  @EXPORT = qw(&recordpayment &fixaccounts &makepayment &manualinvoice
  &getnextacctno);
- %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 displayaccounts{
--- 17,20 ----
***************
*** 93,97 ****
       (borrowernumber, accountno, offsetaccount,  offsetamount)
       values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)";
!      my $usth = $dbh->prepare($updquery);
       $usth->execute;
       $usth->finish;
--- 57,61 ----
       (borrowernumber, accountno, offsetaccount,  offsetamount)
       values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)";
!      $usth = $dbh->prepare($updquery);
       $usth->execute;
       $usth->finish;
***************
*** 143,147 ****
    (borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding)  
    values ($bornumber,$nextaccntno,now(),$payment,'Payment,thanks - $user', 'Pay',0)";
!   my $usth = $dbh->prepare($updquery);
    $usth->execute;
    $usth->finish;
--- 107,111 ----
    (borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding)  
    values ($bornumber,$nextaccntno,now(),$payment,'Payment,thanks - $user', 'Pay',0)";
!   $usth = $dbh->prepare($updquery);
    $usth->execute;
    $usth->finish;
***************
*** 296,300 ****
       (borrowernumber, accountno, offsetaccount,  offsetamount)
       values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)";
!      my $usth = $dbh->prepare($updquery);
       $usth->execute;
       $usth->finish;
--- 260,264 ----
       (borrowernumber, accountno, offsetaccount,  offsetamount)
       values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)";
!      $usth = $dbh->prepare($updquery);
       $usth->execute;
       $usth->finish;
***************
*** 327,331 ****
       (borrowernumber, accountno, offsetaccount,  offsetamount)
       values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)";
!      my $usth = $dbh->prepare($updquery);
       $usth->execute;
       $usth->finish;
--- 291,295 ----
       (borrowernumber, accountno, offsetaccount,  offsetamount)
       values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)";
!      $usth = $dbh->prepare($updquery);
       $usth->execute;
       $usth->finish;
***************
*** 380,384 ****
       (borrowernumber, accountno, offsetaccount,  offsetamount)
       values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)";
!      my $usth = $dbh->prepare($updquery);
       $usth->execute;
       $usth->finish;
--- 344,348 ----
       (borrowernumber, accountno, offsetaccount,  offsetamount)
       values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)";
!      $usth = $dbh->prepare($updquery);
       $usth->execute;
       $usth->finish;

Index: Circmain.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circmain.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Circmain.pm	19 Dec 2000 23:45:54 -0000	1.1.1.1
--- Circmain.pm	20 Jun 2002 18:56:52 -0000	1.2
***************
*** 1,3 ****
! package C4::Circmain; #asummes C4/Circulation
  
  #package to deal with circulation 
--- 1,3 ----
! package C4::Circmain; #assumes C4/Circulation
  
  #package to deal with circulation 
***************
*** 16,20 ****
  use C4::Security;
  
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
    
  # set the version for version checking
--- 16,20 ----
  use C4::Security;
  
! use vars qw($VERSION @ISA @EXPORT);
    
  # set the version for version checking
***************
*** 23,60 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(&Start_circ);
- %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 Start_circ{
--- 23,26 ----

Index: Circulation.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Circulation.pm	19 Dec 2000 23:45:54 -0000	1.1.1.1
--- Circulation.pm	20 Jun 2002 18:56:52 -0000	1.2
***************
*** 1,3 ****
! package C4::Circulation; #asummes C4/Circulation
  
  #package to deal with circulation 
--- 1,3 ----
! package C4::Circulation; #assumes C4/Circulation
  
  #package to deal with circulation 
***************
*** 15,19 ****
  use C4::Security;
  
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
    
  # set the version for version checking
--- 15,19 ----
  use C4::Security;
  
! use vars qw($VERSION @ISA @EXPORT);
    
  # set the version for version checking
***************
*** 22,60 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(&Start_circ &scanborrower);
- #@EXPORT = qw(&Start_circ checkoverdues);
- %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 Start_circ{
--- 22,25 ----

Index: Format.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Format.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Format.pm	19 Dec 2000 23:45:54 -0000	1.1.1.1
--- Format.pm	20 Jun 2002 18:56:52 -0000	1.2
***************
*** 1,3 ****
! package C4::Format; #asummes C4/Format
  
  use strict;
--- 1,3 ----
! package C4::Format; #assumes C4/Format
  
  use strict;
***************
*** 5,9 ****
  
  
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
    
  # set the version for version checking
--- 5,9 ----
  
  
! use vars qw($VERSION @ISA @EXPORT);
    
  # set the version for version checking
***************
*** 12,49 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(&fmtstr &fmtdec);
- %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 fmtstr {
--- 12,15 ----

Index: InterfaceCDK.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/InterfaceCDK.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** InterfaceCDK.pm	19 Dec 2000 23:45:54 -0000	1.1.1.1
--- InterfaceCDK.pm	20 Jun 2002 18:56:52 -0000	1.2
***************
*** 1,4 ****
! 
! package C4::InterfaceCDK; #asummes C4/InterfaceCDK
  
  #uses Newt
--- 1,3 ----
! package C4::InterfaceCDK; #assumes C4/InterfaceCDK
  
  #uses Newt
***************
*** 14,18 ****
  require Exporter;
  use DBI;
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
    
  # set the version for version checking
--- 13,17 ----
  require Exporter;
  use DBI;
! use vars qw($VERSION @ISA @EXPORT);
    
  # set the version for version checking
***************
*** 24,66 ****
  &info_msg &selborrower &returnwindow &logondialog &borrowerwindow &titlepanel
  &borrbind &borrfill &preeborr &borrowerbox &brmenu &prmenu);
- %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 se them.
- 		
- # file-private lexicals go here
- my $priv_var    = '';
- my %secret_hash = ();
  
- #defining keystrokes used for screens
- my $key_tab  = chr(9);
- my $key_ctlr = chr(18);
- my $lastval = $key_ctlr;
- 
- # 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 suspend_cb {
! 
  }
        
--- 23,29 ----
  &info_msg &selborrower &returnwindow &logondialog &borrowerwindow &titlepanel
  &borrbind &borrfill &preeborr &borrowerbox &brmenu &prmenu);
  
  sub suspend_cb {
!     # is this planned for something?
  }
        

Index: Koha.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Koha.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Koha.pm	22 Apr 2002 22:47:09 -0000	1.4
--- Koha.pm	20 Jun 2002 18:56:52 -0000	1.5
***************
*** 3,6 ****
--- 3,7 ----
  use strict;
  require Exporter;
+ use C4::Database;
  
  use vars qw($VERSION @ISA @EXPORT);
***************
*** 11,14 ****
--- 12,17 ----
  @EXPORT = qw(&slashifyDate
  	     &fixEthnicity
+ 	     &borrowercategories
+ 	     &ethnicitycategories
  	     $DEBUG); 
  
***************
*** 24,43 ****
  }
  
! sub fixEthnicity($) { # a temporary fix ethnicity, it should really be handled
!                       # in Search.pm or the DB ... 
  
      my $ethnicity = shift;
!     if ($ethnicity eq 'maori') {
! 	$ethnicity = 'Maori';
!     } elsif ($ethnicity eq 'european') {
! 	$ethnicity = 'European/Pakeha';
!     } elsif ($ethnicity eq 'pi') {
! 	$ethnicity = 'Pacific Islander'
!     } elsif ($ethnicity eq 'asian') {
! 	$ethnicity = 'Asian';
      }
!     return $ethnicity;
  }
  
  
  1;
--- 27,71 ----
  }
  
! sub fixEthnicity($) { 
  
      my $ethnicity = shift;
!     my $dbh=C4Connect;
!     my $sth=$dbh->prepare("Select name from ethnicity where code = ?");
!     $sth->execute($ethnicity);
!     my $data=$sth->fetchrow_hashref;
!     $sth->finish;
!     $dbh->disconnect;
!     return $data->{'name'};
! }
! 
! sub borrowercategories {
!     my $dbh=C4Connect;
!     my $sth=$dbh->prepare("Select categorycode,description from categories order by description");
!     $sth->execute;
!     my %labels;
!     my @codes;
!     while (my $data=$sth->fetchrow_hashref){
!       push @codes,$data->{'categorycode'};
!       $labels{$data->{'categorycode'}}=$data->{'description'};
      }
!     $sth->finish;
!     $dbh->disconnect;
!     return(\@codes,\%labels);
  }
  
+ sub ethnicitycategories {
+     my $dbh=C4Connect;
+     my $sth=$dbh->prepare("Select code,name from ethnicity order by name");
+     $sth->execute;
+     my %labels;
+     my @codes;
+     while (my $data=$sth->fetchrow_hashref){
+       push @codes,$data->{'code'};
+       $labels{$data->{'code'}}=$data->{'name'};
+     }
+     $sth->finish;
+     $dbh->disconnect;
+     return(\@codes,\%labels);
+ }
  
  1;
***************
*** 54,59 ****
  
    $date = slashifyDate("01-01-2002")
! 
! 
  
  =head1 DESCRIPTION
--- 82,87 ----
  
    $date = slashifyDate("01-01-2002")
!   $ethnicity=fixEthnicity('asian');
!   ($categories,$labels)=borrowercategories();
  
  =head1 DESCRIPTION

Index: Maintainance.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Maintainance.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Maintainance.pm	26 Feb 2002 09:31:14 -0000	1.4
--- Maintainance.pm	20 Jun 2002 18:56:52 -0000	1.5
***************
*** 1,3 ****
! package C4::Maintainance; #asummes C4/Maintainance
  
  #package to deal with marking up output
--- 1,3 ----
! package C4::Maintainance; #assumes C4/Maintainance
  
  #package to deal with marking up output
***************
*** 8,12 ****
  require Exporter;
  
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
  
  # set the version for version checking
--- 8,12 ----
  require Exporter;
  
! use vars qw($VERSION @ISA @EXPORT);
  
  # set the version for version checking
***************
*** 16,54 ****
  @EXPORT = qw(&listsubjects &updatesub &shiftgroup &deletedbib &undeletebib
  &updatetype);
- %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 listsubjects {
--- 16,19 ----

Index: Print.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Print.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Print.pm	18 Jun 2002 22:46:59 -0000	1.4
--- Print.pm	20 Jun 2002 18:56:52 -0000	1.5
***************
*** 1,3 ****
! package C4::Print; #asummes C4/Print.pm
  
  use strict;
--- 1,3 ----
! package C4::Print; #assumes C4/Print.pm
  
  use strict;
***************
*** 5,9 ****
  #use C4::InterfaceCDK;
  
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
  
  # set the version for version checking
--- 5,9 ----
  #use C4::InterfaceCDK;
  
! use vars qw($VERSION @ISA @EXPORT);
  
  # set the version for version checking
***************
*** 12,50 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(&remoteprint &printreserve);
- %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 remoteprint {
--- 12,15 ----

Index: Security.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Security.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Security.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Security.pm	20 Jun 2002 18:56:52 -0000	1.2
***************
*** 1,6 ****
! package C4::Security; #asummes C4/Security
! 
! #requires DBI.pm to be installed
! #uses DBD:Pg
  
  use strict;
--- 1,3 ----
! package C4::Security; #assumes C4/Security
  
  use strict;
***************
*** 16,55 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(&Login &CheckAccess);
- %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 Login {
    my ($env)=@_;
--- 13,17 ----

Index: Stats.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stats.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Stats.pm	2 Apr 2001 22:51:26 -0000	1.3
--- Stats.pm	20 Jun 2002 18:56:52 -0000	1.4
***************
*** 1,6 ****
! package C4::Stats; #asummes C4/Stats
! 
! #requires DBI.pm to be installed
! #uses DBD:Pg
  
  use strict;
--- 1,3 ----
! package C4::Stats; #assumes C4/Stats
  
  use strict;
***************
*** 16,54 ****
  @EXPORT = qw(&UpdateStats &statsreport &Count &Overdues &TotalOwing
  &TotalPaid &getcharges &Getpaidbranch &unfilledreserves);
- %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 UpdateStats {
--- 13,16 ----

Index: Stock.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Stock.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Stock.pm	19 Dec 2000 23:45:55 -0000	1.1.1.1
--- Stock.pm	20 Jun 2002 18:56:52 -0000	1.2
***************
*** 1,3 ****
! package C4::Stock; #asummes C4/Stock.pm
  
  use strict;
--- 1,3 ----
! package C4::Stock; #assumes C4/Stock.pm
  
  use strict;
***************
*** 12,50 ****
  @ISA = qw(Exporter);
  @EXPORT = qw(&stockreport);
- %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 stockreport {
--- 12,15 ----
***************
*** 70,71 ****
--- 35,37 ----
    
      
+ 





More information about the Koha-cvs mailing list