Changeset 24404 for main/trunk/greenstone2/perllib/mgbuilder.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/mgbuilder.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/mgbuilder.pm

@@ -77 +77 @@
     push (@{$self->{'collect_cfg'}->{'indexes'}}, "dummy:text");    
     }
-    # remove any ex.
+    # remove any ex. but only if there are no other metadata prefixes
     my @orig_indexes = @{$self->{'collect_cfg'}->{'indexes'}};
     $self->{'collect_cfg'}->{'indexes'} = [];
     foreach my $index (@orig_indexes) {
-    $index =~ s/([:,])ex\./$1/g;
+    #$index =~ s/ex\.([^.,:]+)(,|:|$)/$1$2/g; # doesn't preserve flex.Image, which is turned into fl.Image 
+    $index =~ s/(,|:)/$1 /g;
+    $index =~ s/(^| )ex\.([^.,:]+)(,|:|$)/$1$2$3/g;
+    $index =~ s/(,|:) /$1/g;
+
     push (@{$self->{'collect_cfg'}->{'indexes'}}, $index);
     }