Changeset 17567

Timestamp:

2008-10-22T13:26:24+13:00 (16 years ago)

Author:

kjdon

Message:

if metadata is specified, only add in the ones that are not already indexed. no point in indexing twice

File:

• gsdl/trunk/perllib/mgppbuildproc.pm (modified) (3 diffs)

gsdl/trunk/perllib/mgppbuildproc.pm

@@ -266 +266 @@
     
     $self->{'num_bytes'} += $doc_obj->get_text_length ($section);
+
+    # has the user added a 'metadata' index?
+    my $all_metadata_specified = 0; 
+    # which fields have already been indexed? (same as fields, but in a map)
+    my $specified_fields = {};
     foreach my $field (split (/;/, $fields)) {
         # only deal with this field if it doesn't start with top or
@@ -274 +279 @@
         my $new_text = ""; 
 
-        # we get allfields by default - do nothing
-        if ($real_field eq "allfields") { 
-    
+        # we get allfields by default - do nothing except add into the map
+        if ($real_field eq "allfields") {
+        $self->{'indexfieldmap'}->{"allfields"} = "ZZ";
+        $self->{'indexfieldmap'}->{"ZZ"} = 1;
         }
         
         # metadata - output all metadata we know about except gsdl stuff
         # each metadata is in a separate index field
-        elsif ($real_field eq "metadata") { 
-        my $shortname = "";
-        my $metadata = $doc_obj->get_all_metadata ($section);
-        foreach my $pair (@$metadata) {
-            my ($mfield, $mvalue) = (@$pair);
-            # check fields here, maybe others dont want - change to use dontindex!!
-            if ($mfield ne "Identifier" 
-            && $mfield !~ /^gsdl/ 
-            && $mfield ne "classifytype"
-            && $mfield ne "assocfilepath"
-            && defined $mvalue && $mvalue ne "") {
-            
-            if (defined $self->{'indexfieldmap'}->{$mfield}) {
-                $shortname = $self->{'indexfieldmap'}->{$mfield};
-            }
-            else {
-                $shortname = $self->create_shortname($mfield);
-                $self->{'indexfieldmap'}->{$mfield} = $shortname;
-                $self->{'indexfieldmap'}->{$shortname} = 1;
-            }      
-            # should this line only be done if the following test is true?
-            $new_text .= "$paratag<$shortname>$mvalue</$shortname>\n";
-            if (!defined $self->{'indexfields'}->{$mfield}) {
-                $self->{'indexfields'}->{$mfield} = 1;
-            }                   
-            }
-        }
-        }
+        if ($real_field eq "metadata") { 
+        # we will process this later, so we are not reindexing metadata already indexed
+        $all_metadata_specified = 1;
+        }
+        
         else {
+        
         #individual metadata and or text specified - could be 
         # a comma separated list
+        $specified_fields->{$real_field} = 1;
         my $shortname="";
         my $new_field = 0; # have we found a new field name?
@@ -383 +368 @@
         $text .= "$new_text";
     } # foreach field
-    
+    
+    if ($all_metadata_specified) {
+        my $new_text = "";
+        my $shortname = "";
+        my $metadata = $doc_obj->get_all_metadata ($section);
+        foreach my $pair (@$metadata) {
+        my ($mfield, $mvalue) = (@$pair);
+        # no value
+        next unless defined $mvalue && $mvalue ne "";
+        # we have already indexed this
+        next if defined ($specified_fields->{$mfield});
+        # check fields here, maybe others dont want - change to use dontindex!!
+        next if ($mfield eq "Identifier" || $mfield eq "classifytype" || $mfield eq "assocfilepath");
+        next if ($mfield =~ /^gsdl/);
+        
+            
+        if (defined $self->{'indexfieldmap'}->{$mfield}) {
+            $shortname = $self->{'indexfieldmap'}->{$mfield};
+        }
+        else {
+            $shortname = $self->create_shortname($mfield);
+            $self->{'indexfieldmap'}->{$mfield} = $shortname;
+            $self->{'indexfieldmap'}->{$shortname} = 1;
+        }      
+        $new_text .= "$paratag<$shortname>$mvalue</$shortname>\n";
+        if (!defined $self->{'indexfields'}->{$mfield}) {
+            $self->{'indexfields'}->{$mfield} = 1;
+        }                   
+        
+        }
+        # filter the text
+        $new_text = $self->filter_text ("metadata", $new_text);
+        
+        $self->{'num_processed_bytes'} += length ($new_text);
+        $text .= "$new_text";
+
+        
+    }
+    
     $text .= "$sectionendtag";
     $section = $doc_obj->get_next_section($section);
     } # while defined section
     print $handle "$text\n$documentendtag"; 
+    #print STDERR "***********\n$text\n***************\n";
     
 }