X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=quotesite.git;a=blobdiff_plain;f=quotesite%2FBase.pm;h=ccbb657b20ee74bfb5bef5bd7b7068ece753c01d;hp=4445389d507c9cc59bab9d3ea5b3610f2bd985b4;hb=4e748bf6684b36a73f73312c4c694dd6d5655e84;hpb=5ac855980b32d2995ad48b7a27cc28630306bc15

diff --git a/quotesite/Base.pm b/quotesite/Base.pm
index 4445389..ccbb657 100644
--- a/quotesite/Base.pm
+++ b/quotesite/Base.pm
@@ -1,14 +1,14 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
 # licensed under GNU GPL v2
 
-package Base;
+package quotesite::Base;
 
 use strict;
 use Data::Dumper;
 
 sub new {
     my $class = shift;
-    my $self = {'_DEBUG' => 0, '_OUT' => sub {print shift}, '_OUTSTACK' => []};
+    my $self = {'_DEBUG' => 0, '_OUT' => sub {print shift}};
 
     bless($self, $class);
 
@@ -91,23 +91,6 @@ sub setio {
     $self->{'_OUT'} = $io;
 }
 
-sub pushio {
-    my $self = shift;
-    my $io = shift;
-
-    push(@{$self->{'_OUTSTACK'}}, $self->{'_OUT'});
-    $self->setio($io);
-}
-
-sub popio {
-    my $self = shift;
-    my $io = pop(@{$self->{'_OUTSTACK'}});
-
-    if (defined($io)) {
-        $self->setio($io);
-    }
-}
-
 sub getconfstr {
     my $self = shift;
     my $s = 'Options for ' . $self->{'NAME'} . ":\n";
@@ -128,6 +111,30 @@ sub getconfstr {
     return $s;
 }
 
+# Return a list of the parameters supported by the module
+# Does not return the 'enabled' parameter
+sub getparamlist {
+    my $self = shift;
+    my $word = shift;
+
+    return grep {$_ ne 'enabled' && /^$word/} keys %{$self->{'_PARAMS'}};
+}
+
+# Return a list of valid parameter values, if the parameter has
+# such a list.
+sub getparamvalues {
+    my $self = shift;
+    my $param = shift;
+    my $word = shift;
+
+    unless(exists($self->{'_PARAMS'}->{$param}->[2])) {
+        return ();
+    } else {
+        return grep {/^$word/} keys %{$self->{'_PARAMS'}->{$param}->[2]};
+    }
+}
+
+
 sub gethelpstr {
     my $self = shift;
     my $s = 'Help for ' . $self->{'NAME'} . ":\n";
@@ -142,7 +149,16 @@ sub gethelpstr {
     foreach $k (keys(%{$self->{'_CONFIG'}->{'option'}})) {
         $p = $self->{'_PARAMS'}->{$k}->[0];
         $p =~ s/%/%%/g;
-        $s .= sprintf("  %s: %s (default: %s)\n", $k, $self->{'_PARAMS'}->{$k}->[1], $p);
+        if (exists($self->{'_PARAMS'}->{$k}->[2])) {
+            # The parameter has a list of allowed values. Add the keys and their help
+            $s .= sprintf("  %s: %s (default: %s)\n", $k, $self->{'_PARAMS'}->{$k}->[1], $p);
+            foreach (sort keys(%{$self->{'_PARAMS'}->{$k}->[2]})) {
+                $s .= sprintf("     %s: %s\n", $_, $self->{'_PARAMS'}->{$k}->[2]->{$_});
+            }
+        } else {
+            # The parameter just has a default value and a help text
+            $s .= sprintf("  %s: %s (default: %s)\n", $k, $self->{'_PARAMS'}->{$k}->[1], $p);
+        }
     }
 
     return $s;