- news: latest: use $who instead of $::who - need a standard!

[infobot.git] / src / db_mysql.pl

diff --git a/src/db_mysql.pl b/src/db_mysql.pl
index 4c31e5a9f7e41e3b171616c116940f9b3e9a7e6f..1e97faa08ff057b1a08296db7683f1d1014fd0de 100644 (file)
--- a/src/db_mysql.pl
+++ b/src/db_mysql.pl
@@ -46,6 +46,11 @@ sub dbGet {
     my $query   = "SELECT $select FROM $table";
     $query     .= " WHERE $where" if ($where);
 
+    if (!defined $select) {
+       &WARN("dbGet: select == NULL. table => $table");
+       return;
+    }
+
     my $sth;
     if (!($sth = $dbh->prepare($query))) {
        &ERROR("Get: prepare: $DBI::errstr");
@@ -73,12 +78,15 @@ sub dbGet {
 }
 
 #####
-# Usage: &dbGetCol($table, $primkey, $key, [$type]);
+# Usage: &dbGetCol($table, $select, $where, [$type]);
 sub dbGetCol {
-    my ($table, $primkey, $key, $type) = @_;
-    my $query = "SELECT $primkey,$key FROM $table WHERE $key IS NOT NULL";
+    my ($table, $select, $where, $type) = @_;
+    my $query  = "SELECT $select FROM $table";
+    $query     .= " WHERE ".$where if ($where);
     my %retval;
 
+    &DEBUG("dbGetCol: query => '$query'.");
+
     my $sth = $dbh->prepare($query);
     &SQLDebug($query);
     if (!$sth->execute) {
@@ -88,11 +96,24 @@ sub dbGetCol {
        return;
     }
 
-    if (defined $type and $type == 1) {
+    if (defined $type and $type == 2) {
+       &DEBUG("dbgetcol: type 2!");
+       while (my @row = $sth->fetchrow_array) {
+           $retval{$row[0]} = join(':', $row[1..$#row]);
+       }
+       &DEBUG("dbgetcol: count => ".scalar(keys %retval) );
+
+    } elsif (defined $type and $type == 1) {
        while (my @row = $sth->fetchrow_array) {
            # reverse it to make it easier to count.
-           $retval{$row[1]}{$row[0]} = 1;
+           if (scalar @row == 2) {
+               $retval{$row[1]}{$row[0]} = 1;
+           } elsif (scalar @row == 3) {
+               $retval{$row[1]}{$row[0]} = 1;
+           }
+           # what to do if there's only one or more than 3?
        }
+
     } else {
        while (my @row = $sth->fetchrow_array) {
            $retval{$row[0]} = $row[1];