--- nfo/perl/libs/libdb.pm	2002/10/16 22:36:42	1.4
+++ nfo/perl/libs/libdb.pm	2003/02/09 04:47:58	1.9
@@ -1,7 +1,22 @@
 ##    --------------------------------------------------------------------------------
-##    $Id: libdb.pm,v 1.4 2002/10/16 22:36:42 joko Exp $
+##    $Id: libdb.pm,v 1.9 2003/02/09 04:47:58 joko Exp $
 ##    --------------------------------------------------------------------------------
 ##    $Log: libdb.pm,v $
+##    Revision 1.9  2003/02/09 04:47:58  joko
+##    + minor fix
+##
+##    Revision 1.8  2002/12/12 02:48:58  joko
+##    + played with fixing disconnectTarget
+##
+##    Revision 1.7  2002/12/01 22:13:17  joko
+##    + minor bugfix?
+##
+##    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
 ##
@@ -23,12 +38,9 @@
 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
@@ -38,8 +50,14 @@
                               testDsnForTables testDbServer
                               );
 
+
+use Carp;
+use DBI;
+use Data::Dumper;
+
 use constant SQL_INSERT => 10;
 use constant SQL_UPDATE => 11;
+use constant SQL_SELECT => 12;
 
 my $dbmeta_ref_cache;
 
@@ -69,6 +87,8 @@
   }
 }
 
+
+# TODO: handle usage of "$crit" in an abstract way somehow
 sub hash2Sql {
   
   my $table = shift;
@@ -77,11 +97,16 @@
   my $crit = shift;
   
   my $sql;
-  if ($mode == SQL_INSERT || $mode eq 'SQL_INSERT') {
-    $sql = "INSERT INTO $table (#fields#) VALUES (#values#);";
-  }
-  if ($mode == SQL_UPDATE || $mode eq '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);
@@ -142,11 +167,16 @@
 
 sub disconnectTarget {
   #my $dbmeta = shift;
+  #print "disc\n";
   #croak "please supply a \"dbmeta\"-hash" if (!$dbmeta);
   #$dbmeta = patch_dbmeta($dbmeta);
   #$dbmeta->{dbh} && $dbmeta->{dbh}->disconnect();
   my $dbmeta = $dbmeta_ref_cache;
-  $dbmeta->{dbh} && $dbmeta->{dbh}->disconnect();
+  #print Dumper($dbmeta);
+  #$dbmeta->{dbh} && $dbmeta->{dbh}->disconnect();
+  $dbmeta->{dbh}->disconnect();
+  undef($dbmeta->{dbh});
+  undef($dbmeta);
   undef($dbmeta_ref_cache);
 }