--- nfo/perl/libs/libdb.pm	2002/07/20 11:09:58	1.2
+++ nfo/perl/libs/libdb.pm	2002/11/17 07:18:38	1.5
@@ -1,7 +1,16 @@
 ##    --------------------------------------------------------------------------------
-##    $Id: libdb.pm,v 1.2 2002/07/20 11:09:58 cvsjoko Exp $
+##    $Id: libdb.pm,v 1.5 2002/11/17 07:18:38 joko Exp $
 ##    --------------------------------------------------------------------------------
 ##    $Log: libdb.pm,v $
+##    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
@@ -29,7 +38,7 @@
                               dbNow
                               getDbNameByDsn sqlDbAction createSqlDb dropSqlDb
                               quotesql
-                              testDsnForTables
+                              testDsnForTables testDbServer
                               );
 
 use constant SQL_INSERT => 10;
@@ -48,6 +57,21 @@
   }
 }
 
+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;
+  }
+}
+
 sub hash2Sql {
   
   my $table = shift;
@@ -56,10 +80,10 @@
   my $crit = shift;
   
   my $sql;
-  if ($mode == SQL_INSERT) {
+  if ($mode eq 'SQL_INSERT' || $mode == SQL_INSERT) {
     $sql = "INSERT INTO $table (#fields#) VALUES (#values#);";
   }
-  if ($mode == SQL_UPDATE) {
+  if ($mode eq 'SQL_UPDATE' || $mode == SQL_UPDATE) {
     $sql = "UPDATE $table SET #fields-values# WHERE $crit;";
   }
   
@@ -141,9 +165,10 @@
     return 0;
   }
   if (my $result = $dbmeta_ref->{dbh}->prepare($sql)) {
-    if ($result->execute()) {
+    #if ($result->execute()) {
+      $result->execute();
       return $result;
-    }
+    #}
   }
 }
 
@@ -173,8 +198,10 @@
   my $bool_ok;
   if (connectTarget($dbmeta)) {
     sendSql($sql);
-    #print "state: ", $dbmeta->{dbh}->errstr, "\n";
-    $bool_ok = ($dbmeta->{dbh} && $dbmeta->{dbh}->state && !$dbmeta->{dbh}->err);
+    #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;
@@ -187,11 +214,12 @@
   my $sql;
   $sql = "CREATE DATABASE $dbname;";
   if ( sqlDbAction($dsn, $sql) ) {
-    print "ok";
+    print "ok", "\n";
+    return 1;
   } else {
-    print "failed";
+    print "failed", "\n";
+    return 0;
   }
-  print "\n";
 }
 
 sub dropSqlDb {
@@ -205,7 +233,9 @@
 
 sub quotesql {
   my $string = shift;
-  $string =~ s/'/\\'/g;
+  if ($string) {
+    $string =~ s/'/\\'/g;
+  }
   return $string;
 }
 
@@ -219,4 +249,4 @@
   return 1 if ($bool_tablesHere);
 }
 
-1;
\ No newline at end of file
+1;