[Haver-commits] r179 - in trunk/haver-client/lib/Haver/Client: . Command

[haver]

Author: dylan
Date: 2004-05-28 01:14:32 -0400 (Fri, 28 May 2004)
New Revision: 179

Modified:
   trunk/haver-client/lib/Haver/Client/Command.pm
   trunk/haver-client/lib/Haver/Client/Command/Callback.pm
Log:
Bug fixes.


Modified: trunk/haver-client/lib/Haver/Client/Command/Callback.pm
===================================================================
--- trunk/haver-client/lib/Haver/Client/Command/Callback.pm     2004-05-28 
05:06:30 UTC (rev 178)
+++ trunk/haver-client/lib/Haver/Client/Command/Callback.pm     2004-05-28 
05:14:32 UTC (rev 179)
@@ -35,9 +35,7 @@
        my ($me, $cmd, @args) = @_;
        
        if (exists $me->{command}{$cmd} and exists 
$me->{command}{$cmd}{handler}) {
-               $me->{command}{$cmd}{handler}->($me, $cmd, @args);
-       } else {
-               $me->error('unknown command');
+               $me->{command}{$cmd}{handler}->(@args);
        }
 }
 
@@ -45,9 +43,9 @@
        my ($me, $cmd, $arg) = @_;
        
        if (exists $me->{command}{$cmd} and exists 
$me->{command}{$cmd}{parser}) {
-               return $me->{command}{$cmd}{parser}->($me, $cmd, $arg);
+               return $me->{command}{$cmd}{parser}->($cmd, $arg);
        } else {
-               return ($arg);
+               return $me->SUPER::parse_args($cmd, $arg);
        }
 }
 

Modified: trunk/haver-client/lib/Haver/Client/Command.pm
===================================================================
--- trunk/haver-client/lib/Haver/Client/Command.pm      2004-05-28 05:06:30 UTC 
(rev 178)
+++ trunk/haver-client/lib/Haver/Client/Command.pm      2004-05-28 05:14:32 UTC 
(rev 179)
@@ -99,14 +99,16 @@
 # This is called when there is no args_$cmd function.
 sub default_args {
        my ($me, $cmd, $arg) = @_;
+       $arg =~ s/^\s+//;
+       $arg =~ s/\s+$//;
        return ($arg);
 }
 
 sub args_msg {
        my ($me, $arg) = @_;
-       my ($targ) = $arg =~ s/^\s*(\S+)\s+//;
+       $arg =~ s/^\s*(\S+)\s+//;
 
-       return ($targ, $arg);
+       return ($1, $arg);
 }
 
 sub args_raw {