--- nfo/perl/libs/Data/Storage/Handler/DBI.pm	2002/11/17 06:34:39	1.3
+++ nfo/perl/libs/Data/Storage/Handler/DBI.pm	2002/12/01 22:20:43	1.8
@@ -1,8 +1,24 @@
 #################################
 #
-#  $Id: DBI.pm,v 1.3 2002/11/17 06:34:39 joko Exp $
+#  $Id: DBI.pm,v 1.8 2002/12/01 22:20:43 joko Exp $
 #
 #  $Log: DBI.pm,v $
+#  Revision 1.8  2002/12/01 22:20:43  joko
+#  + sub createDb (from Storage.pm)
+#
+#  Revision 1.7  2002/12/01 07:09:09  joko
+#  + sub getListFiltered (dummy redirecting to getListUnfiltered)
+#
+#  Revision 1.6  2002/12/01 04:46:01  joko
+#  + sub eraseAll
+#
+#  Revision 1.5  2002/11/29 05:00:26  joko
+#  + sub getListUnfiltered
+#  + sub sendQuery
+#
+#  Revision 1.4  2002/11/17 08:46:42  jonen
+#  + wrapped eval around DBI->connect to prevent deaths
+#
 #  Revision 1.3  2002/11/17 06:34:39  joko
 #  + locator metadata can now be reached via ->{locator}
 #  - sub hash2sql now taken from libdb
@@ -26,15 +42,20 @@
 
 use DBI;
 use Data::Dumper;
-use libdb;
+use libdb qw( getDbNameByDsn hash2Sql );
+use Data::Storage::Result::DBI;
 
 # get logger instance
 my $logger = Log::Dispatch::Config->instance;
 
 
-our $metainfo = {
-  'disconnectMethod' => 'disconnect',
-};
+sub getMetaInfo {
+  my $self = shift;
+  $logger->debug( __PACKAGE__ . "->getMetaInfo()"  );
+  return {
+    'disconnectMethod' => 'disconnect',
+  };
+}
 
 sub connect {
 
@@ -52,11 +73,15 @@
         
         #use Data::Dumper; print Dumper($self->{dbi});
         
-        $self->{COREHANDLE} = DBI->connect( $dsn, '', '', $self->{locator}->{dbi} );
-        if (!$self->{COREHANDLE}) {
-          $logger->warning( __PACKAGE__ . "->connect failed: " . DBI::errstr );
-          return;
-        }
+        eval {
+          $self->{COREHANDLE} = DBI->connect( $dsn, '', '', $self->{locator}->{dbi} );
+          if (!$self->{COREHANDLE}) {
+            $logger->warning( __PACKAGE__ . "->connect failed: " . DBI::errstr );
+            return;
+          }
+        };
+        $logger->warning( __PACKAGE__ . "->connect failed: " . $@ ) if $@;
+
       }
       $self->configureCOREHANDLE();
 
@@ -72,7 +97,9 @@
 
   $logger->debug( __PACKAGE__ . "->configureCOREHANDLE" );
 
-  # apply configured modifications
+  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});
     }
@@ -113,61 +140,108 @@
 sub sendCommand {
   my $self = shift;
   my $command = shift;
+  # TODO: when tracing: yes, do actually log this
   #$logger->debug( __PACKAGE__ . "->sendCommand( command $command )" );
   my $cmdHandle = $self->_sendSql($command);
   my $result = Data::Storage::Result::DBI->new( RESULTHANDLE => $cmdHandle );
   return $result;
 }
 
-sub quoteSql {
-  my $self = shift;
-  my $string = shift;
-  if ($string) {
-    $string =~ s/'/\\'/g;
-  }
-  return $string;
-}
-
-
 sub getChildNodes {
-
   my $self = shift;
   my @nodes;
-
   $logger->debug( __PACKAGE__ . "->getChildNodes()" );
-
   if (my $result = $self->sendCommand( 'SHOW TABLES;' ) ) {
     my $dbname = getDbNameByDsn($self->{locator}->{dbi}->{dsn});
     my $key = "Tables_in_$dbname";
-    while ( my $row = $result->_getNextEntry() ) {
+    while ( my $row = $result->getNextEntry() ) {
       push @nodes, $row->{$key};
     }
   }
-  
   return \@nodes;
+}
 
+sub getListUnfiltered {
+  my $self = shift;
+  my $nodename = shift;
+  my @list;
+  $logger->debug( __PACKAGE__ . "->getListUnfiltered( nodename => '" . $nodename . "' )" );
+  # get list of rows from rdbms by table name
+  my $result = $self->sendCommand("SELECT * FROM $nodename");
+  while ( my $row = $result->getNextEntry() ) {
+    push @list, $row;
+  }
+  return \@list;
 }
 
+sub sendQuery {
+  my $self = shift;
+  my $query = shift;
+  #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;
+  foreach (@{$query->{criterias}}) {
+    my $op = '';
+    $op = '=' if lc $_->{op} eq 'eq';
+    push @crits, "$_->{key}$op'$_->{val}'";
+  }
+  my $subnodes = {};
+  map { $subnodes->{$_}++ } @{$query->{subnodes}};
+  # HACK: this is hardcoded ;(    expand possibilities!
+  my $crit = join(' AND ', @crits);
+  my $sql = hash2Sql($query->{node}, $subnodes, 'SELECT', $crit);
+  return $self->sendCommand($sql);
+}
 
+sub eraseAll {
+  my $self = shift;
+  my $classname = shift;
+  my $sql = "DELETE FROM $classname";
+  $self->sendCommand($sql);
+}
 
+# TODO: actually implement the filtering functionality using $this->sendQuery
+sub getListFiltered {
+  my $self = shift;
+  my $nodename = shift;
+  return $self->getListUnfiltered($nodename);
+}
 
-package Data::Storage::Result::DBI;
+# TODO: do this via a parametrized "$self->connect(<connect just to database server - don't select database>)"
+sub createDb {
+  
+  my $self = shift;
+  
+  # get dsn from Data::Storage::Locator instance
+  my $dsn = $self->{locator}->{dbi}->{dsn};
 
-use strict;
-use warnings;
+  $logger->debug( __PACKAGE__ .  "->createDb( dsn $dsn )" );
+
+  # remove database setting from dsn-string
+  $dsn =~ s/database=(.+?);//;
+  
+  # remember extracted database name to know what actually to create right now
+  my $database_name = $1;
 
-use base ("Data::Storage::Result");
+  # flag to indicate goodness
+  my $ok;
+  
+  # connect to database server - don't select/use any specific database
+  #if ( my $dbh = DBI->connect($dsn, '', '', { PrintError => 0 } ) ) {
+  if ( my $dbh = DBI->connect($dsn, '', '', $self->{locator}->{dbi} ) ) {
+
+    if ($database_name) {
+      if ($dbh->do("CREATE DATABASE $database_name")) {
+        $ok = 1;
+      }
+    }
 
-sub DESTROY {
-  my $self = shift;
-  #$logger->debug( __PACKAGE__ . "->" . "DESTROY" );
-  $self->{RESULTHANDLE} && $self->{RESULTHANDLE}->finish();
-}
+    $dbh->disconnect();
 
-sub _getNextEntry {
-  my $self = shift;
-  $self->{RESULTHANDLE} && return $self->{RESULTHANDLE}->fetchrow_hashref;
+  }
+  
+  return $ok;
+  
 }
 
-
-1;
\ No newline at end of file
+1;