Changeset 10028

Timestamp:

2005-06-08T15:14:23+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now looks at each metadata value (not just the first), when deciding what to include in a subcollection.

File:

• trunk/gsdl/perllib/basebuildproc.pm (modified) (1 diff)

trunk/gsdl/perllib/basebuildproc.pm

@@ -401 +401 @@
         my ($bool) = $field =~ /^(.)/;
         $field =~ s/^.// if $bool eq '!';
+        my @metadata_values;
         if ($field =~ /^filename$/i) {
-        $field = $doc_obj->get_source_filename();
-        } else {
-        $field = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $field);
-        }
-        next unless defined $field;
-        if ($bool eq '!') {
-        if ($options =~ /^i$/i) {
-            if ($field !~ /$exp/i) {$indexed_doc = 1; last;}
+        push(@metadata_values, $doc_obj->get_source_filename());
+        }
+        else {
+        @metadata_values = @{$doc_obj->get_metadata($doc_obj->get_top_section(), $field)};
+        }
+        next unless @metadata_values;
+        foreach my $metadata_value (@metadata_values) {
+        if ($bool eq '!') {
+            if ($options =~ /^i$/i) {
+            if ($metadata_value !~ /$exp/i) {$indexed_doc = 1; last;}
+            } else {
+            if ($metadata_value !~ /$exp/) {$indexed_doc = 1; last;}
+            }
         } else {
-            if ($field !~ /$exp/) {$indexed_doc = 1; last;}
+            if ($options =~ /^i$/i) {
+            if ($metadata_value =~ /$exp/i) {$indexed_doc = 1; last;}
+            } else {
+            if ($metadata_value =~ /$exp/) {$indexed_doc = 1; last;}
+            }
         }
-        } else {
-        if ($options =~ /^i$/i) {
-            if ($field =~ /$exp/i) {$indexed_doc = 1; last;}
-        } else {
-            if ($field =~ /$exp/) {$indexed_doc = 1; last;}
-        }
-        }
+        }
+
+        last if ($indexed_doc == 1);
     }
     }