return &sqlRaw results rather than always returning 1, thus passing on error status.

[infobot.git] / src / Process.pl

diff --git a/src/Process.pl b/src/Process.pl
index 33c1d37e932821f610e3e6aeecd8cf489558999a..36cffd423054a12cfaebfdb9fb5a5c2d1da70a76 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -229,7 +229,7 @@ sub process {
     # User Processing, for all users.
     if ($addressed) {
        my $retval;
-       return 'returned from pCH'   if &parseCmdHook("main",$message);
+       return 'SOMETHING parseCmdHook' if &parseCmdHook($message);
 
        $retval = &userCommands();
        return unless (defined $retval);
@@ -329,10 +329,6 @@ sub process {
     # here's where the external routines get called.
     # if they return anything but null, that's the "answer".
     if ($addressed) {
-       if ( &parseCmdHook("extra",$message) ) {
-           return 'DID SOMETHING IN PCH.';
-       }
-
        my $er = &Modules();
        if (!defined $er) {
            return 'SOMETHING 1';
@@ -353,7 +349,7 @@ sub process {
        }
     }
 
-    if (&IsParam("factoids") and $param{'DBType'} =~ /^(mysql|sqlite|pgsql)/i) {
+    if (&IsParam("factoids") and $param{'DBType'} =~ /^(mysql|sqlite(2)?|pgsql)$/i) {
        &FactoidStuff();
     } elsif ($param{'DBType'} =~ /^none$/i) {
        return "NO FACTOIDS.";