--- 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/01/19 02:30:05	1.25
@@ -1,8 +1,23 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.20 2002/12/16 20:49:17 jonen Exp $
+#  $Id: Tangram.pm,v 1.25 2003/01/19 02:30:05 joko Exp $
 #
 #  $Log: Tangram.pm,v $
+#  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()'
@@ -154,8 +169,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 +186,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 );
@@ -359,9 +379,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
@@ -560,6 +580,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 +589,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;
   }
   
 }
@@ -634,4 +656,10 @@
   return $self->{_COREHANDLE};
 }
 
+sub dropDb {
+  my $self = shift;
+  my $storage = $self->_getSubLayerHandle();
+  return $storage->dropDb();
+}
+
 1;