Changeset 24404 for main/trunk/greenstone2/perllib/mgppbuilder.pm

Timestamp:

2011-08-12T19:35:50+12:00 (13 years ago)

Author:

ak19

Message:

Changes to perl code to do with removing the ex. prefix: ex. is only removed if it is the sole prefix (i.e. ex.dc.* prefixes are not removed).

File:

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

main/trunk/greenstone2/perllib/mgppbuilder.pm

@@ -101 +101 @@
     if (defined $indexes) {
     $self->{'collect_cfg'}->{'indexes'} = [];
-    my $single_index = join(';', @$indexes).";";
-    # remove any ex. from index spec
-    $single_index =~ s/^ex\.//;
-    $single_index =~ s/([,;])ex\./$1/g;
+
+    # remove any ex. from index spec but iff it is the only namespace in the metadata name
+    my @indexes_copy = @$indexes; # make a copy, as 'map' changes entry in array
+    #map { $_ =~ s/(^|,|;)ex\.([^.]+)$/$1$2/; } @indexes_copy; # No. Will replace metanames like flex.Image with fl.Image
+    map { $_ =~ s/(,|;)/$1 /g; } @indexes_copy; # introduce a space after every separator
+    map { $_ =~ s/(^| )ex\.([^.,:]+)(,|;|$)/$1$2$3/g; } @indexes_copy; # replace all <ex.> at start of metanames or <, ex.> when in a comma separated list
+    map { $_ =~ s/(,|:) /$1/g; } @indexes_copy; # remove space introduced after every separator
+    my $single_index = join(';', @indexes_copy).";";
+
     push (@{$self->{'collect_cfg'}->{'indexes'}}, $single_index);
     }