--- nfo/perl/libs/Data/Storage.pm 2002/10/10 03:43:12 1.1 +++ nfo/perl/libs/Data/Storage.pm 2003/01/19 03:12:59 1.15 @@ -1,13 +1,80 @@ -################################# -# -# $Id: Storage.pm,v 1.1 2002/10/10 03:43:12 cvsjoko Exp $ -# -# $Log: Storage.pm,v $ -# Revision 1.1 2002/10/10 03:43:12 cvsjoko -# + new -# -# -################################# +## ------------------------------------------------------------------------ +## +## $Id: Storage.pm,v 1.15 2003/01/19 03:12:59 joko Exp $ +## +## Copyright (c) 2002 Andreas Motl +## +## See COPYRIGHT section in pod text below for usage and distribution rights. +## +## ------------------------------------------------------------------------ +## +## $Log: Storage.pm,v $ +## Revision 1.15 2003/01/19 03:12:59 joko +## + modified header +## - removed pod-documentation - now in 'Storage.pod' +## +## Revision 1.14 2002/12/19 16:27:59 joko +## - moved 'sub dropDb' to Data::Storage::Handler::DBI +## +## Revision 1.13 2002/12/17 21:54:12 joko +## + feature when using Tangram: +## + what? each object created should delivered with a globally(!?) unique identifier (GUID) besides the native tangram object id (OID) +## + patched Tangram::Storage (jonen) +## + enhanced Data::Storage::Schema::Tangram (joko) +## + enhanced Data::Storage::Handler::Tangram 'sub getObjectByGuid' (jonen) +## + how? +## + each concrete (non-abstract) class gets injected with an additional field/property called 'guid' - this is done (dynamically) on schema level +## + this property ('guid') gets filled on object creation/insertion from 'sub Tangram::Storage::_insert' using Data::UUID from CPAN +## + (as for now) this property can get accessed by calling 'getObjectByGuid' on the already known storage-handle used throughout the application +## +## Revision 1.12 2002/12/12 02:50:15 joko +## + this now (unfortunately) needs DBI for some helper functions +## + TODO: these have to be refactored to another scope! (soon!) +## +## Revision 1.11 2002/12/11 06:53:19 joko +## + updated pod +## +## Revision 1.10 2002/12/07 03:37:23 joko +## + updated pod +## +## Revision 1.9 2002/12/01 22:15:45 joko +## - sub createDb: moved to handler +## +## Revision 1.8 2002/11/29 04:48:23 joko +## + updated pod +## +## Revision 1.7 2002/11/17 06:07:18 joko +## + creating the handler is easier than proposed first - for now :-) +## + sub testAvailability +## +## Revision 1.6 2002/11/09 01:04:58 joko +## + updated pod +## +## Revision 1.5 2002/10/29 19:24:18 joko +## - reduced logging +## + added some pod +## +## Revision 1.4 2002/10/27 18:35:07 joko +## + added pod +## +## Revision 1.3 2002/10/25 11:40:37 joko +## + enhanced robustness +## + more logging for debug-levels +## + sub dropDb +## +## Revision 1.2 2002/10/17 00:04:29 joko +## + sub createDb +## + sub isConnected +## + bugfixes regarding "deep recursion" stuff +## +## Revision 1.1 2002/10/10 03:43:12 cvsjoko +## + new +## ------------------------------------------------------------------------ + + +BEGIN { + $Data::Storage::VERSION = 0.03; +} package Data::Storage; @@ -15,8 +82,13 @@ use warnings; use Data::Storage::Locator; -use Data::Storage::Handler::DBI; -use Data::Storage::Handler::Tangram; +use Data::Dumper; + +# TODO: wipe out! +use DBI; + +# TODO: actually implement level (integrate with Log::Dispatch) +my $TRACELEVEL = 0; # get logger instance my $logger = Log::Dispatch::Config->instance; @@ -25,18 +97,31 @@ my $invocant = shift; my $class = ref($invocant) || $invocant; #my @args = normalizeArgs(@_); - + my $arg_locator = shift; my $arg_options = shift; - + + if (!$arg_locator) { + $logger->critical( __PACKAGE__ . "->new: No locator passed in!" ); + return; + } + #my $self = { STORAGEHANDLE => undef, @_ }; my $self = { STORAGEHANDLE => undef, locator => $arg_locator, options => $arg_options }; - $logger->debug( __PACKAGE__ . "[$self->{locator}->{type}]" . "->new(@_)" ); + #$logger->debug( __PACKAGE__ . "[$self->{locator}->{type}]" . "->new(@_)" ); + $logger->debug( __PACKAGE__ . "[$arg_locator->{type}]" . "->new(@_)" ); return bless $self, $class; } sub AUTOLOAD { + # since this is a core function acting as dispatcher to $self->{STORAGEHANDLE}, + # some sophisticated handling and filtering is needed to avoid things like + # - Deep recursion on subroutine "Data::Storage::AUTOLOAD" + # - Deep recursion on subroutine "Data::Storage::Handler::Abstract::AUTOLOAD" + # - Deep recursion on anonymous subroutine at [...] + # we also might filter log messages caused by logging to itself in "advanced logging of AUTOLOAD calls" + my $self = shift; our $AUTOLOAD; @@ -46,11 +131,27 @@ my $method = $AUTOLOAD; $method =~ s/^.*:://; - #$logger->debug( __PACKAGE__ . "[$self->{locator}->{type}]" . "->" . $method . "(@_)" . " (AUTOLOAD)" ); - + # advanced logging of AUTOLOAD calls ... + # ... nice but do it only when TRACING (TODO) is enabled + if ($TRACELEVEL) { + my $logstring = ""; + $logstring .= __PACKAGE__ . "[$self->{locator}->{type}]" . "->" . $method; + #print "count: ", $#_, "\n"; + #$logstring .= Dumper(@_) if ($#_ != -1); + my $tabcount = int( (80 - length($logstring)) / 10 ); + $logstring .= "\t" x $tabcount . "(AUTOLOAD)"; + # TODO: only ok if logstring doesn't contain + # e.g. "Data::Storage[Tangram]->insert(SystemEvent=HASH(0x5c0034c)) (AUTOLOAD)" + # but that would be _way_ too specific as long as we don't have an abstract handler for this ;) + $logger->debug( $logstring ); + #print join('; ', @_); + } + + # filtering AUTOLOAD calls and first-time-touch of the actual storage impl if ($self->_filter_AUTOLOAD($method)) { + #print "_accessStorage\n"; $self->_accessStorage(); - $self->{STORAGEHANDLE}->$method(@_); + return $self->{STORAGEHANDLE}->$method(@_); } } @@ -79,7 +180,9 @@ sub _accessStorage { my $self = shift; # TODO: to some tracelevel! - #$logger->debug( __PACKAGE__ . "[$self->{type}]" . "->_accessStorage()" ); + if ($TRACELEVEL) { + $logger->debug( __PACKAGE__ . "[$self->{locator}->{type}]" . "->_accessStorage()" ); + } if (!$self->{STORAGEHANDLE}) { $self->_createStorageHandle(); } @@ -87,28 +190,28 @@ sub _createStorageHandle { my $self = shift; - my $type = $self->{locator}->{type}; $logger->debug( __PACKAGE__ . "[$type]" . "->_createStorageHandle()" ); my $pkg = "Data::Storage::Handler::" . $type . ""; - # propagate args to handler - # needs some more thoughts! (not only "dbi" to Tangram, when (in future) db is not more the common case) - if ($type eq 'DBI') { - #my @args = %{$self->{locator}->{dbi}}; - my @args = %{$self->{locator}}; - $self->{STORAGEHANDLE} = $pkg->new( @args ); - } - if ($type eq 'Tangram') { - #$self->{STORAGEHANDLE} = $pkg->new( dsn => $self->{locator}->{dbi}->{dsn} ); - #my @args = %{$self->{locator}->{dbi}}; - my @args = %{$self->{locator}}; - $self->{STORAGEHANDLE} = $pkg->new( @args ); - #$self->{STORAGEHANDLE_UNDERLYING} = $self->{STORAGEHANDLE}->getUnderlyingStorage(); - #$self->{STORAGEHANDLE_UNDERLYING}->_configureCOREHANDLE(); + # try to load perl module at runtime + my $evalstr = "use $pkg;"; + eval($evalstr); + if ($@) { + $logger->error( __PACKAGE__ . "[$type]" . "->_createStorageHandle(): $@" ); + return; } + # build up some additional arguments to pass on + #my @args = %{$self->{locator}}; + my @args = (); + + # - create new storage handle object + # - propagate arguments to handler + # - pass locator by reference to be able to store status- or meta-information in it + $self->{STORAGEHANDLE} = $pkg->new( locator => $self->{locator}, @args ); + } sub addLogDispatchHandler { @@ -116,7 +219,7 @@ my $self = shift; my $name = shift; my $package = shift; - my $logger = shift; + my $logger1 = shift; my $objectCreator = shift; #$logger->add( Log::Dispatch::Tangram->new( name => $name, @@ -140,13 +243,10 @@ } sub removeLogDispatchHandler { - - my $self = shift; - my $name = shift; - my $logger = shift; - - $logger->remove($name); - + my $self = shift; + my $name = shift; + #my $logger = shift; + $logger->remove($name); } sub getDbName { @@ -157,6 +257,19 @@ return $database_name; } +sub testAvailability { + my $self = shift; + my $status = $self->testDsn(); + $self->{locator}->{status}->{available} = $status; + return $status; +} + +sub isConnected { + my $self = shift; + # TODO: REVIEW! + return 1 if $self->{STORAGEHANDLE}; +} + sub testDsn { my $self = shift; my $dsn = $self->{locator}->{dbi}->{dsn}; @@ -164,11 +277,15 @@ if ( my $dbh = DBI->connect($dsn, '', '', { PrintError => 0, } ) ) { + + # TODO: REVIEW $dbh->disconnect(); + return 1; } else { - $logger->error( __PACKAGE__ . "[$self->{locator}->{type}]" . "->testDsn(): " . "DBI-error: " . DBI::errstr ); + $logger->warning( __PACKAGE__ . "[$self->{locator}->{type}]" . "->testDsn(): " . "DBI-error: " . $DBI::errstr ); } } -1; \ No newline at end of file +1; +__END__