--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/16 20:49:17	1.20
+++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2003/04/05 21:24:09	1.31
@@ -1,8 +1,42 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.20 2002/12/16 20:49:17 jonen Exp $
+#  $Id: Tangram.pm,v 1.31 2003/04/05 21:24:09 joko Exp $
 #
 #  $Log: Tangram.pm,v $
+#  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'
+#
+#  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()'
@@ -20,7 +54,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
@@ -93,14 +127,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( object2hash );
-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;
@@ -121,7 +155,8 @@
   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) {
@@ -154,8 +189,12 @@
     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 );
@@ -167,7 +206,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 );
@@ -194,33 +234,61 @@
 sub getChildNodes {
 
   my $self = shift;
-  my @nodes;
+  my $mode = shift;
+  $mode ||= 'core';
+  
+  $logger->debug( __PACKAGE__ . "->getChildNodes($mode)" );
 
-  $logger->debug( __PACKAGE__ . "->getChildNodes()" );
+  if ($mode eq 'core') {
+
+    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;
 
-  # 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} );
+    return \@nodes;
   
-  # 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;' ) ) {
+  } 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++;
+    }
   
-  # TODO: REVIEW
-  #$storage->disconnect();
+    my $result = {
+      all => \@object_names,
+      concrete => \@concret_names,
+    };
+    return $result;
   
-  $self->{meta}->{childnodes} = \@nodes;
+  }
   
-  return \@nodes;
 
 }
 
-
 sub testIntegrity {
 
   my $self = shift;
@@ -294,6 +362,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}) {
@@ -359,9 +429,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
@@ -401,7 +471,7 @@
   my @results;
   $logger->debug( __PACKAGE__ . "->getListFiltered( nodename => '" . $nodename . "' )" );
 
-  #print Dumper($filters);
+#print Dumper($filters);
   
   my @tfilters;
   
@@ -440,6 +510,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 $@;
@@ -499,10 +571,18 @@
     #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 = '';
@@ -560,6 +640,7 @@
   
   # 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;
   }
   
@@ -568,15 +649,16 @@
   $self->{_COREHANDLE}->unload() if ($options->{destroy});
 
   # search for object with given Classname and Guid
-  my $obj_tmp = $self->{_COREHANDLE}->remote($classname);
+  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 it think we can trust there would be only one result
+  # so I think we can trust there would be only one result
   if($result[0]) {
     return $result[0];
   } else {
-    return "No Object with Classname $classname and GUID $options->{guid} found!";
+    $logger->error( __PACKAGE__ . "->getObjectByGuid: No Object with Classname $options->{classname} and GUID $guid found!" );
+    return;
   }
   
 }
@@ -596,27 +678,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;
@@ -634,4 +718,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__