--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2003/01/31 06:30:59	1.27
+++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2003/02/20 20:20:26	1.28
@@ -1,8 +1,11 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.27 2003/01/31 06:30:59 joko Exp $
+#  $Id: Tangram.pm,v 1.28 2003/02/20 20:20:26 joko Exp $
 #
 #  $Log: Tangram.pm,v $
+#  Revision 1.28  2003/02/20 20:20:26  joko
+#  tried to get auto-disconnect working again - failed with that
+#
 #  Revision 1.27  2003/01/31 06:30:59  joko
 #  + enabled 'sendQuery'
 #
@@ -41,7 +44,7 @@
 #  + fix: encapsulated object-loading inside an 'eval'
 #
 #  Revision 1.15  2002/12/05 13:55:21  joko
-#  + now utilizing 'object2hash' instead of 'var_deref'
+#  + now utilizing 'expand' instead of 'var_deref'
 #  + played around with having fresh-objects - no progress....
 #
 #  Revision 1.14  2002/12/05 09:40:30  jonen
@@ -114,13 +117,15 @@
 use base ("Data::Storage::Handler");
 use base ("Data::Storage::Handler::Abstract");
 
-use Tangram;
+
 use Data::Dumper;
+use Tangram;
+
 use DesignPattern::Object;
 use Data::Storage::Result::Tangram;
 use Data::Compare::Struct qw( isEmpty );
-use Data::Transform::Deep qw( object2hash );
-use Data::Transform::Encode qw( var2utf8 );
+use Data::Transform::Deep qw( expand );
+#use Data::Transform::Encode qw( var2utf8 );
 
 # get logger instance
 my $logger = Log::Dispatch::Config->instance;
@@ -648,12 +653,12 @@
   }
 =cut
 
-  my $hash = object2hash($obj, $options);
+  my $hash = expand($obj, $options);
   #$options->{cb}->{destroy}->($obj);
   #$self->{_COREHANDLE}->unload($obj);
   
   # convert values in hash to utf8 to be ready for (e.g.) encapsulation in XML
-  # now done in object2hash
+  # now done in expand
   #var2utf8($hash) if ($options->{utf8});
   
   # old (wrong) attempts to get rid of used instances, if requested
@@ -686,5 +691,21 @@
   return $storage->testAvailability();
 }
 
+sub disconnect2 {
+  my $self = shift;
+  my $storage = $self->_getSubLayerHandle();
+  print "DISC!", "\n";
+
+  my $storage_ll = $storage->{_COREHANDLE};
+  $storage_ll->disconnect();
+  
+  print Dumper($storage);
+  exit;
+  
+  #$self->{_COREHANDLE}
+  #$storage->disconnect();
+  $self->{dataStorageLayer}->disconnect();
+}
+
 1;
 __END__