--- nfo/perl/libs/Data/Storage/Handler/DBI.pm	2002/12/01 22:20:43	1.8
+++ nfo/perl/libs/Data/Storage/Handler/DBI.pm	2002/12/15 02:02:22	1.10
@@ -1,8 +1,15 @@
 #################################
 #
-#  $Id: DBI.pm,v 1.8 2002/12/01 22:20:43 joko Exp $
+#  $Id: DBI.pm,v 1.10 2002/12/15 02:02:22 joko Exp $
 #
 #  $Log: DBI.pm,v $
+#  Revision 1.10  2002/12/15 02:02:22  joko
+#  + fixed logging-message
+#
+#  Revision 1.9  2002/12/05 07:58:20  joko
+#  + now using Tie::SecureHash as a base for the COREHANDLE
+#  + former public COREHANDLE becomes private _COREHANDLE now
+#
 #  Revision 1.8  2002/12/01 22:20:43  joko
 #  + sub createDb (from Storage.pm)
 #
@@ -74,8 +81,8 @@
         #use Data::Dumper; print Dumper($self->{dbi});
         
         eval {
-          $self->{COREHANDLE} = DBI->connect( $dsn, '', '', $self->{locator}->{dbi} );
-          if (!$self->{COREHANDLE}) {
+          $self->{_COREHANDLE} = DBI->connect( $dsn, '', '', $self->{locator}->{dbi} );
+          if (!$self->{_COREHANDLE}) {
             $logger->warning( __PACKAGE__ . "->connect failed: " . DBI::errstr );
             return;
           }
@@ -97,20 +104,20 @@
 
   $logger->debug( __PACKAGE__ . "->configureCOREHANDLE" );
 
-  return if !$self->{COREHANDLE};
+  return if !$self->{_COREHANDLE};
 
   # apply configured modifications to DBI-handle
     if (exists $self->{locator}->{dbi}->{trace_level} && exists $self->{locator}->{dbi}->{trace_file}) {
-      $self->{COREHANDLE}->trace($self->{locator}->{dbi}->{trace_level}, $self->{locator}->{dbi}->{trace_file});
+      $self->{_COREHANDLE}->trace($self->{locator}->{dbi}->{trace_level}, $self->{locator}->{dbi}->{trace_file});
     }
     if (exists $self->{locator}->{dbi}->{RaiseError}) {
-      $self->{COREHANDLE}->{RaiseError} = $self->{locator}->{dbi}->{RaiseError};
+      $self->{_COREHANDLE}->{RaiseError} = $self->{locator}->{dbi}->{RaiseError};
     }
     if (exists $self->{locator}->{dbi}->{PrintError}) {
-      $self->{COREHANDLE}->{PrintError} = $self->{locator}->{dbi}->{PrintError};
+      $self->{_COREHANDLE}->{PrintError} = $self->{locator}->{dbi}->{PrintError};
     }
     if (exists $self->{locator}->{dbi}->{HandleError}) {
-      $self->{COREHANDLE}->{HandleError} = $self->{locator}->{dbi}->{HandleError};
+      $self->{_COREHANDLE}->{HandleError} = $self->{locator}->{dbi}->{HandleError};
     }
 
 }
@@ -121,18 +128,18 @@
   
   # two-level handling for implicit connect:
   # if there's no corehandle ...
-  if (!$self->{COREHANDLE}) {
+  if (!$self->{_COREHANDLE}) {
     # ... try to connect, but ...
     $self->connect();
     # ... if this still fails, there's something wrong probably, so we won't continue
-    if (!$self->{COREHANDLE}) {
+    if (!$self->{_COREHANDLE}) {
       return;
     }
   }
   
   #print "prepare sql: $sql\n";
   
-  my $sth = $self->{COREHANDLE}->prepare($sql);
+  my $sth = $self->{_COREHANDLE}->prepare($sql);
   $sth->execute();
   return $sth;
 }
@@ -151,6 +158,8 @@
   my $self = shift;
   my @nodes;
   $logger->debug( __PACKAGE__ . "->getChildNodes()" );
+  my $locator = $self->{locator};
+  #print Dumper($locator); exit;
   if (my $result = $self->sendCommand( 'SHOW TABLES;' ) ) {
     my $dbname = getDbNameByDsn($self->{locator}->{dbi}->{dsn});
     my $key = "Tables_in_$dbname";
@@ -177,6 +186,9 @@
 sub sendQuery {
   my $self = shift;
   my $query = shift;
+
+  $logger->debug( __PACKAGE__ . "->sendQuery" );
+
   #my $sql = "SELECT cs FROM $self->{metainfo}->{$descent}->{node} WHERE $self->{metainfo}->{$descent}->{IdentProvider}->{arg}='$self->{entry}->{source}->{ident}';";
   #my $result = $self->{metainfo}->{$descent}->{storage}->sendCommand($sql);
   my @crits;
@@ -196,6 +208,7 @@
 sub eraseAll {
   my $self = shift;
   my $classname = shift;
+  $logger->debug( __PACKAGE__ . "->eraseAll" );
   my $sql = "DELETE FROM $classname";
   $self->sendCommand($sql);
 }
@@ -244,4 +257,9 @@
   
 }
 
+sub getCOREHANDLE2 {
+  my $self = shift;
+  return $self->{_COREHANDLE};
+}
+
 1;