moving fields around toCVS: ----------------------------------------------------...

[koha_fer] / C4 / Database.pm

diff --git a/C4/Database.pm b/C4/Database.pm
index d0a9192..dfa3c0c 100755 (executable)
--- a/C4/Database.pm
+++ b/C4/Database.pm
@@ -1,7 +1,6 @@
-package C4::Database; #assumes C4/Database
-
-#requires DBI.pm to be installed
+package C4::Database;
 
+# $Id$
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -24,101 +23,11 @@ use strict;
 require Exporter;
 use DBI;
 use vars qw($VERSION @ISA @EXPORT);
-  
-$VERSION = 0.01;
-    
-@ISA = qw(Exporter);
-@EXPORT = qw(
-       &C4Connect &requireDBI &configfile
-);
-
-sub configfile {
-    my $configfile;
-    open (KC, "/etc/koha.conf");
-    while (<KC>) {
-       chomp;
-       (next) if (/^\s*#/);
-       if (/(.*)\s*=\s*(.*)/) {
-           my $variable=$1;
-           my $value=$2;
-           # Clean up white space at beginning and end
-           $variable=~s/^\s*//g;
-           $variable=~s/\s*$//g;
-           $value=~s/^\s*//g;
-           $value=~s/\s*$//g;
-           $configfile->{$variable}=$value;
-       }
-    }
-    return $configfile;
-}
-
-sub C4Connect  {
-  my $dbname="c4";
-   my ($database,$hostname,$user,$pass,%configfile);
-   open (KC, "/etc/koha.conf");
-   while (<KC>) {
-     chomp;
-     (next) if (/^\s*#/);
-     if (/(.*)\s*=\s*(.*)/) {
-       my $variable=$1;
-       my $value=$2;
-       # Clean up white space at beginning and end
-       $variable=~s/^\s*//g;
-       $variable=~s/\s*$//g;
-       $value=~s/^\s*//g;
-       $value=~s/\s*$//g;
-       $configfile{$variable}=$value;
-     }
-   }
-   $database=$configfile{'database'};
-   $hostname=$configfile{'hostname'};
-   $user=$configfile{'user'};
-   $pass=$configfile{'pass'};
-    
-   my $dbh=DBI->connect("DBI:mysql:$database:$hostname",$user,$pass);
-  return $dbh;
-} # sub C4Connect
-
-=item requireDBI
-
-  &requireDBI($dbh, $functionnname);
-
-Verifies that C<$dbh> is a valid DBI::db database handle (presumably
-to the Koha database). If it isn't, the function dies.
-
-C<$functionname> is the name of the calling function, which will be
-used in error messages.
-
-=cut
-#'
-#------------------
-# Helper subroutine to make sure database handle was passed properly
-sub requireDBI {
-    my (
-       $dbh,
-       $subrname,      # name of calling subroutine
-                       # FIXME - Ought to get this with 'caller',
-                       # instead of requiring developers to always
-                       # get it right. Plus, it'd give the line
-                       # number.
-    )=@_;
-
-    unless ( ref($dbh) =~ /DBI::db/ ) {
-       print "<pre>\nERROR: Subroutine $subrname called without proper DBI handle.\n" .
-               "Please contact system administrator.\n</pre>\n";
-       die "ERROR: Subroutine $subrname called without proper DBI handle.\n";
-    }
-} # sub requireDBI
 
+$VERSION = 0.01;
 
-END { }
+@ISA = qw(Exporter);
+@EXPORT = qw( );
 
 1;
 __END__
-=back
-
-=head1 SEE ALSO
-
-L<DBI(3)|DBI>
-
-=cut