Changeset 22352

Timestamp:

2010-07-06T13:00:40+12:00 (14 years ago)

Author:

kjdon

Message:

remove ex. when generating index lists. Don't want any ex. in build.cfg. This fixes the problem where index list had eg ex.Photographer and collectionmeta in config file had .Photographer and then they didn't match up.

Location:

main/trunk/greenstone2/perllib

Files:

• mgbuilder.pm (modified) (1 diff)
• mgppbuilder.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/mgbuilder.pm

@@ -77 +77 @@
     push (@{$self->{'collect_cfg'}->{'indexes'}}, "dummy:text");    
     }
-
+    # remove any ex.
+    my @orig_indexes = @{$self->{'collect_cfg'}->{'indexes'}};
+    $self->{'collect_cfg'}->{'indexes'} = [];
+    foreach my $index (@orig_indexes) {
+    $index =~ s/([:,])ex\./$1/g;
+    push (@{$self->{'collect_cfg'}->{'indexes'}}, $index);
+    }
 }
 

main/trunk/greenstone2/perllib/mgppbuilder.pm

@@ -101 +101 @@
     if (defined $indexes) {
     $self->{'collect_cfg'}->{'indexes'} = [];
-    push (@{$self->{'collect_cfg'}->{'indexes'}}, join(';', @$indexes).";");
+    my $single_index = join(';', @$indexes).";";
+    # remove any ex. from index spec
+    $single_index =~ s/^ex\.//;
+    $single_index =~ s/([,;])ex\./$1/g;
+    push (@{$self->{'collect_cfg'}->{'indexes'}}, $single_index);
     }
 }