use inline text for help message

[videosite.git] / videosite / Base.pm

diff --git a/videosite/Base.pm b/videosite/Base.pm
index 5aa8eae..cf8bafa 100644 (file)
--- a/videosite/Base.pm
+++ b/videosite/Base.pm
@@ -5,6 +5,7 @@ package Base;
 
 use strict;
 use Irssi;
+use Data::Dumper;
 
 sub new {
     my $class = shift;
@@ -20,8 +21,11 @@ sub new {
 sub error {
     my $self = shift;
     my @data = @_;
+    my $t;
 
-    Irssi::print(sprintf(shift(@_), @_));
+    $t = sprintf(shift(@_), @_);
+    $t =~ s/%/%%/g;
+    Irssi::print($t);
 }
 
 sub debug {
@@ -37,6 +41,8 @@ sub mergeconfig {
     my $c = shift;
     my $o;
 
+    return $self->{'_CONFIG'} unless defined($c);
+
     foreach $o (keys(%{$c->{'option'}})) {
         if (exists($self->{'_CONFIG'}->{'option'}->{$o})) {
             $self->{'_CONFIG'}->{'option'}->{$o}->{'content'} = $c->{'option'}->{$o}->{'content'};
@@ -50,8 +56,7 @@ sub _prepare_parameters {
     my $self = shift;
     my $p;
 
-    $self->{'_CONFIG'} = { 'module' => $self->{'NAME'},
-                           'option' => {}};
+    $self->{'_CONFIG'} = {'option' => {}};
 
     foreach $p (keys(%{$self->{'_PARAMS'}})) {
         $self->{'_CONFIG'}->{'option'}->{$p}->{'content'} = $self->{'_PARAMS'}->{$p}->[0];
@@ -61,8 +66,12 @@ sub _prepare_parameters {
 sub _getval {
     my $self = shift;
     my $key = shift;
+    my $val;
+
+    $val = $self->{'_CONFIG'}->{'option'}->{$key}->{'content'};
+    $self->debug('Returning %s=%s', $key, $val);
 
-    return $self->{'_CONFIG'}->{'option'}->{$key}->{'content'}
+    return $val;
 }
 
 sub setval {
@@ -87,7 +96,7 @@ sub getconfstr {
         $p = $self->{'_CONFIG'}->{'option'}->{$k}->{'content'};
         $p =~ s/%/%%/g;
         $s .= sprintf("  %s: %s", $k, $p);
-        if ($self->{'_CONFIG'}->{'option'}->{$k}->{'content'} == $self->{'_PARAMS'}->{$k}->[0]) {
+        if ($self->{'_CONFIG'}->{'option'}->{$k}->{'content'} eq $self->{'_PARAMS'}->{$k}->[0]) {
             $s .= " (default)\n";
         } else {
             $s .= "\n";