--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/04 08:54:08	1.11
+++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/11 06:54:10	1.16
@@ -1,8 +1,26 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.11 2002/12/04 08:54:08 jonen Exp $
+#  $Id: Tangram.pm,v 1.16 2002/12/11 06:54:10 joko Exp $
 #
 #  $Log: Tangram.pm,v $
+#  Revision 1.16  2002/12/11 06:54:10  joko
+#  + fix: encapsulated object-loading inside an 'eval'
+#
+#  Revision 1.15  2002/12/05 13:55:21  joko
+#  + now utilizing 'object2hash' instead of 'var_deref'
+#  + played around with having fresh-objects - no progress....
+#
+#  Revision 1.14  2002/12/05 09:40:30  jonen
+#  + added option->{destroy} at getObject for unloading all instance
+#
+#  Revision 1.13  2002/12/05 07:59:04  joko
+#  + now using Tie::SecureHash as a base for the COREHANDLE
+#  + former public COREHANDLE becomes private _COREHANDLE now
+#  + sub getCOREHANDLE
+#
+#  Revision 1.12  2002/12/04 11:34:49  joko
+#  - $schema_tangram doesn't have to be in class?
+#
 #  Revision 1.11  2002/12/04 08:54:08  jonen
 #  + untested bugfix: undef($object) after transform to hash at getObjectAsHash
 #
@@ -59,6 +77,7 @@
 use strict;
 use warnings;
 
+use base ("Data::Storage::Handler");
 use base ("Data::Storage::Handler::Abstract");
 
 use Tangram;
@@ -66,7 +85,7 @@
 use libp qw( getNewPerlObjectByPkgName );
 use Data::Storage::Result::Tangram;
 use Data::Compare::Struct qw( isEmpty );
-use Data::Transform::Deep qw( var_deref );
+use Data::Transform::Deep qw( object2hash );
 use Data::Transform::Encode qw( var2utf8 );
 
 
@@ -74,6 +93,9 @@
 my $logger = Log::Dispatch::Config->instance;
 
 
+# this holds the complete instantiated schema from tangram
+my $schema_tangram;
+
 sub getMetaInfo {
   my $self = shift;
   $logger->debug( __PACKAGE__ . "->getMetaInfo()"  );
@@ -85,11 +107,11 @@
 sub _initSchema {
   my $self = shift;
   $logger->debug( __PACKAGE__ . "->_initSchema()" );
-  #if (!$self->{schema_tangram}) {
+  #if (!$schema_tangram) {
     my $obj = getNewPerlObjectByPkgName($self->{locator}->{schema}, { EXPORT_OBJECTS => $self->{locator}->{classnames}, want_transactions => $self->{locator}->{want_transactions} } );
-    $self->{schema_tangram} = $obj->getSchema();
+    $schema_tangram = $obj->getSchema();
   #}
-  if (!$self->{schema_tangram}) {
+  if (!$schema_tangram) {
     $logger->error( __PACKAGE__ . "->_initSchema: No Schema available for $self->{schema}" );
     return 0;
   }
@@ -118,7 +140,11 @@
 
     # create the main tangram storage object
     #$self->{COREHANDLE} = Tangram::Relational->connect( $schema, $dsn );
-    $self->{COREHANDLE} = Tangram::Relational->connect( $self->{schema_tangram}, $dsn );
+    $self->{_COREHANDLE} = Tangram::Relational->connect( $schema_tangram, $dsn );
+
+#print "connect", "\n";
+#my $core = $self->{_COREHANDLE};
+#print Dumper($core);
   
     # some attempts for configuring the wrapped underlying dbi.....
     #$self->{STORAGEHANDLE_UNDERLYING} = $self->getUnderlyingStorage();
@@ -224,7 +250,7 @@
   foreach my $key (keys %{$self->{dbi}}) {
     my $val = $self->{dbi}->{$key};
     print "entry: $key; $val", "\n";
-    $self->{COREHANDLE}->{db}->{$key} = $val;
+    $self->{_COREHANDLE}->{db}->{$key} = $val;
   }
   #print Dumper($self->{COREHANDLE}->{db});
 }
@@ -240,16 +266,16 @@
 
   # apply configured modifications
     if (exists $self->{dbi}->{trace_level} && exists $self->{dbi}->{trace_file}) {
-      $self->{COREHANDLE}->{db}->trace($self->{dbi}->{trace_level}, $self->{dbi}->{trace_file});
+      $self->{_COREHANDLE}->{db}->trace($self->{dbi}->{trace_level}, $self->{dbi}->{trace_file});
     }
     if (exists $self->{dbi}->{RaiseError}) {
-      $self->{COREHANDLE}->{db}->{RaiseError} = $self->{dbi}->{RaiseError};
+      $self->{_COREHANDLE}->{db}->{RaiseError} = $self->{dbi}->{RaiseError};
     }
     if (exists $self->{dbi}->{PrintError}) {
-      $self->{COREHANDLE}->{db}->{PrintError} = $self->{dbi}->{PrintError};
+      $self->{_COREHANDLE}->{db}->{PrintError} = $self->{dbi}->{PrintError};
     }
     if (exists $self->{dbi}->{HandleError}) {
-      $self->{COREHANDLE}->{db}->{HandleError} = $self->{dbi}->{HandleError};
+      $self->{_COREHANDLE}->{db}->{HandleError} = $self->{dbi}->{HandleError};
     }
 
 }
@@ -265,7 +291,7 @@
   my $ok;
   if ( my $dbh = DBI->connect($dsn, '', '', $self->{locator}->{dbi} ) ) {
     return unless $self->_initSchema();
-    $ok = Tangram::Relational->deploy($self->{schema_tangram}, $dbh );
+    $ok = Tangram::Relational->deploy($schema_tangram, $dbh );
     $dbh->disconnect();
   }
   return $ok;
@@ -286,7 +312,7 @@
     #use Data::Dumper; print Dumper($self);
     $self->{dataStorageLayer}->removeLogDispatchHandler("Tangram11");
     
-    $ok = Tangram::Relational->retreat($self->{schema_tangram}, $dbh );
+    $ok = Tangram::Relational->retreat($schema_tangram, $dbh );
 
     # answer "$ok=2" means "maybe" for now - we have to patch this to a constant here because...
     # - ... Tangram::Relational->retreat doesn't seem to return a valid status
@@ -328,8 +354,8 @@
   my @results;
   $logger->debug( __PACKAGE__ . "->getListUnfiltered( nodename => '" . $nodename . "' )" );
   # get set of objects from odbms by object name
-  my $object_set = $self->{COREHANDLE}->remote($nodename);
-  @results = $self->{COREHANDLE}->select($object_set);
+  my $object_set = $self->{_COREHANDLE}->remote($nodename);
+  @results = $self->{_COREHANDLE}->select($object_set);
   return \@results;
 }
 
@@ -374,14 +400,14 @@
   my $tfilter = join(' & ', @tfilters);
 
   # get set of objects from odbms by object name
-  my $remote = $self->{COREHANDLE}->remote($nodename);
+  my $remote = $self->{_COREHANDLE}->remote($nodename);
   
   # was:
   #@results = $self->{COREHANDLE}->select($object_set, $tfilter);
 
   # is:
   # HACK: build eval-string (sorry) to get filtered list - please give advice here
-  my $evalstring = 'return $self->{COREHANDLE}->select($remote, ' . $tfilter . ');';
+  my $evalstring = 'return $self->{_COREHANDLE}->select($remote, ' . $tfilter . ');';
   
   # get filtered list/set
   @results = eval($evalstring);
@@ -393,7 +419,7 @@
 sub createCursor {
   my $self = shift;
   my $node = shift;
-  my $cmdHandle = $self->{COREHANDLE}->cursor($node);
+  my $cmdHandle = $self->{_COREHANDLE}->cursor($node);
   my $result = Data::Storage::Result::Tangram->new( RESULTHANDLE => $cmdHandle );
   return $result;
 }
@@ -428,9 +454,9 @@
     my $ident = $query->{criterias}->[0]->{val};
 #print "load obj", "\n";
     #return $self->createSet() if $ident == 5;
-    my $object = $self->{COREHANDLE}->load($ident);
+    my $object = $self->{_COREHANDLE}->load($ident);
 #print "get id", "\n";
-    my $oid = $self->{COREHANDLE}->id($object);
+    my $oid = $self->{_COREHANDLE}->id($object);
     return $self->createSet($object);
     #return $self->createSet( $self->{COREHANDLE}->load('300090018') );
   }
@@ -459,9 +485,9 @@
 sub eraseAll {
   my $self = shift;
   my $classname = shift;
-  my $remote = $self->{COREHANDLE}->remote($classname);
-  my @objs = $self->{COREHANDLE}->select($remote);
-  $self->{COREHANDLE}->erase(@objs);
+  my $remote = $self->{_COREHANDLE}->remote($classname);
+  my @objs = $self->{_COREHANDLE}->select($remote);
+  $self->{_COREHANDLE}->erase(@objs);
 }
 
 sub createDb {
@@ -473,20 +499,67 @@
 sub getObject {
   my $self = shift;
   my $oid = shift;
+  my $options = shift;
+
+  # TODO: create a deep_unload method (currently _all_ objects are unloaded)
+  # unload($oid) will only unload object, not deep object hashes
+  $self->{_COREHANDLE}->unload() if($options->{destroy});
+
   # TODO: review this
   #if (!$self->{COREHANDLE}) { return; }
-  return $self->{COREHANDLE}->load($oid);
+
+  # TODO: review this
+  my $object = eval('$self->{_COREHANDLE}->load($oid);');
+  print $@, "\n" if $@;
+
+  return $object if $object;
 }
 
 sub getObjectAsHash {
   my $self = shift;
   my $oid = shift;
   my $options = shift;
-  my $obj = $self->getObject($oid);
-  my $deref = var_deref($obj);
-  var2utf8($deref) if ($options->{utf8});
-  undef($obj) if($options->{destroy});
-  return $deref;
+  my $obj = $self->getObject($oid, $options);
+  
+  # build options (a callback to unload autovivified objects) for 'expand'
+  # TODO: use $logger to write to debug here!
+  my $cb; # = sub {};
+=pod
+  if ($options->{destroy}) {
+    $options->{cb}->{destroy} = sub {
+      print "================ DESTROY", "\n";
+      my $object = shift;
+      #print Dumper($object);
+      $self->{_COREHANDLE}->unload($object);
+      #undef($object);
+    };
+  }
+=cut
+
+  my $hash = object2hash($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
+  #var2utf8($hash) if ($options->{utf8});
+  
+  # old (wrong) attempts to get rid of used instances, if requested
+    #$obj->clear_refs;
+    #$self->{COREHANDLE}->unload($obj) if($options->{destroy});
+    #$obj->DESTROY;
+    #undef($obj) if($options->{destroy});
+  
+  return $hash;
+}
+
+sub getSchema {
+  return $schema_tangram;
+}
+
+sub getCOREHANDLE {
+  my $self = shift;
+  return $self->{_COREHANDLE};
 }
 
 1;