--- nfo/perl/libs/Data/Storage.pm 2002/10/25 11:40:37 1.3 +++ nfo/perl/libs/Data/Storage.pm 2003/06/25 22:51:51 1.20 @@ -1,34 +1,111 @@ -################################# -# -# $Id: Storage.pm,v 1.3 2002/10/25 11:40:37 joko Exp $ -# -# $Log: Storage.pm,v $ -# 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 -# -# -################################# - -# aim_V1: should encapsulate Tangram, DBI, DBD::CSV and LWP:: to access them in an unordinary way ;) -# aim_V2: introduce a generic layered structure, refactor *SUBLAYER*-stuff, make (e.g.) this possible: -# - Perl Data::Storage[DBD::CSV] -> Perl LWP:: -> Internet HTTP/FTP/* -> Host Daemon -> csv-file +## ------------------------------------------------------------------------ +## +## $Id: Storage.pm,v 1.20 2003/06/25 22:51:51 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.20 2003/06/25 22:51:51 joko +## + sub get_locator_type & Co. +## +## Revision 1.19 2003/02/18 19:22:11 joko +## + fixed logging +## +## Revision 1.18 2003/01/30 22:12:17 joko +## - removed/refactored old code: ->Data::Storage::Handler::Tangram|DBI +## +## Revision 1.17 2003/01/30 21:42:22 joko +## + minor update: renamed method +## +## Revision 1.16 2003/01/20 16:52:13 joko +## + now using 'DesignPattern::Object' to create a new 'Data::Storage::Handler::Xyz' on demand - before we did this in a hand-rolled fashion +## +## 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; use strict; use warnings; +use Data::Dumper; +# FIXME: wipe out! +use DBI; + use Data::Storage::Locator; +use DesignPattern::Object; + + +# TODO: actually implement level (integrate with Log::Dispatch) +my $TRACELEVEL = 0; # get logger instance my $logger = Log::Dispatch::Config->instance; @@ -37,13 +114,23 @@ my $invocant = shift; my $class = ref($invocant) || $invocant; #my @args = normalizeArgs(@_); - + my $arg_locator = shift; my $arg_options = shift; + #my @args = @_; + #@args ||= (); + + if (!$arg_locator) { + $logger->critical( __PACKAGE__ . "->new: No locator passed in!" ); + return; + } + #print Dumper($arg_locator); + #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; } @@ -54,7 +141,7 @@ # - 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 itself in "advanced logging of AUTOLOAD calls" + # we also might filter log messages caused by logging to itself in "advanced logging of AUTOLOAD calls" my $self = shift; our $AUTOLOAD; @@ -65,22 +152,40 @@ my $method = $AUTOLOAD; $method =~ s/^.*:://; - # advanced logging of AUTOLOAD calls - 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 ); - - # filtering AUTOLOAD calls + #print __PACKAGE__, "\n"; + #print $method, "\n"; + #print $self->{locator}, "\n"; + + my $locator_type = $self->get_locator_type(); + + # advanced logging of AUTOLOAD calls ... + # ... nice but do it only when TRACING (TODO) is enabled + my $logstring = ""; + $logstring .= __PACKAGE__ . "[$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 ;) + if ($TRACELEVEL) { + $logger->debug( $logstring ); + #print join('; ', @_); + } + + # filtering AUTOLOAD calls and first-time-touch of the actual storage impl if ($self->_filter_AUTOLOAD($method)) { - $self->_accessStorage(); - $self->{STORAGEHANDLE}->$method(@_); + #print "=== FILTER!", "\n"; + $self->_accessStorageHandle(); + if ($self->{STORAGEHANDLE}) { + return $self->{STORAGEHANDLE}->$method(@_); + } else { + my $msg = __PACKAGE__ . "->AUTOLOAD: ERROR: " . $logstring; + $logger->critical( $msg ) if $logger; + print STDERR $msg if not $logger; + return; + } } } @@ -97,53 +202,80 @@ } -sub normalizeArgs { - my %args = @_; - if (!$args{dsn} && $args{meta}{dsn}) { - $args{dsn} = $args{meta}{dsn}; - } - my @result = %args; - return @result; -} - -sub _accessStorage { +sub _accessStorageHandle { my $self = shift; # TODO: to some tracelevel! - $logger->debug( __PACKAGE__ . "[$self->{locator}->{type}]" . "->_accessStorage()" ); + #print "=========== _accessStorage", "\n"; + if ($TRACELEVEL) { + $logger->debug( __PACKAGE__ . "[$self->{locator}->{type}]" . "->_accessStorageHandle()" ); + } if (!$self->{STORAGEHANDLE}) { - $self->_createStorageHandle(); + return $self->_createStorageHandle(); } } -sub _createStorageHandle { +sub _createStorageHandle1 { 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') { - use Data::Storage::Handler::DBI; - #my @args = %{$self->{locator}->{dbi}}; - my @args = %{$self->{locator}}; - # create new storage handle - $self->{STORAGEHANDLE} = $pkg->new( @args ); + # try to load perl module at runtime + my $evalstr = "use $pkg;"; + eval($evalstr); + if ($@) { + $logger->error( __PACKAGE__ . "[$type]" . "->_createStorageHandle(): $@" ); + return; } - if ($type eq 'Tangram') { - use Data::Storage::Handler::Tangram; - #$self->{STORAGEHANDLE} = $pkg->new( dsn => $self->{locator}->{dbi}->{dsn} ); - #my @args = %{$self->{locator}->{dbi}}; - my @args = %{$self->{locator}}; - # create new storage handle - $self->{STORAGEHANDLE} = $pkg->new( @args ); + + # 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 ); - #$self->{STORAGEHANDLE_UNDERLYING} = $self->{STORAGEHANDLE}->getUnderlyingStorage(); - #$self->{STORAGEHANDLE_UNDERLYING}->_configureCOREHANDLE(); +} + +sub _createStorageHandle { + my $self = shift; + + # 2003-06-18: protection against storagehandles w/o locators + return if not defined $self->{locator}; + + my $type = $self->get_locator_type(); + $logger->debug( __PACKAGE__ . "[$type]" . "->_createStorageHandle()" ); + +#print Dumper($self); +#exit; + + my $pkg = "Data::Storage::Handler::" . $type . ""; + + # try to load perl module at runtime +=pod + 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 ); +=cut + + $self->{STORAGEHANDLE} = DesignPattern::Object->fromPackage( $pkg, locator => $self->{locator} ); + return 1; + } sub addLogDispatchHandler { @@ -175,91 +307,18 @@ } sub removeLogDispatchHandler { - - my $self = shift; - my $name = shift; - #my $logger = shift; - - $logger->remove($name); - -} - -sub getDbName { - my $self = shift; - my $dsn = $self->{locator}->{dbi}->{dsn}; - $dsn =~ m/database=(.+?);/; - my $database_name = $1; - return $database_name; -} - -sub testDsn { - my $self = shift; - my $dsn = $self->{locator}->{dbi}->{dsn}; - my $result; - if ( my $dbh = DBI->connect($dsn, '', '', { - PrintError => 0, - } ) ) { - $dbh->disconnect(); - return 1; - } else { - $logger->error( __PACKAGE__ . "[$self->{locator}->{type}]" . "->testDsn(): " . "DBI-error: " . $DBI::errstr ); - } -} - -sub createDb { - my $self = shift; - my $dsn = $self->{locator}->{dbi}->{dsn}; - - $logger->debug( __PACKAGE__ . "->createDb( dsn $dsn )" ); - - $dsn =~ s/database=(.+?);//; - my $database_name = $1; - - my $ok; - - if ( my $dbh = DBI->connect($dsn, '', '', { - PrintError => 0, - } ) ) { - if ($database_name) { - if ($dbh->do("CREATE DATABASE $database_name;")) { - $ok = 1; - } - } - $dbh->disconnect(); - } - - return $ok; - -} - -sub dropDb { my $self = shift; - my $dsn = $self->{locator}->{dbi}->{dsn}; - - $logger->debug( __PACKAGE__ . "->dropDb( dsn $dsn )" ); - - $dsn =~ s/database=(.+?);//; - my $database_name = $1; - - my $ok; - - if ( my $dbh = DBI->connect($dsn, '', '', { - PrintError => 0, - } ) ) { - if ($database_name) { - if ($dbh->do("DROP DATABASE $database_name;")) { - $ok = 1; - } - } - $dbh->disconnect(); - } - - return $ok; + my $name = shift; + #my $logger = shift; + $logger->remove($name); } -sub isConnected { +sub get_locator_type { my $self = shift; - return 1 if $self->{STORAGEHANDLE}; + my $locator_type = ''; + $locator_type = $self->{locator}->{type} if defined $self->{locator}; + return $locator_type; } -1; \ No newline at end of file +1; +__END__