/[cvs]/nfo/perl/libs/Data/Storage/Container.pm

Diff of /nfo/perl/libs/Data/Storage/Container.pm

Parent Directory | Revision Log | View Patch Patch

-revision 1.9 by joko,
Thu Mar 27 15:31:08 2003 UTC
+revision 1.11 by joko,
Wed Jun 25 22:52:58 2003 UTC
 Line 3
  #  $Id$
  #
  #  $Log$
+ #  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
+ #
  #  Revision 1.9  2003/03/27 15:31:08  joko
  #  fixes to modules regarding new namespace(s) below Data::Mungle::*
  #
-Line 104 
 sub addStorage {
+Line 110 
 sub addStorage {
    $self->{storage}->{$name} = $storage;
  }
+ sub existsStorage {
+   my $self = shift;
+   my $name = shift;
+   return exists $self->{storage}->{$name};
+ }
  sub initLocator {
    my $self = shift;
    my $name = shift;
-Line 172 
 sub initStorage {
+Line 184 
 sub initStorage {
    my $self = shift;
    my $name = shift;
+   return if $self->existsStorage($name);
    my $locator = $self->getLocator($name);
    $logger->info( __PACKAGE__ . " is initializing storage declared by locator \"$name\"" );
-Line 180 
 sub initStorage {
+Line 194 
 sub initStorage {
    # 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};
-Line 188 
 sub initStorage {
+Line 204 
 sub initStorage {
      $locator->{status}->{availability} = $storage->testAvailability();
      if ( !$storage->testAvailability() ) {
        $logger->error( "$log_prefix: testAvailability failed" );
+       return;
      }
    }
-Line 198 
 sub initStorage {
+Line 215 
 sub initStorage {
      # actions if integrity fails
      if (!$locator->{status}->{integrity}) {
        $logger->error( "$log_prefix: testIntegrity failed" );
+       return;
      }
    }
-Line 214 
 sub initStorage {
+Line 232 
 sub initStorage {
      if ( !@{$storage->getChildNodes()} ) {
        $locator->{status}->{empty} = 1;
        $logger->warning( "$log_prefix: Storage is empty.");
-       #return;
+       return;
      }
    }
-Line 237 
 sub initStorage {
+Line 255 
 sub initStorage {
    #$self->{storage}->{$name} = $storage;
    #print "add storage: $name", "\n";
-   $self->addStorage($name, $storage);
+   #$self->addStorage($name, $storage);
    return 1;
-Line 265 
 sub _dbErrorHandler {
+Line 283 
 sub _dbErrorHandler {
  }
 ;
+ __END__

 Legend:



Removed from v.1.9
 


changed lines


 
Added in v.1.11
 Legend:



Removed from v.1.9
 


changed lines


 
Added in v.1.11
-Removed from v.1.9
+Added in v.1.11

MailToCvsAdmin">MailToCvsAdmin	ViewVC Help
Powered by ViewVC 1.1.26