Changeset 22175

Timestamp:

2010-05-26T10:56:52+12:00 (14 years ago)

Author:

kjdon

Message:

remove prefix and suffix are defined per metadata group, not per element in the group. So find the expr for the group then use it on each element

File:

• main/trunk/greenstone2/perllib/classify/List.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/classify/List.pm

@@ -317 +317 @@
     my $classify_section = 0;
     my $first_metadata_group = $metadata_groups[0];
+    my $remove_prefix_expr = $self->{$first_metadata_group . ".remove_prefix_expr"};
+    my $remove_suffix_expr = $self->{$first_metadata_group . ".remove_suffix_expr"};
     foreach my $first_metadata_group_element (split(/\;|,/, $first_metadata_group)) {
     my $real_first_metadata_group_element = $self->strip_ex_from_metadata($first_metadata_group_element);
@@ -322 +324 @@
     
     # Remove prefix/suffix if requested
-    my $remove_prefix_expr = $self->{$first_metadata_group_element . ".remove_prefix_expr"};
-    if (defined $remove_prefix_expr && $remove_prefix_expr ne "") {     
-        $first_metadata_group_element_value =~ s/^$remove_prefix_expr//;
-    }
-    my $remove_suffix_expr = $self->{$first_metadata_group_element . ".remove_suffix_expr"};
-    if (defined $remove_suffix_expr && $remove_suffix_expr ne "") {
-        $first_metadata_group_element_value =~ s/$remove_suffix_expr$//;
-    }
-
+    if (defined ($first_metadata_group_element_value)) {
+        if (defined $remove_prefix_expr && $remove_prefix_expr ne "") {     
+        $first_metadata_group_element_value =~ s/^$remove_prefix_expr//;
+        }
+        
+        if (defined $remove_suffix_expr && $remove_suffix_expr ne "") {
+        $first_metadata_group_element_value =~ s/$remove_suffix_expr$//;
+        }
+    }
     if (defined($first_metadata_group_element_value) && $first_metadata_group_element_value ne "") {
         # This section must be included in the classifier
@@ -362 +364 @@
         delete $self->{$metadata_group . ".list"}->{$section_OID};
         }
+
+        my $remove_prefix_expr = $self->{$metadata_group . ".remove_prefix_expr"};
+        my $remove_suffix_expr = $self->{$metadata_group . ".remove_suffix_expr"};
         foreach my $metadata_element (split(/\;|,/, $metadata_group)) {     
         my $real_metadata_element = $self->strip_ex_from_metadata($metadata_element);
         
-        my $remove_prefix_expr = $self->{$metadata_element . ".remove_prefix_expr"};
-        my $remove_suffix_expr = $self->{$metadata_element . ".remove_suffix_expr"};
         my @metadata_values = @{$doc_obj->get_metadata($section, $real_metadata_element)};
         foreach my $metadata_value (@metadata_values) {