--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/12 02:51:09	1.17
+++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2003/01/19 02:30:05	1.25
@@ -1,8 +1,33 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.17 2002/12/12 02:51:09 joko 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()'
+#
+#  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
 #
@@ -118,16 +143,38 @@
     $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 );
@@ -139,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 );
@@ -331,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
@@ -429,11 +477,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 );
@@ -457,9 +509,12 @@
     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') );
   }
@@ -518,11 +573,47 @@
   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, $options);
+  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!
@@ -565,4 +656,10 @@
   return $self->{_COREHANDLE};
 }
 
+sub dropDb {
+  my $self = shift;
+  my $storage = $self->_getSubLayerHandle();
+  return $storage->dropDb();
+}
+
 1;