Form::_dbconnect_options nach SL::DBConnect::get_options verschoben

diff --git a/SL/DBConnect.pm b/SL/DBConnect.pm
index 4e084502a6fc8a77c14c2034f200411efacd6725..8dc978758a9d3bb53ed1cbfa3532df7e4413be03 100644 (file)
--- a/SL/DBConnect.pm
+++ b/SL/DBConnect.pm
@@ -20,4 +20,14 @@ sub connect {
   return DBIx::Log4perl->connect(@_);
 }
 
   return DBIx::Log4perl->connect(@_);
 }
 

+sub get_options {
+  my $self    = shift;
+  my $options = {
+    pg_enable_utf8 => $::locale->is_utf8,
+    @_
+  };
+
+  return $options;
+}
+

 1;
 1;

diff --git a/SL/Form.pm b/SL/Form.pm
index 7b5d257b89942a9e70fca4c7291c910b206c5ff2..018526ac666d6a1abc7a91d89c91313fd3d91666 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1361,21 +1361,13 @@ sub datetonum {
 
 # Database routines used throughout
 
 
 # Database routines used throughout
 

-sub _dbconnect_options {
-  my $self    = shift;
-  my $options = { pg_enable_utf8 => $::locale->is_utf8,
-                  @_ };
-
-  return $options;
-}
-

 sub dbconnect {
   $main::lxdebug->enter_sub(2);
 
   my ($self, $myconfig) = @_;
 
   # connect to database
 sub dbconnect {
   $main::lxdebug->enter_sub(2);
 
   my ($self, $myconfig) = @_;
 
   # connect to database

-  my $dbh = SL::DBConnect->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, $myconfig->{dbpasswd}, $self->_dbconnect_options)
+  my $dbh = SL::DBConnect->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, $myconfig->{dbpasswd}, SL::DBConnect->get_options)

     or $self->dberror;
 
   # set db options
     or $self->dberror;
 
   # set db options


@@ -1394,7 +1386,7 @@ sub dbconnect_noauto {
   my ($self, $myconfig) = @_;
 
   # connect to database
   my ($self, $myconfig) = @_;
 
   # connect to database

-  my $dbh = SL::DBConnect->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, $myconfig->{dbpasswd}, $self->_dbconnect_options(AutoCommit => 0))
+  my $dbh = SL::DBConnect->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, $myconfig->{dbpasswd}, SL::DBConnect->get_options(AutoCommit => 0))

     or $self->dberror;
 
   # set db options
     or $self->dberror;
 
   # set db options