--- nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/04 11:34:49	1.12
+++ nfo/perl/libs/Data/Storage/Handler/Tangram.pm	2002/12/05 07:59:04	1.13
@@ -1,8 +1,13 @@
 ############################################
 #
-#  $Id: Tangram.pm,v 1.12 2002/12/04 11:34:49 joko Exp $
+#  $Id: Tangram.pm,v 1.13 2002/12/05 07:59:04 joko Exp $
 #
 #  $Log: Tangram.pm,v $
+#  Revision 1.13  2002/12/05 07:59:04  joko
+#  + now using Tie::SecureHash as a base for the COREHANDLE
+#  + former public COREHANDLE becomes private _COREHANDLE now
+#  + sub getCOREHANDLE
+#
 #  Revision 1.12  2002/12/04 11:34:49  joko
 #  - $schema_tangram doesn't have to be in class?
 #
@@ -62,6 +67,7 @@
 use strict;
 use warnings;
 
+use base ("Data::Storage::Handler");
 use base ("Data::Storage::Handler::Abstract");
 
 use Tangram;
@@ -124,7 +130,11 @@
 
     # create the main tangram storage object
     #$self->{COREHANDLE} = Tangram::Relational->connect( $schema, $dsn );
-    $self->{COREHANDLE} = Tangram::Relational->connect( $schema_tangram, $dsn );
+    $self->{_COREHANDLE} = Tangram::Relational->connect( $schema_tangram, $dsn );
+
+#print "connect", "\n";
+#my $core = $self->{_COREHANDLE};
+#print Dumper($core);
   
     # some attempts for configuring the wrapped underlying dbi.....
     #$self->{STORAGEHANDLE_UNDERLYING} = $self->getUnderlyingStorage();
@@ -230,7 +240,7 @@
   foreach my $key (keys %{$self->{dbi}}) {
     my $val = $self->{dbi}->{$key};
     print "entry: $key; $val", "\n";
-    $self->{COREHANDLE}->{db}->{$key} = $val;
+    $self->{_COREHANDLE}->{db}->{$key} = $val;
   }
   #print Dumper($self->{COREHANDLE}->{db});
 }
@@ -246,16 +256,16 @@
 
   # apply configured modifications
     if (exists $self->{dbi}->{trace_level} && exists $self->{dbi}->{trace_file}) {
-      $self->{COREHANDLE}->{db}->trace($self->{dbi}->{trace_level}, $self->{dbi}->{trace_file});
+      $self->{_COREHANDLE}->{db}->trace($self->{dbi}->{trace_level}, $self->{dbi}->{trace_file});
     }
     if (exists $self->{dbi}->{RaiseError}) {
-      $self->{COREHANDLE}->{db}->{RaiseError} = $self->{dbi}->{RaiseError};
+      $self->{_COREHANDLE}->{db}->{RaiseError} = $self->{dbi}->{RaiseError};
     }
     if (exists $self->{dbi}->{PrintError}) {
-      $self->{COREHANDLE}->{db}->{PrintError} = $self->{dbi}->{PrintError};
+      $self->{_COREHANDLE}->{db}->{PrintError} = $self->{dbi}->{PrintError};
     }
     if (exists $self->{dbi}->{HandleError}) {
-      $self->{COREHANDLE}->{db}->{HandleError} = $self->{dbi}->{HandleError};
+      $self->{_COREHANDLE}->{db}->{HandleError} = $self->{dbi}->{HandleError};
     }
 
 }
@@ -334,8 +344,8 @@
   my @results;
   $logger->debug( __PACKAGE__ . "->getListUnfiltered( nodename => '" . $nodename . "' )" );
   # get set of objects from odbms by object name
-  my $object_set = $self->{COREHANDLE}->remote($nodename);
-  @results = $self->{COREHANDLE}->select($object_set);
+  my $object_set = $self->{_COREHANDLE}->remote($nodename);
+  @results = $self->{_COREHANDLE}->select($object_set);
   return \@results;
 }
 
@@ -380,14 +390,14 @@
   my $tfilter = join(' & ', @tfilters);
 
   # get set of objects from odbms by object name
-  my $remote = $self->{COREHANDLE}->remote($nodename);
+  my $remote = $self->{_COREHANDLE}->remote($nodename);
   
   # was:
   #@results = $self->{COREHANDLE}->select($object_set, $tfilter);
 
   # is:
   # HACK: build eval-string (sorry) to get filtered list - please give advice here
-  my $evalstring = 'return $self->{COREHANDLE}->select($remote, ' . $tfilter . ');';
+  my $evalstring = 'return $self->{_COREHANDLE}->select($remote, ' . $tfilter . ');';
   
   # get filtered list/set
   @results = eval($evalstring);
@@ -399,7 +409,7 @@
 sub createCursor {
   my $self = shift;
   my $node = shift;
-  my $cmdHandle = $self->{COREHANDLE}->cursor($node);
+  my $cmdHandle = $self->{_COREHANDLE}->cursor($node);
   my $result = Data::Storage::Result::Tangram->new( RESULTHANDLE => $cmdHandle );
   return $result;
 }
@@ -434,9 +444,9 @@
     my $ident = $query->{criterias}->[0]->{val};
 #print "load obj", "\n";
     #return $self->createSet() if $ident == 5;
-    my $object = $self->{COREHANDLE}->load($ident);
+    my $object = $self->{_COREHANDLE}->load($ident);
 #print "get id", "\n";
-    my $oid = $self->{COREHANDLE}->id($object);
+    my $oid = $self->{_COREHANDLE}->id($object);
     return $self->createSet($object);
     #return $self->createSet( $self->{COREHANDLE}->load('300090018') );
   }
@@ -465,9 +475,9 @@
 sub eraseAll {
   my $self = shift;
   my $classname = shift;
-  my $remote = $self->{COREHANDLE}->remote($classname);
-  my @objs = $self->{COREHANDLE}->select($remote);
-  $self->{COREHANDLE}->erase(@objs);
+  my $remote = $self->{_COREHANDLE}->remote($classname);
+  my @objs = $self->{_COREHANDLE}->select($remote);
+  $self->{_COREHANDLE}->erase(@objs);
 }
 
 sub createDb {
@@ -481,7 +491,7 @@
   my $oid = shift;
   # TODO: review this
   #if (!$self->{COREHANDLE}) { return; }
-  return $self->{COREHANDLE}->load($oid);
+  return $self->{_COREHANDLE}->load($oid);
 }
 
 sub getObjectAsHash {
@@ -499,4 +509,9 @@
   return $schema_tangram;
 }
 
+sub getCOREHANDLE {
+  my $self = shift;
+  return $self->{_COREHANDLE};
+}
+
 1;