--- nfo/perl/libs/Data/Storage/Container.pm 2003/06/06 03:26:24 1.10 +++ nfo/perl/libs/Data/Storage/Container.pm 2003/06/25 22:52:58 1.11 @@ -1,8 +1,11 @@ ################################################ # -# $Id: Container.pm,v 1.10 2003/06/06 03:26:24 joko Exp $ +# $Id: Container.pm,v 1.11 2003/06/25 22:52:58 joko Exp $ # # $Log: Container.pm,v $ +# Revision 1.11 2003/06/25 22:52:58 joko +# fix:!? add storage in any case +# # Revision 1.10 2003/06/06 03:26:24 joko # + sub existsStorage # @@ -191,6 +194,8 @@ # TODO: do below (after 'testAvailability' and 'testIntegrity') again!!! #$storage->connect(); + $self->addStorage($name, $storage); + my $log_prefix = __PACKAGE__ . "->initStorage: "; $log_prefix .= "dsn=\"$self->{locator}->{$name}->{dsn}\"" if $self->{locator}->{$name}->{dsn}; @@ -199,6 +204,7 @@ $locator->{status}->{availability} = $storage->testAvailability(); if ( !$storage->testAvailability() ) { $logger->error( "$log_prefix: testAvailability failed" ); + return; } } @@ -209,6 +215,7 @@ # actions if integrity fails if (!$locator->{status}->{integrity}) { $logger->error( "$log_prefix: testIntegrity failed" ); + return; } } @@ -225,7 +232,7 @@ if ( !@{$storage->getChildNodes()} ) { $locator->{status}->{empty} = 1; $logger->warning( "$log_prefix: Storage is empty."); - #return; + return; } } @@ -248,7 +255,7 @@ #$self->{storage}->{$name} = $storage; #print "add storage: $name", "\n"; - $self->addStorage($name, $storage); + #$self->addStorage($name, $storage); return 1;