Changeset 27192 for main

Timestamp:

2013-04-17T15:14:58+12:00 (11 years ago)

Author:

davidb

Message:

Extra test added to avoid putting 'undef' into an array of values. Problem originally showed up with 'indexoptions'

Location:

main/trunk/greenstone2/perllib

Files:

• basebuilder.pm (modified) (1 diff)
• collConfigxml.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/basebuilder.pm

@@ -288 +288 @@
 
     my $separate_cjk = 0;
-    
-    if (defined($self->{'collect_cfg'}->{'indexoptions'})) {
-    foreach my $option (@{$self->{'collect_cfg'}->{'indexoptions'}}) {
+
+    my $indexoptions = $self->{'collect_cfg'}->{'indexoptions'};    
+    if (defined($indexoptions)) {
+
+    foreach my $option (@$indexoptions) {
         if ($option =~ /separate_cjk/) {
         $separate_cjk = 1;

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -203 +203 @@
       }
 
-      push (@{$data->{$key}},$name);
+      if (defined $name) {
+      push (@{$data->{$key}},$name);
+      }
     }