Changeset 26449

Timestamp:

2012-11-07T16:17:13+13:00 (11 years ago)

Author:

ak19

Message:

Some regexp variables were undefined owing to the caller method being a variant of write_cfg_file which doesn't define these regexp variables. Need to first check whether these vars are defined are not.

File:

• main/trunk/greenstone2/perllib/cfgread.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/cfgread.pm

@@ -209 +209 @@
         } elsif ($key =~ /$arrayexp/) {
         &write_cfg_line ('COLCFG', [$key, @{$data->{$key}}]);
-        } elsif ($key =~ /$hashexp/) {
+        } elsif (defined $hashexp && $key =~ /$hashexp/) {
         foreach my $k (keys (%{$data->{$key}})) {
             &write_cfg_line ('COLCFG', [$key, $k, $data->{$key}->{$k}]);
         }
-        } elsif ($key =~ /$arrayarrayexp/) {
+        } elsif (defined $arrayarrayexp && $key =~ /$arrayarrayexp/) {
         foreach my $k (@{$data->{$key}}) {
             &write_cfg_line ('COLCFG', [$key, @$k]);
         }
-        } elsif ($key =~ /$hashhashexp/) {
+        } elsif (defined $hashhashexp && $key =~ /$hashhashexp/) {
         foreach my $k (keys (%{$data->{$key}})) {
             foreach my $p (keys (%{$data->{$key}->{$k}})) {