--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/18 22:28:16	1.22
+++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2003/01/31 06:30:59	1.27
@@ -1,8 +1,23 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.22 2002/12/18 22:28:16 jonen Exp $
+#  $Id: Tangram.pm,v 1.27 2003/01/31 06:30:59 joko Exp $
 #
 #  $Log: Tangram.pm,v $
+#  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()'
 #
@@ -101,13 +116,12 @@
 
 use Tangram;
 use Data::Dumper;
-use libp qw( getNewPerlObjectByPkgName );
+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 );
 
-
 # get logger instance
 my $logger = Log::Dispatch::Config->instance;
 
@@ -127,7 +141,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) {
@@ -160,8 +175,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 );
@@ -173,7 +192,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 );
@@ -300,6 +320,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}) {
@@ -365,9 +387,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
@@ -407,7 +429,7 @@
   my @results;
   $logger->debug( __PACKAGE__ . "->getListFiltered( nodename => '" . $nodename . "' )" );
 
-  #print Dumper($filters);
+#print Dumper($filters);
   
   my @tfilters;
   
@@ -446,6 +468,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 $@;
@@ -505,10 +529,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 = '';
@@ -642,4 +674,17 @@
   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();
+}
+
 1;
+__END__