[Koha-devel] CVS: koha/C4 Database.pm,1.2,1.3

[Chris Cormack]

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

Modified Files:
        Database.pm 
Log Message:
Cleaning out all unused cruft.
C4Connect is the only function that was actually being used in this module


Index: Database.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Database.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Database.pm 21 Dec 2000 19:56:43 -0000      1.2
--- Database.pm 30 Apr 2002 09:21:03 -0000      1.3
***************
*** 2,53 ****
  
  #requires DBI.pm to be installed
- #uses DBD:Pg
  
  use strict;
  require Exporter;
  use DBI;
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
    
- # set the version for version checking
  $VERSION = 0.01;
      
  @ISA = qw(Exporter);
! @EXPORT = qw(&C4Connect &sqlinsert &sqlupdate &getmax &makelist
! &OpacConnect);
! %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;
! 
  
  
--- 2,15 ----
  
  #requires DBI.pm to be installed
  
  use strict;
  require Exporter;
  use DBI;
! use vars qw($VERSION @ISA @EXPORT);
    
  $VERSION = 0.01;
      
  @ISA = qw(Exporter);
! @EXPORT = qw(&C4Connect);
  
  
***************
*** 79,172 ****
  }    
  
- sub Opaconnect  {
-   my $dbname="c4"; 
- #  my $dbh = DBI->connect("dbi:Pg:dbname=$dbname", "chris", "");
-    my $database='c4test';
-    my $hostname='localhost';
-    my $user='hdl';
-    my $pass='testing';
-    my $dbh=DBI->connect("DBI:mysql:$database:$hostname",$user,$pass);
-   return $dbh;
- }    
- 
- sub sqlinsert {
-   my ($table,%data)address@hidden;
-   my $dbh=C4Connect;
-   my $query="INSERT INTO $table \(";
-   while (my ($key,$value) = each %data){
-     if ($key ne 'type' && $key ne 'updtype'){
-       $query=$query."$key,";
-     }
-   }
-   $query=~ s/\,$/\)/;
-   $query=$query." VALUES (";
-   while (my ($key,$value) = each %data){
-     if ($key ne 'type' && $key ne 'updtype'){
-       $query=$query."'$value',";
-     }
-   }
-   $query=~ s/\,$/\)/;
-   print $query;
-   my $sth=$dbh->prepare($query);
-   $sth->execute;
-   $sth->finish;
-   $dbh->disconnect;
- }
- 
- sub sqlupdate {
-   my ($table,$keyfld,$keyval,%data)address@hidden;
-   my $dbh=C4Connect;
-   my $query="UPDATE $table SET ";
-   my @sets;
-   my @keyarr = split("\t",$keyfld);
-   my @keyvalarr = split("\t",$keyval);
-   my $numkeys = @keyarr;
-   while (my ($key,$value) = each %data){
-     if (($key ne 'type')&&($key ne 'updtype')){
-       my $temp = " ".$key."='".$value."' "; 
-       push(@sets,$temp);
-     }
-   }
-   my $fsets = join(",", @sets);
-   $query=$query.$fsets." WHERE $keyarr[0] = '$keyvalarr[0]'";
-   if ($numkeys > 1) {
-     my $i = 1;
-     while ($i < $numkeys) {
-       $query=$query." AND $keyarr[$i] = '$keyvalarr[$i]'";
-       $i++;
-     }
-   }  
- #  $query=~ s/\,$/\)/;
-   print $query;
-   my $sth=$dbh->prepare($query);
-   $sth->execute;
-   $sth->finish;
-   $dbh->disconnect;
- }
- 
- 
- sub getmax {
-   my ($table,$item)address@hidden;
-   my $dbh=C4Connect;
-   my $sth=$dbh->prepare("Select max($item) from $table");
-   $sth->execute;
-   my $data=$sth->fetchrow_hashref;
-   $sth->finish;
-   $dbh->disconnect;
-   return($data);
- }
  
! sub makelist {
!   my ($table,$kfld,$dfld)address@hidden;
!   my $data;
!   my $dbh=C4Connect;
!   my $sth=$dbh->prepare("Select $kfld,$dfld from $table order by $dfld");
!   $sth->execute;
!   while (my $drec=$sth->fetchrow_hashref) {
!     $data = $data."\t".$drec->{$kfld}."\t".$drec->{$dfld};
!   }   
!   $sth->finish;
!   $dbh->disconnect;
!   return($data);
! }
! END { }       # module clean-up code here (global destructor)
--- 41,44 ----
  }    
  
  
! END { }