From 322314d869c64b7b37740552710381a69acd5c8f Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Tue, 29 Jun 2010 07:31:27 +0000 Subject: [PATCH] Replaced ".*" with "global" in set/unset; replaced "," with ";" as comma --- PBot/DualIndexHashObject.pm | 4 +++- PBot/HashObject.pm | 2 +- PBot/VERSION.pm | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/PBot/DualIndexHashObject.pm b/PBot/DualIndexHashObject.pm index 7c1781a0..08e4a50c 100644 --- a/PBot/DualIndexHashObject.pm +++ b/PBot/DualIndexHashObject.pm @@ -270,7 +270,7 @@ sub set { my $comma = ''; foreach my $key (sort keys %{ $self->hash->{$primary}->{$secondary} }) { $result .= $comma . "$key => " . $self->hash->{$primary}->{$secondary}->{$key}; - $comma = ", "; + $comma = "; "; } $result .= "none" if($comma eq ''); return $result; @@ -283,6 +283,7 @@ sub set { $self->save(); } + $primary = 'global' if $primary eq '.*'; return "[$self->{name}] ($primary) $secondary: '$key' " . (defined $value ? "set to '$value'" : "is not set."); } @@ -308,6 +309,7 @@ sub unset { delete $self->hash->{$primary}->{$secondary}->{$key}; $self->save(); + $primary = 'global' if $primary eq '.*'; return "[$self->{name}] ($primary) $secondary: '$key' unset."; } diff --git a/PBot/HashObject.pm b/PBot/HashObject.pm index 16e09bd8..f8ee0497 100644 --- a/PBot/HashObject.pm +++ b/PBot/HashObject.pm @@ -221,7 +221,7 @@ sub set { my $comma = ''; foreach my $k (sort keys %{ $self->hash->{$hash_index} }) { $result .= $comma . "$k => " . $self->hash->{$hash_index}{$k}; - $comma = ", "; + $comma = "; "; } $result .= "none" if($comma eq ''); return $result; diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 01285275..029e5ee9 100644 --- a/PBot/VERSION.pm +++ b/PBot/VERSION.pm @@ -13,7 +13,7 @@ use warnings; # These are set automatically by the build/commit script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 215, + BUILD_REVISION => 216, BUILD_DATE => "2010-06-29", };