--- 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/04/08 22:52:22	1.32
@@ -1,8 +1,24 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.27 2003/01/31 06:30:59 joko Exp $
+#  $Id: Tangram.pm,v 1.32 2003/04/08 22:52:22 joko Exp $
 #
 #  $Log: Tangram.pm,v $
+#  Revision 1.32  2003/04/08 22:52:22  joko
+#  modified 'querySchema': better behaviour regarding filtering result
+#
+#  Revision 1.31  2003/04/05 21:24:09  joko
+#  modified 'sub getChildNodes': now contains code from 'querySchema'
+#
+#  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'
 #
@@ -41,7 +57,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 +130,14 @@
 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::Mungle::Compare::Struct qw( isEmpty );
+use Data::Mungle::Transform::Deep qw( expand );
 
 # get logger instance
 my $logger = Log::Dispatch::Config->instance;
@@ -220,33 +237,64 @@
 sub getChildNodes {
 
   my $self = shift;
-  my @nodes;
+  my $mode = shift;
+  my $filter = shift;
+  
+  $mode ||= 'core';
+  $filter ||= 'all';
+  
+  $logger->debug( __PACKAGE__ . "->getChildNodes($mode)" );
 
-  $logger->debug( __PACKAGE__ . "->getChildNodes()" );
+  if ($mode eq 'core') {
 
-  # create new DBI - Data::Storage - object from already connected DBI::db - handle inside the current COREHANDLE
-  #my $loc = new Data::Storage::Locator( type => "DBI", dbi => { db => $self->{COREHANDLE}->{db} });
-  #my $loc = new Data::Storage::Locator( type => "DBI", COREHANDLE => $self->{COREHANDLE}->{db} );
-  
-  # todo: should we retrieve information from the schema here
-  # rather than poorly getting table names from underlying dbi?
-  my $storage = $self->_getSubLayerHandle();
-  @nodes = @{$storage->getChildNodes()};
-  #$storage->_configureCOREHANDLE();
-#print "getchildnodes\n";
-#print Dumper($self);
-  #if (my $result = $self->sendCommand( 'SHOW TABLES;' ) ) {
+    my @nodes;
+    
+    # create new DBI - Data::Storage - object from already connected DBI::db - handle inside the current COREHANDLE
+    #my $loc = new Data::Storage::Locator( type => "DBI", dbi => { db => $self->{COREHANDLE}->{db} });
+    #my $loc = new Data::Storage::Locator( type => "DBI", COREHANDLE => $self->{COREHANDLE}->{db} );
+    
+    # todo: should we retrieve information from the schema here
+    # rather than poorly getting table names from underlying dbi?
+    my $storage = $self->_getSubLayerHandle();
+    @nodes = @{$storage->getChildNodes()};
+    #$storage->_configureCOREHANDLE();
+  #print "getchildnodes\n";
+  #print Dumper($self);
+    #if (my $result = $self->sendCommand( 'SHOW TABLES;' ) ) {
+    
+    # TODO: REVIEW
+    #$storage->disconnect();
+    
+    $self->{meta}->{childnodes} = \@nodes;
+
+    return \@nodes;
   
-  # TODO: REVIEW
-  #$storage->disconnect();
+  } elsif ($mode eq 'root') {
+    
+    # FIXME: this will return *all* known classes to 'Class::Tangram',
+    # which might not be what you expect since more than one instance
+    # of Tangram may be in memory and Class::Tangram seems to 
+    # offer no methods to determine this or filter its result(s) according
+    # to a specific database.
+    my @object_names = Class::Tangram::known_classes();
+    my @concret_names;
+    my $o_cnt;
+    foreach (sort @object_names) {
+      push @concret_names, $_  if (!Class::Tangram::class_is_abstract($_));
+      $o_cnt++;
+    }
+
+    if ($filter eq 'all') {
+      return \@object_names;
+    } elsif ($filter eq 'concrete') {
+      return \@concret_names;
+    }
   
-  $self->{meta}->{childnodes} = \@nodes;
+  }
   
-  return \@nodes;
 
 }
 
-
 sub testIntegrity {
 
   my $self = shift;
@@ -512,7 +560,7 @@
 
   # HACK: special case: querying by id does not translate into a common tangram query
   # just load the object by given id(ent)
-  if ($query->{criterias}->[0]->{key} eq 'id' && $query->{criterias}->[0]->{op} eq 'eq') {
+  if ($query->{criterias} && ($query->{criterias}->[0]->{key} eq 'id' && $query->{criterias}->[0]->{op} eq 'eq')) {
     #print "LOAD!!!", "\n";
     #exit;
     #return Set::Object->new( $self->{COREHANDLE}->load($query->{criterias}->[0]->{val}) );
@@ -636,27 +684,29 @@
   # 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);
-    };
-  }
+    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});
+  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);
   
-  # old (wrong) attempts to get rid of used instances, if requested
+    # V2:
     #$obj->clear_refs;
     #$self->{COREHANDLE}->unload($obj) if($options->{destroy});
     #$obj->DESTROY;
@@ -686,5 +736,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__