--- nfo/perl/libs/Data/Storage.pm	2003/01/19 03:12:59	1.15
+++ nfo/perl/libs/Data/Storage.pm	2003/02/18 19:22:11	1.19
@@ -1,6 +1,6 @@
 ## ------------------------------------------------------------------------
 ##
-##    $Id: Storage.pm,v 1.15 2003/01/19 03:12:59 joko Exp $
+##    $Id: Storage.pm,v 1.19 2003/02/18 19:22:11 joko Exp $
 ##
 ##    Copyright (c) 2002  Andreas Motl <andreas.motl@ilo.de>
 ##
@@ -9,6 +9,18 @@
 ## ------------------------------------------------------------------------
 ##
 ##  $Log: Storage.pm,v $
+##  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'
@@ -81,12 +93,14 @@
 use strict;
 use warnings;
 
-use Data::Storage::Locator;
 use Data::Dumper;
-
-# TODO: wipe out!
+# FIXME: wipe out!
 use DBI;
 
+use Data::Storage::Locator;
+use DesignPattern::Object;
+
+
 # TODO: actually implement level (integrate with Log::Dispatch)
 my $TRACELEVEL = 0;
 
@@ -100,16 +114,20 @@
 
   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__ . "[$arg_locator->{type}]" . "->new(@_)" );
+  $logger->debug( __PACKAGE__ . "[$arg_locator->{type}]" . "->new()" );
   return bless $self, $class;
 }
 
@@ -133,7 +151,6 @@
 
   # 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";
@@ -143,15 +160,21 @@
       # 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)) {
-    #print "_accessStorage\n";
-    $self->_accessStorage();
-    return $self->{STORAGEHANDLE}->$method(@_);
+    #print "=== FILTER!", "\n";
+    $self->_accessStorageHandle();
+    if ($self->{STORAGEHANDLE}) {
+      return $self->{STORAGEHANDLE}->$method(@_);
+    } else {
+      $logger->critical( __PACKAGE__ . "->AUTOLOAD: ERROR: " . $logstring );
+      return;
+    }
   }
   
 }
@@ -168,34 +191,56 @@
 }
 
 
-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!
+  #print "=========== _accessStorage", "\n";
   if ($TRACELEVEL) {
-    $logger->debug( __PACKAGE__ .  "[$self->{locator}->{type}]" . "->_accessStorage()" );
+    $logger->debug( __PACKAGE__ .  "[$self->{locator}->{type}]" . "->_accessStorageHandle()" );
   }
   if (!$self->{STORAGEHANDLE}) {
-    $self->_createStorageHandle();
+    return $self->_createStorageHandle();
   }
 }
 
+sub _createStorageHandle1 {
+  my $self = shift;
+  my $type = $self->{locator}->{type};
+  $logger->debug( __PACKAGE__ .  "[$type]" . "->_createStorageHandle()" );
+
+  my $pkg = "Data::Storage::Handler::" . $type . "";
+  
+  # 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 _createStorageHandle {
   my $self = shift;
   my $type = $self->{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 ($@) {
@@ -211,6 +256,10 @@
   # - 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;
 
 }
 
@@ -249,43 +298,6 @@
   $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 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};
-  my $result;
-  if ( my $dbh = DBI->connect($dsn, '', '', {
-                                                      PrintError => 0,
-                                                      } ) ) {
-    
-    # TODO: REVIEW
-    $dbh->disconnect();
-    
-    return 1;
-  } else {
-    $logger->warning( __PACKAGE__ .  "[$self->{locator}->{type}]" . "->testDsn(): " . "DBI-error: " . $DBI::errstr );
-  }
-}
 
 1;
 __END__