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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.8 by joko, Tue Feb 18 19:19:47 2003 UTC revision 1.11 by joko, Wed Jun 25 22:52:58 2003 UTC
# Line 3  Line 3 
3  #  $Id$  #  $Id$
4  #  #
5  #  $Log$  #  $Log$
6    #  Revision 1.11  2003/06/25 22:52:58  joko
7    #  fix:!? add storage in any case
8    #
9    #  Revision 1.10  2003/06/06 03:26:24  joko
10    #  + sub existsStorage
11    #
12    #  Revision 1.9  2003/03/27 15:31:08  joko
13    #  fixes to modules regarding new namespace(s) below Data::Mungle::*
14    #
15  #  Revision 1.8  2003/02/18 19:19:47  joko  #  Revision 1.8  2003/02/18 19:19:47  joko
16  #  + modified locator handling  #  + modified locator handling
17  #  #
# Line 14  Line 23 
23  #  + temporary fix: (FIXME) now connecting to storage on storagehandle-instantiation  #  + temporary fix: (FIXME) now connecting to storage on storagehandle-instantiation
24  #  #
25  #  Revision 1.5  2003/01/19 02:39:57  joko  #  Revision 1.5  2003/01/19 02:39:57  joko
26  #  + moved 'deep_copy' from module 'libp' to module 'Data::Transform::Deep'  #  + moved 'deep_copy' from module 'libp' to module 'Data.Transform.Deep'
27  #  + preserved order for hashes '$self->{config}' and '$self->{locator}' by using Tie::IxHash  #  + preserved order for hashes '$self->{config}' and '$self->{locator}' by using Tie::IxHash
28  #  #
29  #  Revision 1.4  2002/12/04 07:38:07  jonen  #  Revision 1.4  2002/12/04 07:38:07  jonen
# Line 52  use Data::Dumper; Line 61  use Data::Dumper;
61    
62  use Data::Storage;  use Data::Storage;
63  use Data::Storage::Locator;  use Data::Storage::Locator;
64  use Data::Transform::Deep qw( deep_copy );  use Data::Mungle::Transform::Deep qw( deep_copy );
65  use Data::Compare::Struct qw( isEmpty );  use Data::Mungle::Compare::Struct qw( isEmpty );
66    
67  sub new {  sub new {
68    my $invocant = shift;    my $invocant = shift;
# Line 101  sub addStorage { Line 110  sub addStorage {
110    $self->{storage}->{$name} = $storage;    $self->{storage}->{$name} = $storage;
111  }  }
112    
113    sub existsStorage {
114      my $self = shift;
115      my $name = shift;
116      return exists $self->{storage}->{$name};
117    }
118    
119  sub initLocator {  sub initLocator {
120    my $self = shift;    my $self = shift;
121    my $name = shift;    my $name = shift;
# Line 169  sub initStorage { Line 184  sub initStorage {
184    my $self = shift;    my $self = shift;
185    my $name = shift;    my $name = shift;
186    
187      return if $self->existsStorage($name);
188    
189    my $locator = $self->getLocator($name);    my $locator = $self->getLocator($name);
190    $logger->info( __PACKAGE__ . " is initializing storage declared by locator \"$name\"" );    $logger->info( __PACKAGE__ . " is initializing storage declared by locator \"$name\"" );
191    
# Line 177  sub initStorage { Line 194  sub initStorage {
194    # TODO: do below (after 'testAvailability' and 'testIntegrity') again!!!    # TODO: do below (after 'testAvailability' and 'testIntegrity') again!!!
195    #$storage->connect();    #$storage->connect();
196    
197      $self->addStorage($name, $storage);
198    
199    my $log_prefix = __PACKAGE__ . "->initStorage: ";    my $log_prefix = __PACKAGE__ . "->initStorage: ";
200    $log_prefix .= "dsn=\"$self->{locator}->{$name}->{dsn}\"" if $self->{locator}->{$name}->{dsn};    $log_prefix .= "dsn=\"$self->{locator}->{$name}->{dsn}\"" if $self->{locator}->{$name}->{dsn};
201    
# Line 185  sub initStorage { Line 204  sub initStorage {
204      $locator->{status}->{availability} = $storage->testAvailability();      $locator->{status}->{availability} = $storage->testAvailability();
205      if ( !$storage->testAvailability() ) {      if ( !$storage->testAvailability() ) {
206        $logger->error( "$log_prefix: testAvailability failed" );        $logger->error( "$log_prefix: testAvailability failed" );
207          return;
208      }      }
209    }    }
210                        
# Line 195  sub initStorage { Line 215  sub initStorage {
215      # actions if integrity fails      # actions if integrity fails
216      if (!$locator->{status}->{integrity}) {      if (!$locator->{status}->{integrity}) {
217        $logger->error( "$log_prefix: testIntegrity failed" );        $logger->error( "$log_prefix: testIntegrity failed" );
218          return;
219      }      }
220    }    }
221    
# Line 211  sub initStorage { Line 232  sub initStorage {
232      if ( !@{$storage->getChildNodes()} ) {      if ( !@{$storage->getChildNodes()} ) {
233        $locator->{status}->{empty} = 1;        $locator->{status}->{empty} = 1;
234        $logger->warning( "$log_prefix: Storage is empty.");        $logger->warning( "$log_prefix: Storage is empty.");
235        #return;        return;
236      }      }
237    }    }
238    
# Line 234  sub initStorage { Line 255  sub initStorage {
255    
256    #$self->{storage}->{$name} = $storage;    #$self->{storage}->{$name} = $storage;
257    #print "add storage: $name", "\n";    #print "add storage: $name", "\n";
258    $self->addStorage($name, $storage);    #$self->addStorage($name, $storage);
259    
260    return 1;    return 1;
261        
# Line 262  sub _dbErrorHandler { Line 283  sub _dbErrorHandler {
283  }  }
284    
285  1;  1;
286    __END__
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.11
MailToCvsAdmin">MailToCvsAdmin
 ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed