--- nfo/perl/libs/libdb.pm	2002/07/19 18:14:03	1.1
+++ nfo/perl/libs/libdb.pm	2002/11/29 04:53:39	1.6
@@ -1,7 +1,23 @@
 ##    --------------------------------------------------------------------------------
-##    $Id: libdb.pm,v 1.1 2002/07/19 18:14:03 cvsjoko Exp $
+##    $Id: libdb.pm,v 1.6 2002/11/29 04:53:39 joko Exp $
 ##    --------------------------------------------------------------------------------
 ##    $Log: libdb.pm,v $
+##    Revision 1.6  2002/11/29 04:53:39  joko
+##    + hash2Sql now knows about SQL_SELECT
+##
+##    Revision 1.5  2002/11/17 07:18:38  joko
+##    + small modification in hash2sql
+##
+##    Revision 1.4  2002/10/16 22:36:42  joko
+##    + sub testDbServer
+##
+##    Revision 1.3  2002/07/27 00:28:20  cvsjoko
+##    bugfixes
+##
+##    Revision 1.2  2002/07/20 11:09:58  cvsjoko
+##    + bugfixes
+##    + dont' print sql-errors
+##
 ##    Revision 1.1  2002/07/19 18:14:03  cvsjoko
 ##    no message
 ##
@@ -13,23 +29,25 @@
 use strict;
 use warnings;
 
-use libp;
-use DBI;
-
 require Exporter;
 our @ISA = qw( Exporter );
-our @EXPORT = qw( 
+our @EXPORT_OK = qw( 
                               testDsn hash2Sql 
                               SQL_INSERT SQL_UPDATE
                               connectTarget disconnectTarget sendSql
                               dbNow
                               getDbNameByDsn sqlDbAction createSqlDb dropSqlDb
                               quotesql
-                              testDsnForTables
+                              testDsnForTables testDbServer
                               );
 
+
+use libp qw( croak );
+use DBI;
+
 use constant SQL_INSERT => 10;
 use constant SQL_UPDATE => 11;
+use constant SQL_SELECT => 12;
 
 my $dbmeta_ref_cache;
 
@@ -44,6 +62,23 @@
   }
 }
 
+sub testDbServer {
+  my $dsn = shift;
+  $dsn =~ s/database=(\w+)//;
+  
+  #print "testDbServer: $dsn", "\n";
+  
+  my $result;
+  if ( my $dbh = DBI->connect($dsn, '', '', {
+                                                      PrintError => 0,
+                                                      } ) ) {
+    $dbh->disconnect();
+    return 1;
+  }
+}
+
+
+# TODO: handle usage of "$crit" in an abstract way somehow
 sub hash2Sql {
   
   my $table = shift;
@@ -52,11 +87,16 @@
   my $crit = shift;
   
   my $sql;
-  if ($mode == SQL_INSERT) {
-    $sql = "INSERT INTO $table (#fields#) VALUES (#values#);";
-  }
-  if ($mode == SQL_UPDATE) {
-    $sql = "UPDATE $table SET #fields-values# WHERE $crit;";
+  $mode = SQL_SELECT if ($mode eq 'SQL_SELECT' || $mode eq 'SELECT');
+  $mode = SQL_INSERT if ($mode eq 'SQL_INSERT' || $mode eq 'INSERT');
+  $mode = SQL_UPDATE if ($mode eq 'SQL_UPDATE' || $mode eq 'UPDATE');
+
+  if ($mode == SQL_SELECT) {
+    $sql = "SELECT #fields# FROM $table WHERE $crit";
+  } elsif ($mode == SQL_INSERT) {
+    $sql = "INSERT INTO $table (#fields#) VALUES (#values#)";
+  } elsif ($mode == SQL_UPDATE) {
+    $sql = "UPDATE $table SET #fields-values# WHERE $crit";
   }
   
   my (@fields, @values);
@@ -105,11 +145,12 @@
   croak "please supply a dsn or a \"dbmeta\"-hash" if (!$dbmeta);
   $dbmeta = patch_dbmeta($dbmeta);
   if (!$dbmeta->{connected}) {
-    if ($dbmeta->{dbh} = DBI->connect($dbmeta->{dsn})) {
+    if ($dbmeta->{dbh} = DBI->connect($dbmeta->{dsn}, '', '', { PrintError => 0 } )) {
       $dbmeta->{dbh}->trace($dbmeta->{trace_level}, $dbmeta->{trace_file});
       $dbmeta->{dbh}->{PrintError} = 0;
       $dbmeta->{connected} = 1;
       $dbmeta_ref_cache = $dbmeta;
+      return 1;
     }
   }
 }
@@ -136,9 +177,10 @@
     return 0;
   }
   if (my $result = $dbmeta_ref->{dbh}->prepare($sql)) {
-    if ($result->execute()) {
+    #if ($result->execute()) {
+      $result->execute();
       return $result;
-    }
+    #}
   }
 }
 
@@ -165,19 +207,33 @@
     trace_level => 1,
     trace_file => 'dbitrace',
   };
-  connectTarget($dbmeta);
-  sendSql($sql);
-  disconnectTarget($dbmeta);
+  my $bool_ok;
+  if (connectTarget($dbmeta)) {
+    sendSql($sql);
+    #print "state: ", $dbmeta->{dbh}->state, "\n";
+    #print "err    ", $dbmeta->{dbh}->err, "\n";
+    #$bool_ok = ($dbmeta->{dbh} && $dbmeta->{dbh}->state && !$dbmeta->{dbh}->err);
+    $bool_ok = ($dbmeta->{dbh} && !$dbmeta->{dbh}->err);
+    disconnectTarget($dbmeta);
+  }
+  return $bool_ok;
 }
 
 sub createSqlDb {
   my $dsn = shift;
   my $dbname = getDbNameByDsn($dsn);
-  print "  - creating database $dbname", "\n";
+  print "  - creating rdbms-database $dbname ($dsn) ...";
   my $sql;
   $sql = "CREATE DATABASE $dbname;";
-  sqlDbAction($dsn, $sql);
+  if ( sqlDbAction($dsn, $sql) ) {
+    print "ok", "\n";
+    return 1;
+  } else {
+    print "failed", "\n";
+    return 0;
+  }
 }
+
 sub dropSqlDb {
   my $dsn = shift;
   my $dbname = getDbNameByDsn($dsn);
@@ -189,7 +245,9 @@
 
 sub quotesql {
   my $string = shift;
-  $string =~ s/'/\\'/g;
+  if ($string) {
+    $string =~ s/'/\\'/g;
+  }
   return $string;
 }
 
@@ -203,4 +261,4 @@
   return 1 if ($bool_tablesHere);
 }
 
-1;
\ No newline at end of file
+1;