--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/05 07:59:04	1.13
+++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2003/03/27 15:31:14	1.30
@@ -1,8 +1,62 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.13 2002/12/05 07:59:04 joko Exp $
+#  $Id: Tangram.pm,v 1.30 2003/03/27 15:31:14 joko Exp $
 #
 #  $Log: Tangram.pm,v $
+#  Revision 1.30  2003/03/27 15:31:14  joko
+#  fixes to modules regarding new namespace(s) below Data::Mungle::*
+#
+#  Revision 1.29  2003/02/21 01:47:18  joko
+#  purged old code
+#  minor cosmetics
+#
+#  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
@@ -70,14 +124,14 @@
 use base ("Data::Storage::Handler");
 use base ("Data::Storage::Handler::Abstract");
 
-use Tangram;
+
 use Data::Dumper;
-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::Encode qw( var2utf8 );
+use Tangram;
 
+use DesignPattern::Object;
+use Data::Storage::Result::Tangram;
+use Data::Mungle::Compare::Struct qw( isEmpty );
+use Data::Mungle::Transform::Deep qw( expand );
 
 # get logger instance
 my $logger = Log::Dispatch::Config->instance;
@@ -98,23 +152,46 @@
   my $self = shift;
   $logger->debug( __PACKAGE__ . "->_initSchema()" );
   #if (!$schema_tangram) {
-    my $obj = getNewPerlObjectByPkgName($self->{locator}->{schema}, { EXPORT_OBJECTS => $self->{locator}->{classnames}, want_transactions => $self->{locator}->{want_transactions} } );
+    #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 (!$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 );
@@ -126,7 +203,8 @@
 #      return;
 #    }
 
-    return unless $self->_initSchema();
+    #return unless $self->_initSchema();
+    $self->_initSchema();
 
     # create the main tangram storage object
     #$self->{COREHANDLE} = Tangram::Relational->connect( $schema, $dsn );
@@ -253,6 +331,8 @@
   $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}) {
@@ -318,9 +398,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
@@ -360,7 +440,7 @@
   my @results;
   $logger->debug( __PACKAGE__ . "->getListFiltered( nodename => '" . $nodename . "' )" );
 
-  #print Dumper($filters);
+#print Dumper($filters);
   
   my @tfilters;
   
@@ -399,6 +479,8 @@
   # HACK: build eval-string (sorry) to get filtered list - please give advice here
   my $evalstring = 'return $self->{_COREHANDLE}->select($remote, ' . $tfilter . ');';
   
+  #print "eval: $evalstring", "\n";
+  
   # get filtered list/set
   @results = eval($evalstring);
   die $@ if $@;
@@ -416,11 +498,15 @@
 
 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 );
@@ -444,17 +530,28 @@
     my $ident = $query->{criterias}->[0]->{val};
 #print "load obj", "\n";
     #return $self->createSet() if $ident == 5;
+    $self->{_COREHANDLE}->unload($ident);
     my $object = $self->{_COREHANDLE}->load($ident);
 #print "get id", "\n";
     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 = '';
@@ -489,20 +586,96 @@
 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});
-  undef($obj) if($options->{destroy});
-  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 {};
+
+  # deactivated way to get rid of used instances, if requested
+=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);
+
+  # old (unsuccessful) attempts to get rid of used instances, if requested
+
+    # V1:
+    #$options->{cb}->{destroy}->($obj);
+    #$self->{_COREHANDLE}->unload($obj);
+  
+    # V2:
+    #$obj->clear_refs;
+    #$self->{COREHANDLE}->unload($obj) if($options->{destroy});
+    #$obj->DESTROY;
+    #undef($obj) if($options->{destroy});
+  
+  return $hash;
 }
 
 sub getSchema {
@@ -514,4 +687,33 @@
   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__