X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FModules%2FCountdown.pl;h=a5e9edffcaa9873a01566039814290f5912d62aa;hb=f7cae48a17d6decd0a9bd997188271daa0a885b1;hp=b29447783157df46461c49a8b987eb100433866a;hpb=45ba7270eabca3ce9467bb7a1f52ce714f9d1a77;p=infobot.git

diff --git a/src/Modules/Countdown.pl b/src/Modules/Countdown.pl
index b294477..a5e9edf 100644
--- a/src/Modules/Countdown.pl
+++ b/src/Modules/Countdown.pl
@@ -45,25 +45,18 @@ sub Countdown {
 	my ($to_days,$dayname,$monname);
 
 	if ($param{'DBType'} =~ /^mysql|sqlite$/i) {
-	    $to_days = (&dbRawReturn("SELECT TO_DAYS(NOW()) - TO_DAYS('$sqldate')"))[0];
-	    $dayname = (&dbRawReturn("SELECT DAYNAME('$sqldate')"))[0];
-	    $monname = (&dbRawReturn("SELECT MONTHNAME('$sqldate')"))[0];
+	    $to_days = (&sqlRawReturn("SELECT TO_DAYS(NOW()) - TO_DAYS('$sqldate')"))[0];
+	    $dayname = (&sqlRawReturn("SELECT DAYNAME('$sqldate')"))[0];
+	    $monname = (&sqlRawReturn("SELECT MONTHNAME('$sqldate')"))[0];
 
 	} elsif ($param{'DBType'} =~ /^pgsql$/i) {
-	    $to_days = (&dbRawReturn("SELECT date_trunc('day', 
+	    $to_days = (&sqlRawReturn("SELECT date_trunc('day',
 				'now'::timestamp - '$sqldate')"))[0];
-	    $dayname = qw(Sun Mon Tue Wed Thu Fri Sat)[(&dbRawReturn("SELECT extract(dow from timestamp '$sqldate')"))[0]];
-	    $monname = qw(BAD Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)[(&dbRawReturn("SELECT extract(month from timestamp '$sqldate')"))[0]];
-
-	} elsif ($param{'DBType'} =~ /^dbm$/i) {
-	    &FIXME("Countdown: no dbm support");
-#	    $to_days = 
-#	    $dayname = 
-#	    $monname = 
-	    return 1;
+	    $dayname = qw(Sun Mon Tue Wed Thu Fri Sat)[(&sqlRawReturn("SELECT extract(dow from timestamp '$sqldate')"))[0]];
+	    $monname = qw(BAD Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)[(&sqlRawReturn("SELECT extract(month from timestamp '$sqldate')"))[0]];
 
 	} else {
-	    &ERROR("Countdown: invalid DBType?");
+	    &ERROR("Countdown: invalid DBType " . $param{'DBType'} . ".");
 	    return 1;
 	}