Umstellung DBUpgrade2-Modul auf Objekt-Aufrufsyntax

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index ae07d1c084e7ff6868accad13779a9aa084dabed..1a0b0433b7a0ed6a3f8031f5b13a95ea28985a6d 100644 (file)
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -2,24 +2,26 @@ package SL::DBUpgrade2;
 
 use SL::Common;
 
 
 use SL::Common;
 

-require Exporter;
-our @ISA = qw(Exporter);
-
-our @EXPORT = qw(parse_dbupdate_controls sort_dbupdate_controls);
-

 use strict;
 
 use strict;
 

+sub new {
+  my ($package, $form, $dbdriver) = @_;
+  my $self                        = { form => $form, dbdriver => $dbdriver };
+  return bless($self, $package);
+}
+

 sub parse_dbupdate_controls {
   $main::lxdebug->enter_sub();
 
 sub parse_dbupdate_controls {
   $main::lxdebug->enter_sub();
 

-  my ($form, $dbdriver) = @_;
+  my ($self) = @_;

 
 

+  my $form   = $self->{form};

   my $locale = $main::locale;
 
   local *IN;
   my %all_controls;
 
   my $locale = $main::locale;
 
   local *IN;
   my %all_controls;
 

-  my $path = "sql/${dbdriver}-upgrade2";
+  my $path = "sql/" . $self->{dbdriver} . "-upgrade2";

 
   foreach my $file_name (<$path/*.sql>, <$path/*.pl>) {
     next unless (open(IN, $file_name));
 
   foreach my $file_name (<$path/*.sql>, <$path/*.pl>) {
     next unless (open(IN, $file_name));


@@ -92,6 +94,8 @@ sub parse_dbupdate_controls {
   map({ _dbupdate2_calculate_depth(\%all_controls, $_->{"tag"}) }
       values(%all_controls));
 
   map({ _dbupdate2_calculate_depth(\%all_controls, $_->{"tag"}) }
       values(%all_controls));
 

+  $self->{all_controls} = \%all_controls;
+

   $main::lxdebug->leave_sub();
 
   return \%all_controls;
   $main::lxdebug->leave_sub();
 
   return \%all_controls;


@@ -148,9 +152,11 @@ sub _dbupdate2_calculate_depth {
 }
 
 sub sort_dbupdate_controls {
 }
 
 sub sort_dbupdate_controls {

+  my $self = shift;
+

   return sort({   $a->{"depth"}    !=  $b->{"depth"}    ? $a->{"depth"}    <=> $b->{"depth"}
                 : $a->{"priority"} !=  $b->{"priority"} ? $a->{"priority"} <=> $b->{"priority"}
   return sort({   $a->{"depth"}    !=  $b->{"depth"}    ? $a->{"depth"}    <=> $b->{"depth"}
                 : $a->{"priority"} !=  $b->{"priority"} ? $a->{"priority"} <=> $b->{"priority"}

-                :                                         $a->{"tag"}      cmp $b->{"tag"}      } values(%{$_[0]}));
+                :                                         $a->{"tag"}      cmp $b->{"tag"}      } values(%{ $self->{all_controls} }));

 }
 
 1;
 }
 
 1;

diff --git a/SL/User.pm b/SL/User.pm
index b1a904afd09bce086f89243bde9ef1deb409ca8a..c74c104a07a5c4ae2e70a07ea7e83a29933ad232 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -125,8 +125,8 @@ sub login {
 
     $rc = 0;
 
 
     $rc = 0;
 

-    my $controls =
-      parse_dbupdate_controls($form, $myconfig{"dbdriver"});
+    my $dbupdater = SL::DBUpgrade2->new($form, $myconfig{"dbdriver"});
+    my $controls  = $dbupdater->parse_dbupdate_controls;

 
     map({ $form->{$_} = $myconfig{$_} }
         qw(dbname dbhost dbport dbdriver dbuser dbpasswd dbconnect dateformat));
 
     map({ $form->{$_} = $myconfig{$_} }
         qw(dbname dbhost dbport dbdriver dbuser dbpasswd dbconnect dateformat));


@@ -163,7 +163,7 @@ sub login {
       $SIG{QUIT} = 'IGNORE';
 
       $self->dbupdate($form);
       $SIG{QUIT} = 'IGNORE';
 
       $self->dbupdate($form);

-      $self->dbupdate2($form, $controls);
+      $self->dbupdate2($form, $dbupdater);

 
       close(FH);
 
 
       close(FH);
 


@@ -622,7 +622,7 @@ sub dbneedsupdate {
   my ($self, $form) = @_;
 
   my %members  = $main::auth->read_all_users();
   my ($self, $form) = @_;
 
   my %members  = $main::auth->read_all_users();

-  my $controls = parse_dbupdate_controls($form, $form->{dbdriver});
+  my $controls = SL::DBUpgrade2->new($form, $form->{dbdriver})->parse_dbupdate_controls;

 
   my ($query, $sth, %dbs_needing_updates);
 
 
   my ($query, $sth, %dbs_needing_updates);
 


@@ -826,7 +826,7 @@ sub dbupdate {
 sub dbupdate2 {
   $main::lxdebug->enter_sub();
 
 sub dbupdate2 {
   $main::lxdebug->enter_sub();
 

-  my ($self, $form, $controls) = @_;
+  my ($self, $form, $dbupdater) = @_;

 
   $form->{sid} = $form->{dbdefault};
 
 
   $form->{sid} = $form->{dbdefault};
 


@@ -834,7 +834,7 @@ sub dbupdate2 {
   my ($query, $sth, $tag);
   my $rc = -2;
 
   my ($query, $sth, $tag);
   my $rc = -2;
 

-  @upgradescripts = sort_dbupdate_controls($controls);
+  @upgradescripts = $dbupdater->sort_dbupdate_controls;

 
   my $db_charset = $main::dbcharset;
   $db_charset ||= Common::DEFAULT_CHARSET;
 
   my $db_charset = $main::dbcharset;
   $db_charset ||= Common::DEFAULT_CHARSET;


@@ -861,7 +861,7 @@ sub dbupdate2 {
     $sth = $dbh->prepare($query);
     $sth->execute() || $form->dberror($query);
     while (($tag) = $sth->fetchrow_array()) {
     $sth = $dbh->prepare($query);
     $sth->execute() || $form->dberror($query);
     while (($tag) = $sth->fetchrow_array()) {

-      $controls->{$tag}->{"applied"} = 1 if (defined($controls->{$tag}));
+      $dbupdater->{all_controls}->{$tag}->{"applied"} = 1 if (defined($dbupdater->{all_controls}->{$tag}));

     }
     $sth->finish();
 
     }
     $sth->finish();