--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/03 15:53:23	1.10
+++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2003/02/20 20:20:26	1.28
@@ -1,8 +1,66 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.10 2002/12/03 15:53:23 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'
+#
+#  Revision 1.26  2003/01/30 22:29:47  joko
+#  + fixed module usage (removed dependency on 'libp.pm')
+#
+#  Revision 1.25  2003/01/19 02:30:05  joko
+#  + fix: modified call to '_initSchema'
+#
+#  Revision 1.24  2002/12/22 14:13:01  joko
+#  + sub dropDb
+#
+#  Revision 1.23  2002/12/19 16:31:53  joko
+#  +- renamed sub to 'rebuildDb'
+#
+#  Revision 1.22  2002/12/18 22:28:16  jonen
+#  + added extended logging at 'getObjectByGuid()'
+#
+#  Revision 1.21  2002/12/16 22:20:49  jonen
+#  + fixed bug at 'getObjectByGuid()'
+#
+#  Revision 1.20  2002/12/16 20:49:17  jonen
+#  + added sub 'getObjectByGuid()'
+#  + added functionality to use 'getObjectByGuid' at 'getObjectAsHash()'
+#
+#  Revision 1.19  2002/12/16 06:46:09  joko
+#  + attempt to introduce a generic '_patchSchema' - cancelled!
+#
+#  Revision 1.18  2002/12/13 21:48:07  joko
+#  + fix to 'sub sendQuery'
+#
+#  Revision 1.17  2002/12/12 02:51:09  joko
+#  + cosmetics
+#
+#  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 'expand' 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
+#
 #  Revision 1.10  2002/12/03 15:53:23  joko
 #  + small bugfix regarding object hierarchy
 #
@@ -56,21 +114,26 @@
 use strict;
 use warnings;
 
+use base ("Data::Storage::Handler");
 use base ("Data::Storage::Handler::Abstract");
 
-use Tangram;
+
 use Data::Dumper;
-use libp qw( getNewPerlObjectByPkgName );
+use Tangram;
+
+use DesignPattern::Object;
 use Data::Storage::Result::Tangram;
 use Data::Compare::Struct qw( isEmpty );
-use Data::Transform::Deep qw( var_deref );
-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;
 
 
+# this holds the complete instantiated schema from tangram
+my $schema_tangram;
+
 sub getMetaInfo {
   my $self = shift;
   $logger->debug( __PACKAGE__ . "->getMetaInfo()"  );
@@ -82,24 +145,47 @@
 sub _initSchema {
   my $self = shift;
   $logger->debug( __PACKAGE__ . "->_initSchema()" );
-  #if (!$self->{schema_tangram}) {
-    my $obj = getNewPerlObjectByPkgName($self->{locator}->{schema}, { EXPORT_OBJECTS => $self->{locator}->{classnames}, want_transactions => $self->{locator}->{want_transactions} } );
-    $self->{schema_tangram} = $obj->getSchema();
+  #if (!$schema_tangram) {
+    #my $obj = getNewPerlObjectByPkgName($self->{locator}->{schema}, { EXPORT_OBJECTS => $self->{locator}->{classnames}, want_transactions => $self->{locator}->{want_transactions} } );
+    my $obj = DesignPattern::Object->fromPackage($self->{locator}->{schema}, { 'EXPORT_OBJECTS' => $self->{locator}->{classnames}, 'want_transactions' => $self->{locator}->{want_transactions} } );
+    $schema_tangram = $obj->getSchema();
   #}
-  if (!$self->{schema_tangram}) {
+  if (!$schema_tangram) {
     $logger->error( __PACKAGE__ . "->_initSchema: No Schema available for $self->{schema}" );
     return 0;
   }
+  #$self->_patchSchema();
   return 1;
 }
 
+sub _patchSchema {
+  my $self = shift;
+  foreach (keys %{$schema_tangram->{classes}}) {
+    next if $schema_tangram->{classes}->{$_}->{abstract};
+    #next if ($_ ne 'TsBankAccount');
+    #$_ ne 'AbstractAccount' && 
+    print "class: $_", "\n";
+#print Dumper($schema_tangram->{classes}->{$_});
+    # create new string property named 'guid'
+    my $tstring = Tangram::String->new();
+    $tstring->{name} = $tstring->{col} = 'guid';
+    # inject property into schema
+    #$schema_tangram->{classes}->{$_}->{root}->{SPECS}->[0]->{fields}->{string}->{$tstring->{name}} = $tstring;
+    print Dumper($schema_tangram->{classes}->{$_}->{root}->{SPECS}->[0]->{fields});
+  }
+}
+
 sub connect {
 
     my $self = shift;
     
     my $dsn = shift;
+
+#print Dumper($self);
+#exit;
+
+    # TODO: re-enable
     $dsn ||= $self->{locator}->{dbi}->{dsn};
-    
     $logger->debug( __PACKAGE__ . "->connect( dsn $dsn )" );
     
     #my $storage = Tangram::Relational->connect( $schema, $dsn );
@@ -111,11 +197,16 @@
 #      return;
 #    }
 
-    return unless $self->_initSchema();
+    #return unless $self->_initSchema();
+    $self->_initSchema();
 
     # 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();
@@ -221,7 +312,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});
 }
@@ -234,19 +325,21 @@
   $logger->debug( __PACKAGE__ . "->configureCOREHANDLE" );
 
   #my $subLayer = $self->_getSubLayerHandle();
+  #print Dumper($self);
+  #exit;
 
   # 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};
     }
 
 }
@@ -262,7 +355,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;
@@ -283,7 +376,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
@@ -299,9 +392,9 @@
   return $ok;
 }
 
-sub rebuildDbAndSchema {
+sub rebuildDb {
   my $self = shift;
-  $logger->info( __PACKAGE__ . "->rebuildDbAndSchema()" );
+  $logger->info( __PACKAGE__ . "->rebuildDb()" );
   my @results;
 
   # sum up results (bool (0/1)) in array
@@ -325,8 +418,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;
 }
 
@@ -341,7 +434,7 @@
   my @results;
   $logger->debug( __PACKAGE__ . "->getListFiltered( nodename => '" . $nodename . "' )" );
 
-  #print Dumper($filters);
+#print Dumper($filters);
   
   my @tfilters;
   
@@ -371,14 +464,16 @@
   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 . ');';
+  
+  #print "eval: $evalstring", "\n";
   
   # get filtered list/set
   @results = eval($evalstring);
@@ -390,18 +485,22 @@
 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;
 }
 
 sub createSet {
   my $self = shift;
+#print "-" x 80, "\n";
+#print Dumper(@_);
   my @objects = @_;
   my $rh = Set::Object->new();
   foreach (@objects) {
-    #print Dumper($_);
-    $rh->insert($_) if !isEmpty($_);
+    if (!isEmpty($_)) {
+#print Dumper($_);
+      $rh->insert($_);
+    }
   }
   #print Dumper($rh->members());
   my $result = Data::Storage::Result::Tangram->new( RESULTHANDLE => $rh );
@@ -425,17 +524,28 @@
     my $ident = $query->{criterias}->[0]->{val};
 #print "load obj", "\n";
     #return $self->createSet() if $ident == 5;
-    my $object = $self->{COREHANDLE}->load($ident);
+    $self->{_COREHANDLE}->unload($ident);
+    my $object = $self->{_COREHANDLE}->load($ident);
 #print "get id", "\n";
-    my $oid = $self->{COREHANDLE}->id($object);
+    my $oid = $self->{_COREHANDLE}->id($object);
+#print Dumper($object);
+#print "oid: $oid", "\n";
     return $self->createSet($object);
     #return $self->createSet( $self->{COREHANDLE}->load('300090018') );
   }
 
-  die("This should not be reached for now - redirect to \$self->getListFiltered() here!");
+  my $list = $self->getListFiltered($query->{node}, $query->{criterias});
+  #return $self->createSet($object);
+  #return $self->createSet($list);
+  return $self->createSet(@$list);
+
+  #die("This should not be reached for now - redirect to \$self->getListFiltered() here!");
+
 
-  # TODO: do a common tangram query here
 
+
+  # try a generic tangram query here
+  # TODO: try to place an oql on top of that (search.cpan.org!)
   my @crits;
   foreach (@{$query->{criterias}}) {
     my $op = '';
@@ -456,9 +566,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 {
@@ -470,19 +580,132 @@
 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 getObjectByGuid {
+  my $self = shift;
+  my $guid = shift;
+  my $options = shift;
+  
+  # Guid and Classname is needed
+  if(!$guid || !$options->{classname}) {
+   $logger->error( __PACKAGE__ . "->getObjectByGuid: No 'guid' OR no Classname in options hash was given but needed!" );
+    return;
+  }
+  
+  # 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});
+
+  # search for object with given Classname and Guid
+  my $obj_tmp = $self->{_COREHANDLE}->remote($options->{classname});
+  my @result = $self->{_COREHANDLE}->select($obj_tmp, $obj_tmp->{guid} eq $guid);
+  
+  # we searched for global unique identifer of some object,
+  # so I think we can trust there would be only one result
+  if($result[0]) {
+    return $result[0];
+  } else {
+    $logger->error( __PACKAGE__ . "->getObjectByGuid: No Object with Classname $options->{classname} and GUID $guid found!" );
+    return;
+  }
+  
 }
 
 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});
-  return $deref;
+  my $options = shift;  
+  my $obj;
+  
+  if($options->{guid}) {
+    $obj = $self->getObjectByGuid($oid, $options);
+  } else {
+    $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 = 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 expand
+  #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};
+}
+
+sub dropDb {
+  my $self = shift;
+  my $storage = $self->_getSubLayerHandle();
+  return $storage->dropDb();
+}
+
+sub testAvailability {
+  my $self = shift;
+  my $storage = $self->_getSubLayerHandle();
+  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__